aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Norris <briannorris@chromium.org>2015-08-19 18:18:41 -0400
committerHeiko Stuebner <heiko@sntech.de>2015-08-20 19:40:35 -0400
commit467fb18a8d538be6548ef4093003b63aebbb07b9 (patch)
treed9ce273bd83e297284e9325b77783246bb24813c
parent6a414e462a7c493ed83535f388b07a34446f33f4 (diff)
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>
-rw-r--r--arch/arm/boot/dts/rk3288-veyron-jerry.dts2
-rw-r--r--arch/arm/boot/dts/rk3288-veyron-pinky.dts2
-rw-r--r--arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi4
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/rk3288-veyron-jerry.dts b/arch/arm/boot/dts/rk3288-veyron-jerry.dts
index 42d724559915..60bd6e91e308 100644
--- a/arch/arm/boot/dts/rk3288-veyron-jerry.dts
+++ b/arch/arm/boot/dts/rk3288-veyron-jerry.dts
@@ -99,7 +99,7 @@
99 regulator-min-microvolt = <1800000>; 99 regulator-min-microvolt = <1800000>;
100 regulator-max-microvolt = <1800000>; 100 regulator-max-microvolt = <1800000>;
101 regulator-state-mem { 101 regulator-state-mem {
102 regulator-on-in-suspend; 102 regulator-off-in-suspend;
103 }; 103 };
104 }; 104 };
105 }; 105 };
diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts
index 25eb4b0c1330..94b56e33d947 100644
--- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts
+++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts
@@ -109,7 +109,7 @@
109 regulator-boot-on; 109 regulator-boot-on;
110 regulator-name = "vcc18_lcd"; 110 regulator-name = "vcc18_lcd";
111 regulator-state-mem { 111 regulator-state-mem {
112 regulator-on-in-suspend; 112 regulator-off-in-suspend;
113 }; 113 };
114 }; 114 };
115 }; 115 };
diff --git a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
index 788468a48163..b5334ecff13c 100644
--- a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
@@ -93,7 +93,7 @@
93 regulator-min-microvolt = <3300000>; 93 regulator-min-microvolt = <3300000>;
94 regulator-max-microvolt = <3300000>; 94 regulator-max-microvolt = <3300000>;
95 regulator-state-mem { 95 regulator-state-mem {
96 regulator-on-in-suspend; 96 regulator-off-in-suspend;
97 }; 97 };
98 }; 98 };
99 99
@@ -102,7 +102,7 @@
102 regulator-min-microvolt = <3300000>; 102 regulator-min-microvolt = <3300000>;
103 regulator-max-microvolt = <3300000>; 103 regulator-max-microvolt = <3300000>;
104 regulator-state-mem { 104 regulator-state-mem {
105 regulator-on-in-suspend; 105 regulator-off-in-suspend;
106 }; 106 };
107 }; 107 };
108 }; 108 };