UPSTREAM: ARM: dts: rockchip: move rk3288 io-domain nodes to the grf

io-voltage control is actually part of the grf, so move the node under the
newly available grf simple-mfd.

To minimize duplicate code, the core node and compatible property
gets placed in the core rk3288.dtsi while the individual boards
now only need to enable it and add the necessary supply properties.
cherry picked from commit 4b91545072ad7ca1963d2a89c8b42fc2eb561484)

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Conflicts:
	arch/arm/boot/dts/rk3288-miqi.dts
	arch/arm/boot/dts/rk3288-rock2-som.dtsi

Change-Id: I4f5ecc16524c52e8ac6f04cf8b9cdc0e1b7d937f
 (cherry picked from commit 3445b2fae55f1a232e6e4843f4f74de074d8c07f)
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index 80af304a38bb6a2ea4f62f9f4e578114d7e94d5d..70d0c81c57c6be16a18521b7b03407a7c0e3522e 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -235,13 +235,6 @@
                vin-supply = <&vcc_io>;
        };
 
-       io-domains {
-               compatible = "rockchip,rk3288-io-voltage-domain";
-               rockchip,grf = <&grf>;
-               sdcard-supply = <&vccio_sd>;
-               wifi-supply = <&vcc_18>;
-       };
-
        wireless-bluetooth {
                compatible = "bluetooth-platdata";
                uart_rts_gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
@@ -399,6 +392,13 @@
        status = "okay";
 };
 
+&io_domains {
+       status = "okay";
+
+       sdcard-supply = <&vccio_sd>;
+       wifi-supply = <&vcc_18>;
+};
+
 &wdt {
        status = "okay";
 };
@@ -459,6 +459,56 @@
        status = "okay";
 };
 
+&usbphy {
+       status = "okay";
+};
+
+&usb_host0_ehci {
+       status = "okay";
+};
+
+&usb_host1 {
+       status = "okay";
+};
+
+&usb_otg {
+       status = "okay";
+};
+
+&lvds {
+       rockchip,data-mapping = "jeida";
+       rockchip,data-width = <24>;
+       rockchip,output = "lvds";
+       rockchip,panel = <&lvds_panel>;
+       status = "disabled";
+};
+
+&vopb {
+       status = "okay";
+
+       /* Don't use vopb for eDP, save it for HDMI */
+       vopb_out: port {
+               /delete-node/ endpoint@1;
+       };
+};
+
+&vopb_mmu {
+       status = "okay";
+};
+
+&vopl {
+       status = "okay";
+
+       /* Don't use vopb for HDMI, save it for eDP */
+       vopl_out: port {
+               /delete-node/ endpoint@0;
+       };
+};
+
+&vopl_mmu {
+       status = "okay";
+};
+
 &pinctrl {
        pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma {
                drive-strength = <8>;
@@ -546,53 +596,3 @@
                };
        };
 };
-
-&usbphy {
-       status = "okay";
-};
-
-&usb_host0_ehci {
-       status = "okay";
-};
-
-&usb_host1 {
-       status = "okay";
-};
-
-&usb_otg {
-       status = "okay";
-};
-
-&lvds {
-       rockchip,data-mapping = "jeida";
-       rockchip,data-width = <24>;
-       rockchip,output = "lvds";
-       rockchip,panel = <&lvds_panel>;
-       status = "disabled";
-};
-
-&vopb {
-       status = "okay";
-
-       /* Don't use vopb for eDP, save it for HDMI */
-       vopb_out: port {
-               /delete-node/ endpoint@1;
-       };
-};
-
-&vopb_mmu {
-       status = "okay";
-};
-
-&vopl {
-       status = "okay";
-
-       /* Don't use vopb for HDMI, save it for eDP */
-       vopl_out: port {
-               /delete-node/ endpoint@0;
-       };
-};
-
-&vopl_mmu {
-       status = "okay";
-};

diff --git a/arch/arm/boot/dts/rk3288-fennec.dts b/arch/arm/boot/dts/rk3288-fennec.dts
index cd039cdcc96b8b6cf3df3780f2f9ac1d93a2d2ae..cb9959e45e453eed56464619a2d9e4d2bc7039a4 100644 (file)
--- a/arch/arm/boot/dts/rk3288-fennec.dts
+++ b/arch/arm/boot/dts/rk3288-fennec.dts
@@ -59,12 +59,6 @@
                clock-output-names = "ext_gmac";
        };
 
-       io-domains {
-               compatible = "rockchip,rk3288-io-voltage-domain";
-               rockchip,grf = <&grf>;
-               wifi-supply = <&vcc_wl>;
-       };
-
        sdio_pwrseq: sdio-pwrseq {
                compatible = "mmc-pwrseq-simple";
                clocks = <&rk808 RK808_CLKOUT1>;
@@ -437,6 +431,12 @@
        status = "okay";
 };
 
+&io_domains {
+       status = "okay";
+
+       wifi-supply = <&vcc_wl>;
+};
+
 &sdio0 {
        status = "okay";
        clock-frequency = <50000000>;

diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi
index 3f1d891fdff8d84e7a70b59c5e8f8404395434b7..e5609d7b6f5c8ffc708f9c2b1dd78f9965b5caad 100644 (file)
--- a/arch/arm/boot/dts/rk3288-firefly.dtsi
+++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -63,22 +63,6 @@
                clock-output-names = "ext_gmac";
        };
 
-       io_domains: io-domains {
-               compatible = "rockchip,rk3288-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               audio-supply = <&vcca_33>;
-               bb-supply = <&vcc_io>;
-               dvp-supply = <&dovdd_1v8>;
-               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";
                pinctrl-names = "default";
@@ -451,6 +435,21 @@
        status = "okay";
 };
 
+&io_domains {
+       status = "okay";
+
+       audio-supply = <&vcca_33>;
+       bb-supply = <&vcc_io>;
+       dvp-supply = <&dovdd_1v8>;
+       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>;
+};
+
 &pinctrl {
        pcfg_output_high: pcfg-output-high {
                output-high;

diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts
index f58d9dcb0834e8e8b29ec0d100b178379c46234f..f2bf69e92be45af25bb0da36286e559817aa29b3 100644 (file)
--- a/arch/arm/boot/dts/rk3288-miniarm.dts
+++ b/arch/arm/boot/dts/rk3288-miniarm.dts
@@ -111,13 +111,6 @@
                regulator-boot-on;
        };
 
-       io_domains: io-domains {
-               compatible = "rockchip,rk3288-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               sdcard-supply = <&vccio_sd>;
-       };
-
        /*
         * NOTE: vcc_sd isn't hooked up on v1.0 boards where power comes from
         * vcc_io directly.  Those boards won't be able to power cycle SD cards
@@ -379,6 +372,12 @@
        status = "okay";
 };
 
+&io_domains {
+       status = "okay";
+
+       sdcard-supply = <&vccio_sd>;
+};
+
 &pwm0 {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts
index c7ff3246499240f35f1ad218808b47591dcb440b..58a823c1bd61ae662dbfaeebf16624ede15a47eb 100644 (file)
--- a/arch/arm/boot/dts/rk3288-miqi.dts
+++ b/arch/arm/boot/dts/rk3288-miqi.dts
@@ -157,12 +157,6 @@
                vin-supply = <&vcc_io>;
        };
 
-       io-domains {
-               compatible = "rockchip,rk3288-io-voltage-domain";
-               rockchip,grf = <&grf>;
-               sdcard-supply = <&vccio_sd>;
-       };
-
        board-leds {
                        compatible = "gpio-leds";
                        status = "okay";
@@ -423,6 +417,12 @@ I2C
        status = "okay";
 };
 
+&io_domains {
+       status = "okay";
+
+       sdcard-supply = <&vccio_sd>;
+};
+
 &spi2 {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts
index e240771818d32465879080f1635441e70b5fef14..3418376e38b275c2d3a00494802a1622b0488c47 100644 (file)
--- a/arch/arm/boot/dts/rk3288-popmetal.dts
+++ b/arch/arm/boot/dts/rk3288-popmetal.dts
@@ -79,22 +79,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>;
@@ -440,6 +424,21 @@
        status = "okay";
 };
 
+&io_domains {
+       status = "okay";
+
+       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>;
+};
+
 &pinctrl {
        ak8963 {
                comp_int: comp-int {

diff --git a/arch/arm/boot/dts/rk3288-rock2-som.dtsi b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
index 1813b7c36556e025c724f7fb7fccefd9c9252743..bb1f01e037ba7e2a5ae8126ccff5d98b16f4a0a0 100644 (file)
--- a/arch/arm/boot/dts/rk3288-rock2-som.dtsi
+++ b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
@@ -61,6 +61,15 @@
                clock-output-names = "ext_gmac";
        };
 
+       vcc_flash: flash-regulator {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc_sys";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               startup-delay-us = <150>;
+               vin-supply = <&vcc_io>;
+       };
+
        vcc_sys: vsys-regulator {
                compatible = "regulator-fixed";
                regulator-name = "vcc_sys";
@@ -85,6 +94,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
        vmmc-supply = <&vcc_io>;
+       vqmmc-supply = <&vcc_flash>;
        status = "okay";
 };
 
@@ -109,6 +119,7 @@
        act8846: act8846@5a {
                compatible = "active-semi,act8846";
                reg = <0x5a>;
+               system-power-controller;
                inl1-supply = <&vcc_io>;
                inl2-supply = <&vcc_sys>;
                inl3-supply = <&vcc_20>;
@@ -232,6 +243,21 @@
        };
 };
 
+&io_domains {
+       status = "okay";
+
+       audio-supply = <&vcc_io>;
+       bb-supply = <&vcc_io>;
+       dvp-supply = <&vcc_18>;
+       flash0-supply = <&vcc_flash>;
+       flash1-supply = <&vccio_pmu>;
+       gpio30-supply = <&vccio_pmu>;
+       gpio1830 = <&vcc_io>;
+       lcdc-supply = <&vcc_io>;
+       sdcard-supply = <&vccio_sd>;
+       wifi-supply = <&vcc_18>;
+};
+
 &pinctrl {
        pcfg_output_high: pcfg-output-high {
                output-high;

diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 0baa6bb3329c7229549e36ca85225374b346f162..4c1f921d9c8c616c6b7a66796276c1ae1bd5f4a3 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -83,19 +83,6 @@
                reset-gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
        };
 
-       io_domains: io-domains {
-               compatible = "rockchip,rk3288-io-voltage-domain";
-               rockchip,grf = <&grf>;
-
-               bb-supply = <&vcc33_io>;
-               dvp-supply = <&vcc_18>;
-               flash0-supply = <&vcc18_flashio>;
-               gpio1830-supply = <&vcc33_io>;
-               gpio30-supply = <&vcc33_io>;
-               lcdc-supply = <&vcc33_lcd>;
-               wifi-supply = <&vcc18_wl>;
-       };
-
        sdio_pwrseq: sdio-pwrseq {
                compatible = "mmc-pwrseq-simple";
                clocks = <&rk808 RK808_CLKOUT1>;
@@ -339,6 +326,18 @@
        i2c-scl-rising-time-ns = <1000>;
 };
 
+&io_domains {
+       status = "okay";
+
+       bb-supply = <&vcc33_io>;
+       dvp-supply = <&vcc_18>;
+       flash0-supply = <&vcc18_flashio>;
+       gpio1830-supply = <&vcc33_io>;
+       gpio30-supply = <&vcc33_io>;
+       lcdc-supply = <&vcc33_lcd>;
+       wifi-supply = <&vcc18_wl>;
+};
+
 &pwm1 {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 56b3050c84756e69f3a6eef8d1b0aed58f6e1c4e..df13ecef29f70b1f9070a30e8a99c833d5e2ae24 100644 (file)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -854,6 +854,11 @@
                        #phy-cells = <0>;
                        status = "disabled";
                };
+
+               io_domains: io-domains {
+                       compatible = "rockchip,rk3288-io-voltage-domain";
+                       status = "disabled";
+               };
        };
 
        wdt: watchdog@ff800000 {