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

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

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";
 };