summaryrefslogtreecommitdiff
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorBrian Norris <briannorris@chromium.org>2015-08-20 01:18:40 +0300
committerHeiko Stuebner <heiko@sntech.de>2015-08-21 02:40:28 +0300
commit6a414e462a7c493ed83535f388b07a34446f33f4 (patch)
treee448583216a3f1f27e9e8e497e77cd017fc8c67d /arch/arm/boot
parent378abcdf3297613f6712343ce3a79b7d6abdf955 (diff)
downloadlinux-6a414e462a7c493ed83535f388b07a34446f33f4.tar.xz
ARM: dts: rockchip: correct regulator PM properties
This DTS file was submitted with non-upstream bindings. I happened across this while reviewing the jaq DTS. 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>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/rk3288-veyron-minnie.dts8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts
index 0e30bd6bf92b..8fd8ef2c72da 100644
--- a/arch/arm/boot/dts/rk3288-veyron-minnie.dts
+++ b/arch/arm/boot/dts/rk3288-veyron-minnie.dts
@@ -128,12 +128,16 @@
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-name = "vcc33_touch";
- regulator-suspend-mem-disabled;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
};
vcc5v_touch: SWITCH_REG2 {
regulator-name = "vcc5v_touch";
- regulator-suspend-mem-disabled;
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ };
};
};
};