.. | .. |
---|
137 | 137 | }; |
---|
138 | 138 | |
---|
139 | 139 | 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>; |
---|
156 | 151 | pinctrl-names = "default"; |
---|
157 | 152 | 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 | + }; |
---|
159 | 158 | }; |
---|
160 | 159 | |
---|
161 | 160 | sdio_pwrseq: sdio-pwrseq { |
---|
.. | .. |
---|
195 | 194 | pinctrl-names = "default"; |
---|
196 | 195 | pinctrl-0 = <&wifi_host_wake_irq>; |
---|
197 | 196 | WIFI,host_wake_irq = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>; |
---|
| 197 | + WIFI,poweren_gpio = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>; |
---|
198 | 198 | status = "okay"; |
---|
199 | 199 | }; |
---|
200 | 200 | |
---|
.. | .. |
---|
482 | 482 | status = "okay"; |
---|
483 | 483 | |
---|
484 | 484 | vdd_cpu: tcs4525@1c { |
---|
485 | | - compatible = "tcs,tcs452x"; |
---|
| 485 | + compatible = "tcs,tcs4525"; |
---|
486 | 486 | reg = <0x1c>; |
---|
487 | 487 | vin-supply = <&vccsys>; |
---|
488 | 488 | regulator-compatible = "fan53555-reg"; |
---|
.. | .. |
---|
997 | 997 | |
---|
998 | 998 | soc_slppin_gpio: soc_slppin_gpio { |
---|
999 | 999 | rockchip,pins = |
---|
1000 | | - <0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low_pull_down>; |
---|
| 1000 | + <0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low>; |
---|
1001 | 1001 | }; |
---|
1002 | 1002 | |
---|
1003 | 1003 | soc_slppin_slp: soc_slppin_slp { |
---|
1004 | 1004 | rockchip,pins = |
---|
1005 | | - <0 RK_PA2 1 &pcfg_pull_up>; |
---|
| 1005 | + <0 RK_PA2 1 &pcfg_pull_none>; |
---|
1006 | 1006 | }; |
---|
1007 | 1007 | |
---|
1008 | 1008 | soc_slppin_rst: soc_slppin_rst { |
---|
.. | .. |
---|
1116 | 1116 | |
---|
1117 | 1117 | &sdhci { |
---|
1118 | 1118 | bus-width = <8>; |
---|
1119 | | - supports-emmc; |
---|
| 1119 | + no-sdio; |
---|
| 1120 | + no-sd; |
---|
1120 | 1121 | non-removable; |
---|
1121 | 1122 | max-frequency = <200000000>; |
---|
1122 | 1123 | status = "okay"; |
---|
.. | .. |
---|
1124 | 1125 | |
---|
1125 | 1126 | &sdmmc0 { |
---|
1126 | 1127 | max-frequency = <150000000>; |
---|
1127 | | - supports-sd; |
---|
| 1128 | + no-sdio; |
---|
| 1129 | + no-mmc; |
---|
1128 | 1130 | bus-width = <4>; |
---|
1129 | 1131 | cap-mmc-highspeed; |
---|
1130 | 1132 | cap-sd-highspeed; |
---|
.. | .. |
---|
1139 | 1141 | |
---|
1140 | 1142 | &sdmmc1 { |
---|
1141 | 1143 | max-frequency = <150000000>; |
---|
1142 | | - supports-sdio; |
---|
| 1144 | + no-sd; |
---|
| 1145 | + no-mmc; |
---|
1143 | 1146 | bus-width = <4>; |
---|
1144 | 1147 | disable-wp; |
---|
1145 | 1148 | cap-sd-highspeed; |
---|