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

Afer the "PM / AVS: rockchip-io: make io-domains a child of the GRF",
the io-domains should be a sub-node of the grf simple-mfd.

Change-Id: Ic2a40726bccee8b795b5249e07f2537fd30b3f7b
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts
index 3f083c50c13180ab0efff3de06283aacf020ac2a..ac59eb9df0908963275ee63022466e9c58c40ee3 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts
@@ -115,16 +115,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>;
@@ -210,6 +200,15 @@
        };
 };
 
+&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 */
+};
+
 &sdmmc {
        clock-frequency = <150000000>;
        clock-freq-min-max = <400000 150000000>;

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 {

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
index b3c714182ba022d5b399d0477d8378fe9ee43c7e..16f02111dc36c858335d9431c70e0714f1cef86e 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
@@ -118,16 +118,6 @@
                regulator-boot-on;
        };
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&vcc1v8_dvp>;
-               audio-supply = <&vcca1v8_codec>;
-               sdmmc-supply = <&vcc_sd>;
-               gpio1830-supply = <&vcc_3v0>;
-       };
-
        pmu-io-domains {
                compatible = "rockchip,rk3399-pmu-io-voltage-domain";
                rockchip,grf = <&pmugrf>;
@@ -395,6 +385,15 @@
        };
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc1v8_dvp>;
+       audio-supply = <&vcca1v8_codec>;
+       sdmmc-supply = <&vcc_sd>;
+       gpio1830-supply = <&vcc_3v0>;
+};
+
 &pcie_phy {
        status = "disabled";
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index 665cbb5cc7c06e82ac13ac4687423799859c7744..e2b5c11f4ee2c3db2a19781946197119487a0f94 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -464,16 +464,6 @@
 
        /* END REGULATORS */
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&pp1800_ap_io>;         /* APIO2_VDD;  2a 2b */
-               audio-supply = <&pp1800_audio>;         /* APIO5_VDD;  3d 4a */
-               sdmmc-supply = <&ppvar_sd_card_io>;     /* SDMMC0_VDD; 4b    */
-               gpio1830-supply = <&pp3000_ap>;         /* APIO4_VDD;  4c 4d */
-       };
-
        pmu-io-domains {
                compatible = "rockchip,rk3399-pmu-io-voltage-domain";
                rockchip,grf = <&pmugrf>;
@@ -647,6 +637,15 @@ ap_i2c_audio: &i2c8 {
        status = "okay";
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&pp1800_ap_io>;         /* APIO2_VDD;  2a 2b */
+       audio-supply = <&pp1800_audio>;         /* APIO5_VDD;  3d 4a */
+       sdmmc-supply = <&ppvar_sd_card_io>;     /* SDMMC0_VDD; 4b    */
+       gpio1830-supply = <&pp3000_ap>;         /* APIO4_VDD;  4c 4d */
+};
+
 &pwm0 {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-next.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-next.dts
index 99b7dbdd9d8efeb11acbe75e44ca8bc4766b2e88..9e5c0348564d54c6134ef923bf1730181c2341f5 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-next.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-next.dts
@@ -158,16 +158,6 @@
                regulator-boot-on;
        };
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&vcc1v8_dvp>;
-               audio-supply = <&vcca1v8_codec>;
-               sdmmc-supply = <&vcc_sd>;
-               gpio1830-supply = <&vcc_3v0>;
-       };
-
        pmu-io-domains {
                compatible = "rockchip,rk3399-pmu-io-voltage-domain";
                rockchip,grf = <&pmugrf>;
@@ -760,6 +750,15 @@
        };
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc1v8_dvp>;
+       audio-supply = <&vcca1v8_codec>;
+       sdmmc-supply = <&vcc_sd>;
+       gpio1830-supply = <&vcc_3v0>;
+};
+
 &isp0 {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
index 7bf26d7fb4521604e787d5513234a10d355ca435..30c11e5c3f24f3c9d4c8b01a25e63ffbf5759d10 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
@@ -146,16 +146,6 @@
                regulator-boot-on;
        };
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&vcc1v8_dvp>;
-               audio-supply = <&vcca1v8_codec>;
-               sdmmc-supply = <&vcc_sd>;
-               gpio1830-supply = <&vcc_3v0>;
-       };
-
        pmu-io-domains {
                compatible = "rockchip,rk3399-pmu-io-voltage-domain";
                rockchip,grf = <&pmugrf>;
@@ -372,6 +362,15 @@
        #sound-dai-cells = <0>;
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc1v8_dvp>;
+       audio-supply = <&vcca1v8_codec>;
+       sdmmc-supply = <&vcc_sd>;
+       gpio1830-supply = <&vcc_3v0>;
+};
+
 &spdif {
        status = "okay";
        #sound-dai-cells = <0>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts
index 2ec56b0a2ccbe4f874a77a663c7cbe9bffd6a858..2944593401e84bc5734d864fb4b51917d4d61ab4 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts
@@ -98,16 +98,6 @@
                };
        };
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&vcc1v8_s3>;
-               audio-supply = <&vcc1v8_s3>;
-               sdmmc-supply = <&vcc_sd>;
-               gpio1830-supply = <&vcc1v8_s3>;
-       };
-
        pmu-io-domains {
                compatible = "rockchip,rk3399-pmu-io-voltage-domain";
                rockchip,grf = <&pmugrf>;
@@ -517,6 +507,15 @@
        };
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc1v8_s3>;
+       audio-supply = <&vcc1v8_s3>;
+       sdmmc-supply = <&vcc_sd>;
+       gpio1830-supply = <&vcc1v8_s3>;
+};
+
 &threshold {
        temperature = <85000>; /* millicelsius */
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
index 64a0ca755a0734deb3f0a90853ebd6649d8ce573..c070547250d1843f7bcc312b1bebca69b6dfb8b4 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -115,16 +115,6 @@
                };
        };
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&vcc_3v0>;              /* bt656_gpio2ab_ms */
-               audio-supply = <&vcca1v8_codec>;        /* 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>;
@@ -502,6 +492,15 @@
        status = "okay";
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc_3v0>;              /* bt656_gpio2ab_ms */
+       audio-supply = <&vcca1v8_codec>;        /* audio_gpio3d4a_ms */
+       sdmmc-supply = <&vcc_sd>;               /* sdmmc_gpio4b_ms */
+       gpio1830-supply = <&vcc_3v0>;           /* gpio1833_gpio4cd_ms */
+};
+
 &pcie0 {
        assigned-clocks = <&cru SCLK_PCIEPHY_REF>;
        assigned-clock-parents = <&cru SCLK_PCIEPHY_REF100M>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
index e96240e26deabd157b31fdf1b0b034e5a562b17f..c87980ae9f0277f30f82235d46b5255a83c78e34 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
@@ -149,16 +149,6 @@
                regulator-boot-on;
        };
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&vcc_3v0>;
-               audio-supply = <&vcca1v8_codec>;
-               sdmmc-supply = <&vcc_sd>;
-               gpio1830-supply = <&vcc_3v0>;
-       };
-
        pmu-io-domains {
                compatible = "rockchip,rk3399-pmu-io-voltage-domain";
                rockchip,grf = <&pmugrf>;
@@ -673,6 +663,14 @@
        };
 };
 
+&io_domains {
+       status = "okay";
+       bt656-supply = <&vcc_3v0>;
+       audio-supply = <&vcca1v8_codec>;
+       sdmmc-supply = <&vcc_sd>;
+       gpio1830-supply = <&vcc_3v0>;
+};
+
 &cpu_l0 {
        cpu-supply = <&vdd_cpu_l>;
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
index d11dcc9cc86a9da9d73ea1b32027cacd2ecbb818..ebf80e191fb02b516025ed6595e3ee9fed114c01 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
@@ -134,16 +134,6 @@
                regulator-boot-on;
        };
 
-       io-domains {
-               compatible = "rockchip,rk3399-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bt656-supply = <&vcc1v8_dvp>;
-               audio-supply = <&vcca1v8_codec>;
-               sdmmc-supply = <&vcc_sd>;
-               gpio1830-supply = <&vcc_3v0>;
-       };
-
        pmu-io-domains {
                compatible = "rockchip,rk3399-pmu-io-voltage-domain";
                rockchip,grf = <&pmugrf>;
@@ -360,6 +350,15 @@
        #sound-dai-cells = <0>;
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc1v8_dvp>;
+       audio-supply = <&vcca1v8_codec>;
+       sdmmc-supply = <&vcc_sd>;
+       gpio1830-supply = <&vcc_3v0>;
+};
+
 &spdif {
        status = "okay";
        #sound-dai-cells = <0>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 0ac0c0a9a3d0e27438c3f9fbbff4b1dcb3eb9fa9..fb1448296be1aff92dbeab0eb5603c88c13f65b5 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1331,6 +1331,11 @@
                #address-cells = <1>;
                #size-cells = <1>;
 
+               io_domains: io-domains {
+                       compatible = "rockchip,rk3399-io-voltage-domain";
+                       status = "disabled";
+               };
+
                emmc_phy: phy@f780 {
                        compatible = "rockchip,rk3399-emmc-phy";
                        reg = <0xf780 0x24>;