forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
....@@ -214,22 +214,23 @@
214214
215215 rk809_sound: rk809-sound {
216216 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
+ };
226228 };
227229
228230 spdif-sound {
229231 status = "okay";
230232 compatible = "simple-audio-card";
231233 simple-audio-card,name = "ROCKCHIP,SPDIF";
232
- simple-audio-card,mclk-fs = <128>;
233234 simple-audio-card,cpu {
234235 sound-dai = <&spdif_8ch>;
235236 };
....@@ -361,6 +362,8 @@
361362 compatible = "wlan-platdata";
362363 rockchip,grf = <&grf>;
363364 wifi_chip_type = "ap6398s";
365
+ clocks = <&rk809 1>;
366
+ clock-names = "ext_clock";
364367 status = "okay";
365368 };
366369
....@@ -397,6 +400,7 @@
397400 &dfi {
398401 status = "okay";
399402 };
403
+
400404
401405 &dmc {
402406 center-supply = <&vdd_logic>;
....@@ -1234,7 +1238,7 @@
12341238 };
12351239
12361240 rk809_codec: codec {
1237
- #sound-dai-cells = <1>;
1241
+ #sound-dai-cells = <0>;
12381242 compatible = "rockchip,rk809-codec", "rockchip,rk817-codec";
12391243 clocks = <&cru I2S1_MCLKOUT>;
12401244 clock-names = "mclk";
....@@ -1329,11 +1333,6 @@
13291333
13301334 &pinctrl {
13311335
1332
- headphone {
1333
- hp_det: hp-det {
1334
- rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1335
- };
1336
- };
13371336
13381337 mxc6655xa {
13391338 mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {