diff mbox

[v2,2/3] ARM: dts: rockchip: correct regulator PM properties

Message ID 1440022721-73712-2-git-send-email-briannorris@chromium.org (mailing list archive)
State New, archived
Headers show

Commit Message

Brian Norris Aug. 19, 2015, 10:18 p.m. UTC
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>
Cc: Alexandru M Stan <amstan@chromium.org>
Cc: Douglas Anderson <dianders@chromium.org>
---
Did not test minnie

v1 -> v2:
 - use "off-in-suspend", as that's the equivalent to the downstream
   'regulator-suspend-mem-disabled'

 arch/arm/boot/dts/rk3288-veyron-minnie.dts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Comments

Javier Martinez Canillas Aug. 19, 2015, 11:35 p.m. UTC | #1
Hello Brian,

On Thu, Aug 20, 2015 at 12:18 AM, Brian Norris <briannorris@chromium.org> wrote:
> 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>
> Cc: Alexandru M Stan <amstan@chromium.org>
> Cc: Douglas Anderson <dianders@chromium.org>
> ---
> Did not test minnie
>
> v1 -> v2:
>  - use "off-in-suspend", as that's the equivalent to the downstream
>    'regulator-suspend-mem-disabled'
>
>  arch/arm/boot/dts/rk3288-veyron-minnie.dts | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>

Patch looks good to me.

Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>

Best regards,
Javier
Heiko Stuebner Aug. 24, 2015, 5:04 p.m. UTC | #2
Am Mittwoch, 19. August 2015, 15:18:40 schrieb Brian Norris:
> 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>
> Cc: Alexandru M Stan <amstan@chromium.org>
> Cc: Douglas Anderson <dianders@chromium.org>
> ---

applied to my dts branch for 4.3
diff mbox

Patch

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;
+			};
 		};
 	};
 };