forked from ~ljy/RK356X_SDK_RELEASE

hc
2023-12-06 08f87f769b595151be1afeff53e144f543faa614
kernel/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-v10.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 = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>;
197
+ WIFI,poweren_gpio = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>;
198198 status = "okay";
199199 };
200200
....@@ -482,7 +482,7 @@
482482 status = "okay";
483483
484484 vdd_cpu: tcs4525@1c {
485
- compatible = "tcs,tcs452x";
485
+ compatible = "tcs,tcs4525";
486486 reg = <0x1c>;
487487 vin-supply = <&vccsys>;
488488 regulator-compatible = "fan53555-reg";
....@@ -997,12 +997,12 @@
997997
998998 soc_slppin_gpio: soc_slppin_gpio {
999999 rockchip,pins =
1000
- <0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low_pull_down>;
1000
+ <0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low>;
10011001 };
10021002
10031003 soc_slppin_slp: soc_slppin_slp {
10041004 rockchip,pins =
1005
- <0 RK_PA2 1 &pcfg_pull_up>;
1005
+ <0 RK_PA2 1 &pcfg_pull_none>;
10061006 };
10071007
10081008 soc_slppin_rst: soc_slppin_rst {
....@@ -1116,7 +1116,8 @@
11161116
11171117 &sdhci {
11181118 bus-width = <8>;
1119
- supports-emmc;
1119
+ no-sdio;
1120
+ no-sd;
11201121 non-removable;
11211122 max-frequency = <200000000>;
11221123 status = "okay";
....@@ -1124,7 +1125,8 @@
11241125
11251126 &sdmmc0 {
11261127 max-frequency = <150000000>;
1127
- supports-sd;
1128
+ no-sdio;
1129
+ no-mmc;
11281130 bus-width = <4>;
11291131 cap-mmc-highspeed;
11301132 cap-sd-highspeed;
....@@ -1139,7 +1141,8 @@
11391141
11401142 &sdmmc1 {
11411143 max-frequency = <150000000>;
1142
- supports-sdio;
1144
+ no-sd;
1145
+ no-mmc;
11431146 bus-width = <4>;
11441147 disable-wp;
11451148 cap-sd-highspeed;