Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753268AbbHRUaW (ORCPT ); Tue, 18 Aug 2015 16:30:22 -0400 Received: from mail-yk0-f173.google.com ([209.85.160.173]:34452 "EHLO mail-yk0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753095AbbHRUaT (ORCPT ); Tue, 18 Aug 2015 16:30:19 -0400 MIME-Version: 1.0 X-Originating-IP: [95.23.111.95] In-Reply-To: <51457775.D3ds00ymOJ@phil> References: <1439923455-109818-1-git-send-email-briannorris@chromium.org> <1439923455-109818-2-git-send-email-briannorris@chromium.org> <51457775.D3ds00ymOJ@phil> Date: Tue, 18 Aug 2015 22:30:18 +0200 Message-ID: Subject: Re: [PATCH 2/2] ARM: dts: rockchip: correct regulator PM properties From: Javier Martinez Canillas To: Heiko Stuebner Cc: Brian Norris , "devicetree@vger.kernel.org" , Alexandru M Stan , Linux Kernel , Douglas Anderson , linux-rockchip@lists.infradead.org, Brian Norris , "linux-arm-kernel@lists.infradead.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2286 Lines: 65 Hello Heiko, On Tue, Aug 18, 2015 at 9:17 PM, Heiko Stuebner wrote: > Hi Brian, > > > thanks for catching these oversights, but see below > > Am Dienstag, 18. August 2015, 11:44:15 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 >> Cc: Alexandru M Stan >> Cc: Douglas Anderson >> --- >> Tested on jaq, not minnie >> >> 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..6f619c154dc6 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-on-in-suspend; >> + }; >> }; >> >> vcc5v_touch: SWITCH_REG2 { >> regulator-name = "vcc5v_touch"; >> - regulator-suspend-mem-disabled; >> + regulator-state-mem { >> + regulator-on-in-suspend; >> + }; > > wouldn't regulator-suspend-mem-disabled translate to regulator-off-in-suspend? Correct, the downstream regulator-suspend-mem-disabled is equivalent to regulator-off-in-suspend in mainline. > At least looks like it according to https://lkml.org/lkml/2013/7/25/592 > I guess you meant https://lkml.org/lkml/2014/10/10/162 since it was Chanwoo's and not Vincent's version that finally landed. > > Heiko > Best regards, Javier -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/