forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 10ebd8556b7990499c896a550e3d416b444211e6
kernel/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dtsi
....@@ -83,29 +83,13 @@
8383 };
8484
8585 rk817-sound {
86
- compatible = "simple-audio-card";
87
- simple-audio-card,format = "i2s";
88
- simple-audio-card,name = "rockchip-rk817-codec";
89
- simple-audio-card,mclk-fs = <256>;
90
- simple-audio-card,widgets =
91
- "Microphone", "Mic Jack",
92
- "Headphone", "Headphone Jack";
93
- simple-audio-card,routing =
94
- "Mic Jack", "MICBIAS1",
95
- "IN1P", "Mic Jack",
96
- "Headphone Jack", "HPOL",
97
- "Headphone Jack", "HPOR";
98
- simple-audio-card,cpu {
99
- sound-dai = <&i2s1_2ch>;
100
- };
101
- simple-audio-card,codec {
102
- sound-dai = <&rk817_codec>;
103
- };
104
- };
105
-
106
- rk_headset: rk-headset {
107
- compatible = "rockchip_headset";
108
- headset_gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
86
+ compatible = "rockchip,multicodecs-card";
87
+ rockchip,card-name = "rockchip-rk817";
88
+ hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
89
+ rockchip,format = "i2s";
90
+ rockchip,mclk-fs = <256>;
91
+ rockchip,cpu = <&i2s1_2ch>;
92
+ rockchip,codec = <&rk817_codec>;
10993 pinctrl-names = "default";
11094 pinctrl-0 = <&hp_det>;
11195 };
....@@ -245,10 +229,6 @@
245229 status = "okay";
246230 };
247231
248
-&dsi_in_vopl {
249
- status = "disabled";
250
-};
251
-
252232 &route_dsi {
253233 connect = <&vopb_out_dsi>;
254234 status = "okay";
....@@ -298,7 +278,8 @@
298278 bus-width = <8>;
299279 cap-mmc-highspeed;
300280 mmc-hs200-1_8v;
301
- supports-emmc;
281
+ no-sdio;
282
+ no-sd;
302283 disable-wp;
303284 non-removable;
304285 num-slots = <1>;
....@@ -730,7 +711,8 @@
730711 bus-width = <4>;
731712 cap-mmc-highspeed;
732713 cap-sd-highspeed;
733
- supports-sd;
714
+ no-sdio;
715
+ no-mmc;
734716 card-detect-delay = <800>;
735717 ignore-pm-notify;
736718 sd-uhs-sdr12;
....@@ -745,7 +727,8 @@
745727 &sdio {
746728 bus-width = <4>;
747729 cap-sd-highspeed;
748
- supports-sdio;
730
+ no-sd;
731
+ no-mmc;
749732 ignore-pm-notify;
750733 keep-power-in-suspend;
751734 non-removable;
....@@ -794,14 +777,6 @@
794777 };
795778
796779 &vopb_mmu {
797
- status = "okay";
798
-};
799
-
800
-&vopl {
801
- status = "okay";
802
-};
803
-
804
-&vopl_mmu {
805780 status = "okay";
806781 };
807782