ARM: dts: rockchip: correct regulator power states for suspend

When getting translated from a downstream device tree that used slightly
different DT bindings, these regulators got labeled with the
"on-in-suspend" state, when they were actually supposed to be turned off
for S3 suspend. This was harmless, but not intentional, AFAICT.

Let's turn them off to get the optimal power state.

Signed-off-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rk3288-veyron-jerry.dts b/arch/arm/boot/dts/rk3288-veyron-jerry.dts
index 42d7245599150162c0c1909c3f58a9741d921ca8..60bd6e91e30808b9792ae45d2762a23685317650 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron-jerry.dts
+++ b/arch/arm/boot/dts/rk3288-veyron-jerry.dts
@@ -99,7 +99,7 @@
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
                        regulator-state-mem {
-                               regulator-on-in-suspend;
+                               regulator-off-in-suspend;
                        };
                };
        };

diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts
index 25eb4b0c1330d6af8005891c1323bce50af3d0d5..94b56e33d947ff84ecdcba0b70e5a2aa001436a8 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts
+++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts
@@ -109,7 +109,7 @@
                        regulator-boot-on;
                        regulator-name = "vcc18_lcd";
                        regulator-state-mem {
-                               regulator-on-in-suspend;
+                               regulator-off-in-suspend;
                        };
                };
        };

diff --git a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
index 788468a48163c7afb72b33f06dea51118cea1e6f..b5334ecff13cdf1b9d7bfd0649f6737c56ce09dd 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
@@ -93,7 +93,7 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        regulator-state-mem {
-                               regulator-on-in-suspend;
+                               regulator-off-in-suspend;
                        };
                };
 
@@ -102,7 +102,7 @@
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;
                        regulator-state-mem {
-                               regulator-on-in-suspend;
+                               regulator-off-in-suspend;
                        };
                };
        };