Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos5420-arndale-octa.dts

diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index dbf0306..592d7b4 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -386,6 +386,10 @@
                                 * (Linaro for Arndale Octa, v2012.07).
                                 */
                                regulator-always-on;
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
                        };
 
                        ldo4_reg: LDO4 {
@@ -411,6 +415,10 @@
                                regulator-name = "PVDD_ANAIP_1V8";
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <1800000>;
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
                        };
 
                        ldo8_reg: LDO8 {
@@ -451,6 +459,10 @@
                                regulator-name = "PVDD_APIO_MMCOFF_2V8";
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <2800000>;
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
                        };
 
                        ldo14_reg: LDO14 {
@@ -464,12 +476,20 @@
                                regulator-name = "PVDD_PERI_2V8";
                                regulator-min-microvolt = <3300000>;
                                regulator-max-microvolt = <3300000>;
+
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                               };
                        };
 
                        ldo16_reg: LDO16 {
                                regulator-name = "PVDD_PERI_3V3";
                                regulator-min-microvolt = <2200000>;
                                regulator-max-microvolt = <2200000>;
+
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                               };
                        };
 
                        ldo17_reg: LDO17 {
@@ -483,12 +503,28 @@
                                regulator-name = "PVDD_EMMC_1V8";
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <1800000>;
+                               /*
+                                * Must stay in "off" mode during shutdown for
+                                * proper eMMC reset.  The "off" mode is in
+                                * fact controlled by LDO18EN.  The eMMC does
+                                * not have reset pin connected so the reset
+                                * will be triggered by falling edge of
+                                * LDO18EN.
+                                */
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
                        };
 
                        ldo19_reg: LDO19 {
                                regulator-name = "PVDD_TFLASH_2V8";
                                regulator-min-microvolt = <2800000>;
                                regulator-max-microvolt = <2800000>;
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
                        };
 
                        ldo20_reg: LDO20 {
@@ -515,12 +551,20 @@
                                regulator-min-microvolt = <800000>;
                                regulator-max-microvolt = <1100000>;
                                regulator-always-on;
+
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                               };
                        };
 
                        ldo24_reg: LDO24 {
                                regulator-name = "PVDD_CAM1_AVDD_2V8";
                                regulator-min-microvolt = <2800000>;
                                regulator-max-microvolt = <2800000>;
+
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                               };
                        };
 
                        ldo25_reg: LDO25 {
@@ -540,6 +584,10 @@
                                regulator-name = "PVDD_G3DS_1V0";
                                regulator-min-microvolt = <800000>;
                                regulator-max-microvolt = <1100000>;
+
+                               regulator-state-mem {
+                                       regulator-on-in-suspend;
+                               };
                        };
 
                        ldo28_reg: LDO28 {
@@ -615,55 +663,75 @@
                        buck1_reg: BUCK1 {
                                regulator-name = "PVDD_MIF_1V1";
                                regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <1100000>;
+                               regulator-max-microvolt = <1300000>;
                                regulator-always-on;
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
                        };
 
                        buck2_reg: BUCK2 {
                                regulator-name = "vdd_arm";
                                regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <1000000>;
+                               regulator-max-microvolt = <1500000>;
                                regulator-always-on;
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
                        };
 
                        buck3_reg: BUCK3 {
                                regulator-name = "PVDD_INT_1V0";
                                regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <1000000>;
+                               regulator-max-microvolt = <1400000>;
                                regulator-always-on;
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
                        };
 
                        buck4_reg: BUCK4 {
                                regulator-name = "PVDD_G3D_1V0";
                                regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <1000000>;
+                               regulator-max-microvolt = <1400000>;
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
                        };
 
                        buck5_reg: BUCK5 {
                                regulator-name = "PVDD_LPDDR3_1V2";
                                regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <1200000>;
+                               regulator-max-microvolt = <1400000>;
                                regulator-always-on;
                        };
 
                        buck6_reg: BUCK6 {
                                regulator-name = "PVDD_KFC_1V0";
                                regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <1000000>;
+                               regulator-max-microvolt = <1500000>;
                                regulator-always-on;
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
                        };
 
                        buck7_reg: BUCK7 {
                                regulator-name = "VIN_LLDO_1V4";
-                               regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <1400000>;
+                               regulator-min-microvolt = <1200000>;
+                               regulator-max-microvolt = <1500000>;
                                regulator-always-on;
                        };
 
                        buck8_reg: BUCK8 {
                                regulator-name = "VIN_MLDO_2V0";
-                               regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <2000000>;
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <2100000>;
                                regulator-always-on;
                        };
 
@@ -678,6 +746,18 @@
                                regulator-name = "PVDD_EMMCF_2V8";
                                regulator-min-microvolt = <2800000>;
                                regulator-max-microvolt = <2800000>;
+                               /*
+                                * Must stay in "off" mode during shutdown for
+                                * proper eMMC reset.  The "off" mode is in
+                                * fact controlled by BUCK10EN.  The eMMC does
+                                * not have reset pin connected so the reset
+                                * will be triggered by falling edge of
+                                * BUCK10EN.
+                                */
+
+                               regulator-state-mem {
+                                       regulator-off-in-suspend;
+                               };
                        };
                };
        };
@@ -700,7 +780,7 @@
        samsung,dw-mshc-ddr-timing = <0 2>;
        pinctrl-names = "default";
        pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8>;
-       vmmc-supply = <&ldo10_reg>;
+       vmmc-supply = <&ldo18_reg>;
        vqmmc-supply = <&ldo3_reg>;
        bus-width = <8>;
        cap-mmc-highspeed;