modify i2s_8ch_2 to i2s_8ch_0 and modify uart0

Due to conflicts between pwm and i2s, delete the old patch that enabled i2s_8ch_2. Signed-off-by: Ken Wang <[email protected]>
radxa-repo · Dec 5, 2023 · aa33400 · aa33400
1 parent 1648f60
commit aa33400
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 45 deletions.
diff --git a/linux/.stable-6.1/0025-rock-s0/0002-enable-i2s_8ch_0-and-modify-uart0-pinctrl.patch b/linux/.stable-6.1/0025-rock-s0/0002-enable-i2s_8ch_0-and-modify-uart0-pinctrl.patch
diff --git a/.../.stable-6.1/0025-rock-s0/0004-dts-rock-s0-modify-i2s_8ch_2-to-i2s_8ch_0-and-modify.patch b/.../.stable-6.1/0025-rock-s0/0004-dts-rock-s0-modify-i2s_8ch_2-to-i2s_8ch_0-and-modify.patch
@@ -0,0 +1,33 @@
+From a765ae501d777c4d052f7df98dcba6a61dceb4dc Mon Sep 17 00:00:00 2001
+From: bsp <[email protected]>
+Date: Tue, 5 Dec 2023 20:26:28 +0800
+Subject: [PATCH] dts: rock s0: modify i2s_8ch_2 to i2s_8ch_0 and modify uart0
+ pinctrl
+
+Signed-off-by: Ken Wang <[email protected]>
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
+index 5f19393f58..4b0aa3600c 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts
+@@ -44,7 +44,7 @@ codec: acodec-sound {
+ 			simple-audio-card,widgets =
+ 				"Headphone", "Headphones";
+ 			simple-audio-card,cpu {
+-				sound-dai = <&i2s_8ch_2>;
++				sound-dai = <&i2s_8ch_0>;
+ 			};
+ 			simple-audio-card,codec {
+ 				sound-dai = <&acodec>;
+@@ -374,6 +374,8 @@ &spi2 {
+
+ &uart0 {
+ 	status = "okay";
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart0_xfer>;
+ };
+
+ &uart2 {
+-- 
+2.25.1
+