ARM64: dts: rockchip: move rk3399 io-domain nodes to the grf
authorJianqun Xu <jay.xu@rock-chips.com>
Fri, 9 Dec 2016 10:59:34 +0000 (18:59 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Tue, 13 Dec 2016 11:26:18 +0000 (19:26 +0800)
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>
arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts
arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-next.dts
arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts
arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
arch/arm64/boot/dts/rockchip/rk3399.dtsi

index 3f083c5..ac59eb9 100644 (file)
                #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>;
        };
 };
 
+&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>;
index 9233489..cc72bf1 100644 (file)
                #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>;
        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 {
index b3c7141..16f0211 100644 (file)
                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>;
        };
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc1v8_dvp>;
+       audio-supply = <&vcca1v8_codec>;
+       sdmmc-supply = <&vcc_sd>;
+       gpio1830-supply = <&vcc_3v0>;
+};
+
 &pcie_phy {
        status = "disabled";
 };
index 665cbb5..e2b5c11 100644 (file)
 
        /* 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";
 };
index 99b7dbd..9e5c034 100644 (file)
                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>;
        };
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc1v8_dvp>;
+       audio-supply = <&vcca1v8_codec>;
+       sdmmc-supply = <&vcc_sd>;
+       gpio1830-supply = <&vcc_3v0>;
+};
+
 &isp0 {
        status = "okay";
 };
index 7bf26d7..30c11e5 100644 (file)
                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>;
        #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>;
index 2ec56b0..2944593 100644 (file)
                };
        };
 
-       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>;
        };
 };
 
+&io_domains {
+       status = "okay";
+
+       bt656-supply = <&vcc1v8_s3>;
+       audio-supply = <&vcc1v8_s3>;
+       sdmmc-supply = <&vcc_sd>;
+       gpio1830-supply = <&vcc1v8_s3>;
+};
+
 &threshold {
        temperature = <85000>; /* millicelsius */
 };
index 64a0ca7..c070547 100644 (file)
                };
        };
 
-       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>;
        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>;
index e96240e..c87980a 100644 (file)
                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>;
        };
 };
 
+&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>;
 };
index d11dcc9..ebf80e1 100644 (file)
                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>;
        #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>;
index 0ac0c0a..fb14482 100644 (file)
                #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>;