ARM64: dts: rockchip: move rk3399 io-domain nodes to the grf

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / boot / dts / rockchip / rk3399-box.dtsi

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
index 9233489191f7b2cca4c6378b0b2823642cb92503..cc72bf15aac5f14d2ec453e3c8afd66c6604542e 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
@@ -112,16 +112,6 @@
                #clock-cells = <0>;
        };
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */
-               audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */
-               sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */
-               gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */
-       };
-
        pmu-io-domains {
                compatible = "rockchip,rk3399-pmu-io-voltage-domain";
                rockchip,grf = <&pmugrf>;
@@ -817,6 +807,15 @@
        status = "okay";
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */
+       audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */
+       sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */
+       gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */
+};
+
 &pinctrl {
        sdio-pwrseq {
                wifi_enable_h: wifi-enable-h {