Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3288-rock2-som.dtsi

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;