From 6a414e462a7c493ed83535f388b07a34446f33f4 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Wed, 19 Aug 2015 15:18:40 -0700 Subject: [PATCH] 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 Reviewed-by: Javier Martinez Canillas Signed-off-by: Heiko Stuebner --- arch/arm/boot/dts/rk3288-veyron-minnie.dts | 8 ++++++-- 1 file 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; + }; }; }; };