Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751803AbbHRX2N (ORCPT ); Tue, 18 Aug 2015 19:28:13 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:33224 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751050AbbHRX2K (ORCPT ); Tue, 18 Aug 2015 19:28:10 -0400 Date: Tue, 18 Aug 2015 16:28:06 -0700 From: Brian Norris To: Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Brian Norris , devicetree@vger.kernel.org, Alexandru M Stan , Douglas Anderson Subject: Re: [PATCH 2/2] ARM: dts: rockchip: correct regulator PM properties Message-ID: <20150818232806.GC140911@google.com> References: <1439923455-109818-1-git-send-email-briannorris@chromium.org> <1439923455-109818-2-git-send-email-briannorris@chromium.org> <51457775.D3ds00ymOJ@phil> <20150818224831.GA140911@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150818224831.GA140911@google.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3206 Lines: 85 On Tue, Aug 18, 2015 at 03:48:31PM -0700, Brian Norris wrote: > On Tue, Aug 18, 2015 at 09:17:06PM +0200, Heiko Stuebner wrote: > > 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? > > At least looks like it according to https://lkml.org/lkml/2013/7/25/592 > > You are right. My bad. Will fix. (Need to fix this in jaq too.) Now that I'm looking a little closer, it seems like other existing DTS's are broken too, then. Jerry looks like it was converted to the regulator-state-mem node binding, but the conversion doesn't seem to make sense when I compare the chromium DTS sources with the for-next source I see in your tree. In -next: regulators { mic_vcc: LDO_REG2 { regulator-name = "mic_vcc"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-state-mem { regulator-on-in-suspend; }; }; }; But chromium had: regulators { mic_vcc: LDO_REG2 { regulator-always-on; regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-name = "mic_vcc"; regulator-suspend-mem-disabled; }; }; So I guess I'll make the proper conversion for all the veyron variants I see. Brian -- 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/