[PATCH 2/2] ARM: dts: rockchip: correct regulator PM properties

[Brian Norris]

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 <briannorris at chromium.org>
> > > Cc: Alexandru M Stan <amstan at chromium.org>
> > > Cc: Douglas Anderson <dianders at chromium.org>
> > > ---
> > > 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