mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
..
..
@@ -214,22 +214,23 @@
214
214
 
215
215
 	rk809_sound: rk809-sound {
216
216
 		status = "okay";
217
-		compatible = "rockchip,multicodecs-card";
218
-		rockchip,card-name = "rockchip-rk809";
219
-		hp-det-gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>;
220
-		rockchip,format = "i2s";
221
-		rockchip,mclk-fs = <256>;
222
-		rockchip,cpu = <&i2s1_8ch>;
223
-		rockchip,codec = <&rk809_codec>;
224
-		pinctrl-names = "default";
225
-		pinctrl-0 = <&hp_det>;
217
+		compatible = "simple-audio-card";
218
+		simple-audio-card,format = "i2s";
219
+		simple-audio-card,name = "rockchip,rk809-codec";
220
+		simple-audio-card,mclk-fs = <256>;
221
+
222
+		simple-audio-card,cpu {
223
+			sound-dai = <&i2s1_8ch>;
224
+		};
225
+		simple-audio-card,codec {
226
+			sound-dai = <&rk809_codec>;
227
+		};
226
228
 	};
227
229
 
228
230
 	spdif-sound {
229
231
 		status = "okay";
230
232
 		compatible = "simple-audio-card";
231
233
 		simple-audio-card,name = "ROCKCHIP,SPDIF";
232
-		simple-audio-card,mclk-fs = <128>;
233
234
 		simple-audio-card,cpu {
234
235
 				sound-dai = <&spdif_8ch>;
235
236
 		};
..
..
@@ -1234,7 +1235,7 @@
1234
1235
 		};
1235
1236
 
1236
1237
 		rk809_codec: codec {
1237
-			#sound-dai-cells = <1>;
1238
+			#sound-dai-cells = <0>;
1238
1239
 			compatible = "rockchip,rk809-codec", "rockchip,rk817-codec";
1239
1240
 			clocks = <&cru I2S1_MCLKOUT>;
1240
1241
 			clock-names = "mclk";
..
..
@@ -1329,11 +1330,6 @@
1329
1330
 
1330
1331
 &pinctrl {
1331
1332
 
1332
-	headphone {
1333
-		hp_det: hp-det {
1334
-			rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1335
-		};
1336
-	};
1337
1333
 
1338
1334
 	mxc6655xa {
1339
1335
 		mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {