arm: dts: rockchip: rk3288: move io-domains nodes

In order to better compare the Linux rk3288.dtsi version
with the U-Boot version move the io-domains nodes.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: John Keeping <john@metanate.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>  # chromebook-jerry
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3288-miqi.dtsi b/arch/arm/dts/rk3288-miqi.dtsi
index cb80cbf27dff72045ae271644b4fa7e8a868e21f..00c8613d6d7370e6d4d7f172ffef5703b56756ed 100644 (file)
--- a/arch/arm/dts/rk3288-miqi.dtsi
+++ b/arch/arm/dts/rk3288-miqi.dtsi
@@ -18,21 +18,6 @@
                clock-output-names = "ext_gmac";
        };
 
-       io_domains: io-domains {
-               compatible = "rockchip,rk3288-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               audio-supply = <&vcca_33>;
-               flash0-supply = <&vcc_flash>;
-               flash1-supply = <&vcc_lan>;
-               gpio30-supply = <&vcc_io>;
-               gpio1830-supply = <&vcc_io>;
-               lcdc-supply = <&vcc_io>;
-               sdcard-supply = <&vccio_sd>;
-               wifi-supply = <&vcc_18>;
-       };
-
-
        leds {
                compatible = "gpio-leds";
 
@@ -277,6 +262,18 @@
        status = "okay";
 };
 
+&io_domains {
+       audio-supply = <&vcca_33>;
+       flash0-supply = <&vcc_flash>;
+       flash1-supply = <&vcc_lan>;
+       gpio30-supply = <&vcc_io>;
+       gpio1830-supply = <&vcc_io>;
+       lcdc-supply = <&vcc_io>;
+       sdcard-supply = <&vccio_sd>;
+       wifi-supply = <&vcc_18>;
+       status = "okay";
+};
+
 &pinctrl {
        pcfg_output_high: pcfg-output-high {
                output-high;

diff --git a/arch/arm/dts/rk3288-phycore-som.dtsi b/arch/arm/dts/rk3288-phycore-som.dtsi
index 821525f7148077c25f7c6fbb7d83eee063d14614..70c00308d7365584fc9ea0234d24fd41ba73d18e 100644 (file)
--- a/arch/arm/dts/rk3288-phycore-som.dtsi
+++ b/arch/arm/dts/rk3288-phycore-som.dtsi
@@ -71,22 +71,6 @@
                clock-output-names = "ext_gmac";
        };
 
-       io_domains: io_domains {
-               compatible = "rockchip,rk3288-io-voltage-domain";
-
-               status = "okay";
-               sdcard-supply = <&vdd_io_sd>;
-               flash0-supply = <&vdd_emmc_io>;
-               flash1-supply = <&vdd_misc_1v8>;
-               gpio1830-supply = <&vdd_3v3_io>;
-               gpio30-supply = <&vdd_3v3_io>;
-               bb-supply = <&vdd_3v3_io>;
-               dvp-supply = <&vdd_3v3_io>;
-               lcdc-supply = <&vdd_3v3_io>;
-               wifi-supply = <&vdd_3v3_io>;
-               audio-supply = <&vdd_3v3_io>;
-       };
-
        leds: user-leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";
@@ -197,6 +181,20 @@
        ddc-i2c-bus = <&i2c5>;
 };
 
+&io_domains {
+       audio-supply = <&vdd_3v3_io>;
+       bb-supply = <&vdd_3v3_io>;
+       dvp-supply = <&vdd_3v3_io>;
+       flash0-supply = <&vdd_emmc_io>;
+       flash1-supply = <&vdd_misc_1v8>;
+       gpio1830-supply = <&vdd_3v3_io>;
+       gpio30-supply = <&vdd_3v3_io>;
+       lcdc-supply = <&vdd_3v3_io>;
+       sdcard-supply = <&vdd_io_sd>;
+       wifi-supply = <&vdd_3v3_io>;
+       status = "okay";
+};
+
 &i2c0 {
        status = "okay";
        clock-frequency = <400000>;

diff --git a/arch/arm/dts/rk3288-popmetal.dtsi b/arch/arm/dts/rk3288-popmetal.dtsi
index 0253933a117046e7728531e6bf7f5240dfac4330..d732a70678baa80ff2d1b24f95832511fabe00ce 100644 (file)
--- a/arch/arm/dts/rk3288-popmetal.dtsi
+++ b/arch/arm/dts/rk3288-popmetal.dtsi
@@ -71,22 +71,6 @@
                };
        };
 
-       io_domains: io-domains {
-               compatible = "rockchip,rk3288-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               audio-supply = <&vcca_33>;
-               bb-supply = <&vcc_io>;
-               dvp-supply = <&vcc18_dvp>;
-               flash0-supply = <&vcc_flash>;
-               flash1-supply = <&vcc_lan>;
-               gpio30-supply = <&vcc_io>;
-               gpio1830-supply = <&vcc_io>;
-               lcdc-supply = <&vcc_io>;
-               sdcard-supply = <&vccio_sd>;
-               wifi-supply = <&vccio_wl>;
-       };
-
        ir: ir-receiver {
                compatible = "gpio-ir-receiver";
                gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
@@ -443,6 +427,20 @@
        status = "okay";
 };
 
+&io_domains {
+       audio-supply = <&vcca_33>;
+       bb-supply = <&vcc_io>;
+       dvp-supply = <&vcc18_dvp>;
+       flash0-supply = <&vcc_flash>;
+       flash1-supply = <&vcc_lan>;
+       gpio30-supply = <&vcc_io>;
+       gpio1830-supply = <&vcc_io>;
+       lcdc-supply = <&vcc_io>;
+       sdcard-supply = <&vccio_sd>;
+       wifi-supply = <&vccio_wl>;
+       status = "okay";
+};
+
 &pinctrl {
        ak8963 {
                comp_int: comp-int {

diff --git a/arch/arm/dts/rk3288-veyron.dtsi b/arch/arm/dts/rk3288-veyron.dtsi
index 35db88274312c62f94fa1d0182492b17142e5ab8..434b0d494e5e6095e15932b7f42f6b13efa3440f 100644 (file)
--- a/arch/arm/dts/rk3288-veyron.dtsi
+++ b/arch/arm/dts/rk3288-veyron.dtsi
@@ -198,21 +198,6 @@
                /* Faux input supply.  See bt_regulator description. */
                vin-supply = <&bt_regulator>;
        };
-
-       io-domains {
-               compatible = "rockchip,rk3288-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               audio-supply = <&vcc18_codec>;
-               bb-supply = <&vcc33_io>;
-               dvp-supply = <&vcc_18>;
-               flash0-supply = <&vcc18_flashio>;
-               gpio1830-supply = <&vcc33_io>;
-               gpio30-supply = <&vcc33_io>;
-               lcdc-supply = <&vcc33_lcd>;
-               sdcard-supply = <&vccio_sd>;
-               wifi-supply = <&vcc18_wl>;
-       };
 };
 
 &cpu0 {
@@ -503,6 +488,19 @@
        clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>, <&cru SCLK_I2S0_OUT>;
 };
 
+&io_domains {
+       audio-supply = <&vcc18_codec>;
+       bb-supply = <&vcc33_io>;
+       dvp-supply = <&vcc_18>;
+       flash0-supply = <&vcc18_flashio>;
+       gpio1830-supply = <&vcc33_io>;
+       gpio30-supply = <&vcc33_io>;
+       lcdc-supply = <&vcc33_lcd>;
+       sdcard-supply = <&vccio_sd>;
+       wifi-supply = <&vcc18_wl>;
+       status = "okay";
+};
+
 &wdt {
        status = "okay";
 };

diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
index 8c394c1e5391ae6d3c06c622b2580a160f1baedb..9cfb86f9f05f89860c7bfa75fc26517f5b749036 100644 (file)
--- a/arch/arm/dts/rk3288.dtsi
+++ b/arch/arm/dts/rk3288.dtsi
@@ -762,6 +762,11 @@
        grf: syscon@ff770000 {
                compatible = "rockchip,rk3288-grf", "syscon";
                reg = <0xff770000 0x1000>;
+
+               io_domains: io-domains {
+                       compatible = "rockchip,rk3288-io-voltage-domain";
+                       status = "disabled";
+               };
        };
 
        wdt: watchdog@ff800000 {