forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet.dts
....@@ -137,25 +137,24 @@
137137 };
138138
139139 rk817-sound {
140
- compatible = "simple-audio-card";
141
- simple-audio-card,format = "i2s";
142
- simple-audio-card,name = "rockchip,rk817-codec";
143
- simple-audio-card,mclk-fs = <256>;
144
-
145
- simple-audio-card,cpu {
146
- sound-dai = <&i2s1_8ch>;
147
- };
148
- simple-audio-card,codec {
149
- sound-dai = <&rk817_codec>;
150
- };
151
- };
152
-
153
- rk_headset: rk-headset {
154
- compatible = "rockchip_headset";
155
- headset_gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>;
140
+ compatible = "rockchip,multicodecs-card";
141
+ rockchip,card-name = "rockchip-rk817";
142
+ hp-det-gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>;
143
+ io-channels = <&saradc 2>;
144
+ io-channel-names = "adc-detect";
145
+ keyup-threshold-microvolt = <1800000>;
146
+ poll-interval = <100>;
147
+ rockchip,format = "i2s";
148
+ rockchip,mclk-fs = <256>;
149
+ rockchip,cpu = <&i2s1_8ch>;
150
+ rockchip,codec = <&rk817_codec>;
156151 pinctrl-names = "default";
157152 pinctrl-0 = <&hp_det>;
158
- io-channels = <&saradc 2>;
153
+ play-pause-key {
154
+ label = "playpause";
155
+ linux,code = <KEY_PLAYPAUSE>;
156
+ press-threshold-microvolt = <2000>;
157
+ };
159158 };
160159
161160 sdio_pwrseq: sdio-pwrseq {
....@@ -195,6 +194,7 @@
195194 pinctrl-names = "default";
196195 pinctrl-0 = <&wifi_host_wake_irq>;
197196 WIFI,host_wake_irq = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
197
+ WIFI,poweren_gpio = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
198198 status = "okay";
199199 };
200200
....@@ -487,7 +487,7 @@
487487 status = "okay";
488488
489489 vdd_cpu: tcs4525@1c {
490
- compatible = "tcs,tcs452x";
490
+ compatible = "tcs,tcs4525";
491491 reg = <0x1c>;
492492 vin-supply = <&vccsys>;
493493 regulator-compatible = "fan53555-reg";
....@@ -918,6 +918,14 @@
918918 &i2s1m0_sdo0>;
919919 };
920920
921
+&iep {
922
+ status = "okay";
923
+};
924
+
925
+&iep_mmu {
926
+ status = "okay";
927
+};
928
+
921929 &jpegd {
922930 status = "okay";
923931 };
....@@ -999,12 +1007,12 @@
9991007
10001008 soc_slppin_gpio: soc_slppin_gpio {
10011009 rockchip,pins =
1002
- <0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low_pull_down>;
1010
+ <0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low>;
10031011 };
10041012
10051013 soc_slppin_slp: soc_slppin_slp {
10061014 rockchip,pins =
1007
- <0 RK_PA2 1 &pcfg_pull_up>;
1015
+ <0 RK_PA2 1 &pcfg_pull_none>;
10081016 };
10091017
10101018 soc_slppin_rst: soc_slppin_rst {
....@@ -1119,7 +1127,8 @@
11191127
11201128 &sdhci {
11211129 bus-width = <8>;
1122
- supports-emmc;
1130
+ no-sdio;
1131
+ no-sd;
11231132 non-removable;
11241133 max-frequency = <200000000>;
11251134 status = "okay";
....@@ -1127,7 +1136,8 @@
11271136
11281137 &sdmmc0 {
11291138 max-frequency = <150000000>;
1130
- supports-sd;
1139
+ no-sdio;
1140
+ no-mmc;
11311141 bus-width = <4>;
11321142 cap-mmc-highspeed;
11331143 cap-sd-highspeed;
....@@ -1142,7 +1152,8 @@
11421152
11431153 &sdmmc1 {
11441154 max-frequency = <150000000>;
1145
- supports-sdio;
1155
+ no-sd;
1156
+ no-mmc;
11461157 bus-width = <4>;
11471158 disable-wp;
11481159 cap-sd-highspeed;