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-miniarm.dts

diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts
index 5bd046c2febbb37f1b1dbde3157c3a54a4146b07..38b47ba7a371bcce60af5f018f13a73577bbaa67 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
@@ -175,6 +168,10 @@
        };
 };
 
+&hevc_service {
+       status = "okay";
+};
+
 &i2c0 {
        status = "okay";
        clock-frequency = <400000>;
@@ -185,7 +182,10 @@
                interrupt-parent = <&gpio0>;
                interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
-               pinctrl-0 = <&pmic_int &global_pwroff>;
+               pinctrl-0 = <&pmic_int &global_pwroff &dvs_1 &dvs_2>;
+               dvs-gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>,
+                               <&gpio0 12 GPIO_ACTIVE_HIGH>;
+
                rockchip,system-power-controller;
                wakeup-source;
                #clock-cells = <1>;
@@ -197,12 +197,12 @@
                vcc4-supply = <&vcc_sys>;
                vcc6-supply = <&vcc_sys>;
                vcc7-supply = <&vcc_sys>;
-               vcc8-supply = <&vcc_18>;
+               vcc8-supply = <&vcc_io>;
                vcc9-supply = <&vcc_io>;
                vcc10-supply = <&vcc_io>;
                vcc11-supply = <&vcc_sys>;
                vcc12-supply = <&vcc_io>;
-               vddio-supply = <&vcc18_ldo1>;
+               vddio-supply = <&vcc_io>;
 
                regulators {
                        vdd_cpu: DCDC_REG1 {
@@ -211,6 +211,7 @@
                                regulator-min-microvolt = <750000>;
                                regulator-max-microvolt = <1350000>;
                                regulator-name = "vdd_arm";
+                               regulator-ramp-delay = <6000>;
                                regulator-state-mem {
                                        regulator-off-in-suspend;
                                };
@@ -379,10 +380,20 @@
        status = "okay";
 };
 
+&io_domains {
+       status = "okay";
+
+       sdcard-supply = <&vccio_sd>;
+};
+
 &pwm0 {
        status = "okay";
 };
 
+&rga {
+       status = "okay";
+};
+
 &saradc {
        vref-supply = <&vcc18_ldo1>;
        status ="okay";
@@ -399,7 +410,7 @@
        pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>;
        status = "okay";
        supports-sd;
-       vmmc-supply = <&vcc_sd>;
+       vmmc-supply = <&vcc33_sd>;
        vqmmc-supply = <&vccio_sd>;
 };
 
@@ -466,7 +477,7 @@
        status = "okay";
 };
 
-&vpu {
+&vpu_service {
        status = "okay";
 };
 
@@ -506,6 +517,14 @@
                pmic_int: pmic-int {
                        rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
                };
+
+               dvs_1: dvs-1 {
+                       rockchip,pins = <RK_GPIO0 11 RK_FUNC_GPIO &pcfg_pull_down>;
+               };
+
+               dvs_2: dvs-2 {
+                       rockchip,pins = <RK_GPIO0 12 RK_FUNC_GPIO &pcfg_pull_down>;
+               };
        };
 
        sdmmc {