.. | .. |
---|
112 | 112 | status = "disabled"; |
---|
113 | 113 | compatible = "simple-audio-card"; |
---|
114 | 114 | simple-audio-card,name = "rockchip,spdif-rx-sound"; |
---|
| 115 | + simple-audio-card,mclk-fs = <128>; |
---|
115 | 116 | simple-audio-card,cpu { |
---|
116 | 117 | sound-dai = <&spdif_rx>; |
---|
117 | 118 | }; |
---|
.. | .. |
---|
263 | 264 | uart_rts_gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>; |
---|
264 | 265 | pinctrl-names = "default", "rts_gpio"; |
---|
265 | 266 | pinctrl-0 = <&uart4_rts>; |
---|
266 | | - pinctrl-1 = <&uart4_rts_gpio>; |
---|
| 267 | + pinctrl-1 = <&uart4_rts_pin>; |
---|
267 | 268 | BT,power_gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; |
---|
268 | 269 | BT,wake_host_irq = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; |
---|
269 | 270 | status = "okay"; |
---|
.. | .. |
---|
273 | 274 | compatible = "wlan-platdata"; |
---|
274 | 275 | rockchip,grf = <&grf>; |
---|
275 | 276 | pinctrl-names = "default"; |
---|
276 | | - pinctrl-0 = <&wifi_wake_host>; |
---|
| 277 | + pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>; |
---|
277 | 278 | wifi_chip_type = "ap6255"; |
---|
278 | 279 | WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>; |
---|
279 | 280 | status = "okay"; |
---|
.. | .. |
---|
302 | 303 | }; |
---|
303 | 304 | }; |
---|
304 | 305 | |
---|
| 306 | +&rk3308bs_cpu0_opp_table { |
---|
| 307 | + opp-1008000000 { |
---|
| 308 | + status = "okay"; |
---|
| 309 | + }; |
---|
| 310 | + opp-1104000000 { |
---|
| 311 | + status = "okay"; |
---|
| 312 | + }; |
---|
| 313 | +}; |
---|
| 314 | + |
---|
305 | 315 | &dmc { |
---|
306 | 316 | center-supply = <&vdd_log>; |
---|
307 | 317 | status = "okay"; |
---|
.. | .. |
---|
311 | 321 | bus-width = <8>; |
---|
312 | 322 | cap-mmc-highspeed; |
---|
313 | 323 | mmc-hs200-1_8v; |
---|
314 | | - supports-emmc; |
---|
| 324 | + no-sdio; |
---|
| 325 | + no-sd; |
---|
315 | 326 | disable-wp; |
---|
316 | 327 | non-removable; |
---|
317 | 328 | num-slots = <1>; |
---|
.. | .. |
---|
362 | 373 | reset-gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>; |
---|
363 | 374 | }; |
---|
364 | 375 | |
---|
365 | | - is31fl3236: led-controller@3c { |
---|
| 376 | + is31fl3236: led-controller@3f { |
---|
366 | 377 | compatible = "issi,is31fl3236"; |
---|
367 | | - reg = <0x3c>; |
---|
| 378 | + reg = <0x3f>; |
---|
368 | 379 | #address-cells = <1>; |
---|
369 | 380 | #size-cells = <0>; |
---|
370 | 381 | reset-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; |
---|
.. | .. |
---|
736 | 747 | &sdio { |
---|
737 | 748 | bus-width = <4>; |
---|
738 | 749 | cap-sd-highspeed; |
---|
739 | | - supports-sdio; |
---|
| 750 | + no-sd; |
---|
| 751 | + no-mmc; |
---|
740 | 752 | ignore-pm-notify; |
---|
741 | 753 | keep-power-in-suspend; |
---|
742 | 754 | non-removable; |
---|
.. | .. |
---|
749 | 761 | bus-width = <4>; |
---|
750 | 762 | cap-mmc-highspeed; |
---|
751 | 763 | cap-sd-highspeed; |
---|
752 | | - supports-sd; |
---|
| 764 | + no-sdio; |
---|
| 765 | + no-mmc; |
---|
753 | 766 | card-detect-delay = <300>; |
---|
754 | 767 | sd-uhs-sdr25; |
---|
755 | 768 | sd-uhs-sdr50; |
---|
.. | .. |
---|
766 | 779 | }; |
---|
767 | 780 | |
---|
768 | 781 | &pinctrl { |
---|
769 | | - pinctrl-names = "default"; |
---|
770 | | - pinctrl-0 = <&rtc_32k>; |
---|
771 | | - |
---|
772 | 782 | buttons { |
---|
773 | 783 | pwr_key: pwr-key { |
---|
774 | 784 | rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; |
---|
.. | .. |
---|
787 | 797 | }; |
---|
788 | 798 | }; |
---|
789 | 799 | |
---|
| 800 | + wireless-bluetooth { |
---|
| 801 | + uart4_gpios: uart4-gpios { |
---|
| 802 | + rockchip,pins = <4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>; |
---|
| 803 | + }; |
---|
| 804 | + }; |
---|
| 805 | + |
---|
790 | 806 | wireless-wlan { |
---|
791 | 807 | wifi_wake_host: wifi-wake-host { |
---|
792 | 808 | rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>; |
---|