.. | .. |
---|
139 | 139 | status = "disabled"; |
---|
140 | 140 | compatible = "simple-audio-card"; |
---|
141 | 141 | simple-audio-card,name = "rockchip,spdif-tx-sound"; |
---|
| 142 | + simple-audio-card,mclk-fs = <128>; |
---|
142 | 143 | simple-audio-card,cpu { |
---|
143 | 144 | sound-dai = <&spdif_tx>; |
---|
144 | 145 | }; |
---|
.. | .. |
---|
168 | 169 | regulator-boot-on; |
---|
169 | 170 | regulator-min-microvolt = <1000000>; |
---|
170 | 171 | regulator-max-microvolt = <1000000>; |
---|
| 172 | + }; |
---|
| 173 | + |
---|
| 174 | + vcc_3v3_codec: vcc_io: vcc-io { |
---|
| 175 | + compatible = "regulator-fixed"; |
---|
| 176 | + regulator-name = "vcc_io"; |
---|
| 177 | + regulator-always-on; |
---|
| 178 | + regulator-boot-on; |
---|
| 179 | + regulator-min-microvolt = <3300000>; |
---|
| 180 | + regulator-max-microvolt = <3300000>; |
---|
171 | 181 | }; |
---|
172 | 182 | |
---|
173 | 183 | vccio_sdio: vcc_1v8: vcc-1v8 { |
---|
.. | .. |
---|
207 | 217 | regulator-max-microvolt = <1500000>; |
---|
208 | 218 | }; |
---|
209 | 219 | |
---|
210 | | - vcc_3v3_codec: vcc_io: vcc-io { |
---|
211 | | - compatible = "regulator-fixed"; |
---|
212 | | - regulator-name = "vcc_io"; |
---|
213 | | - regulator-always-on; |
---|
214 | | - regulator-boot-on; |
---|
215 | | - regulator-min-microvolt = <3300000>; |
---|
216 | | - regulator-max-microvolt = <3300000>; |
---|
217 | | - }; |
---|
218 | | - |
---|
219 | 220 | vccio_flash: vccio-flash { |
---|
220 | 221 | compatible = "regulator-fixed"; |
---|
221 | 222 | regulator-name = "vccio_flash"; |
---|
.. | .. |
---|
246 | 247 | uart_rts_gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; |
---|
247 | 248 | pinctrl-names = "default", "rts_gpio"; |
---|
248 | 249 | pinctrl-0 = <&uart4_rts>; |
---|
249 | | - pinctrl-1 = <&uart4_rts_gpio>; |
---|
| 250 | + pinctrl-1 = <&uart4_rts_pin>; |
---|
250 | 251 | BT,power_gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; |
---|
251 | 252 | BT,wake_host_irq = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; |
---|
252 | 253 | status = "okay"; |
---|
.. | .. |
---|
283 | 284 | bus-width = <8>; |
---|
284 | 285 | cap-mmc-highspeed; |
---|
285 | 286 | mmc-hs200-1_8v; |
---|
286 | | - supports-emmc; |
---|
| 287 | + no-sdio; |
---|
| 288 | + no-sd; |
---|
287 | 289 | disable-wp; |
---|
288 | 290 | non-removable; |
---|
289 | 291 | num-slots = <1>; |
---|
.. | .. |
---|
686 | 688 | &sdio { |
---|
687 | 689 | bus-width = <4>; |
---|
688 | 690 | cap-sd-highspeed; |
---|
689 | | - supports-sdio; |
---|
| 691 | + no-sd; |
---|
| 692 | + no-mmc; |
---|
690 | 693 | ignore-pm-notify; |
---|
691 | 694 | keep-power-in-suspend; |
---|
692 | 695 | non-removable; |
---|
.. | .. |
---|
699 | 702 | bus-width = <4>; |
---|
700 | 703 | cap-mmc-highspeed; |
---|
701 | 704 | cap-sd-highspeed; |
---|
702 | | - supports-sd; |
---|
| 705 | + no-sdio; |
---|
| 706 | + no-mmc; |
---|
703 | 707 | card-detect-delay = <300>; |
---|
704 | 708 | vmmc-supply = <&vcc_sd>; |
---|
705 | 709 | status = "disabled"; |
---|
.. | .. |
---|
716 | 720 | }; |
---|
717 | 721 | |
---|
718 | 722 | &pinctrl { |
---|
719 | | - pinctrl-names = "default"; |
---|
720 | | - pinctrl-0 = <&rtc_32k>; |
---|
721 | | - |
---|
722 | 723 | buttons { |
---|
723 | 724 | pwr_key: pwr-key { |
---|
724 | 725 | rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; |
---|
.. | .. |
---|
737 | 738 | rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; |
---|
738 | 739 | }; |
---|
739 | 740 | }; |
---|
| 741 | + |
---|
| 742 | + wireless-bluetooth { |
---|
| 743 | + uart4_gpios: uart4-gpios { |
---|
| 744 | + rockchip,pins = <4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>; |
---|
| 745 | + }; |
---|
| 746 | + }; |
---|
| 747 | + |
---|
740 | 748 | }; |
---|
741 | 749 | |
---|
742 | 750 | &pwm0 { |
---|