2009-11-20 16:30:51

by Eduardo Valentin

Subject: [PATCH 1/1] twl4030-regulator: Remove regulator from all groups when disabling

Just remove regulator from all groups when disabling. This way we
avoid problems if boot loader touches twl4030 registers.

Signed-off-by: Eduardo Valentin <[email protected]>
---
drivers/regulator/twl4030-regulator.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c
index e2032fb..27b3115 100644
--- a/drivers/regulator/twl4030-regulator.c
+++ b/drivers/regulator/twl4030-regulator.c
@@ -126,7 +126,7 @@ static int twl4030reg_disable(struct regulator_dev *rdev)
if (grp < 0)
return grp;

- grp &= ~P1_GRP;
+ grp &= ~(P1_GRP & P2_GRP | P3_GRP);
return twl4030reg_write(info, VREG_GRP, grp);
}

--
1.6.5.7.g9ecb2

2009-11-20 17:09:20

by Eduardo Valentin

Subject: Re: [PATCH 1/1] twl4030-regulator: Remove regulator from all groups when disabling

On Fri, Nov 20, 2009 at 05:29:19PM +0100, Valentin Eduardo (Nokia-D/Helsinki) wrote:
> Just remove regulator from all groups when disabling. This way we
> avoid problems if boot loader touches twl4030 registers.
>
> Signed-off-by: Eduardo Valentin <[email protected]>
> ---
> drivers/regulator/twl4030-regulator.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c
> index e2032fb..27b3115 100644
> --- a/drivers/regulator/twl4030-regulator.c
> +++ b/drivers/regulator/twl4030-regulator.c
> @@ -126,7 +126,7 @@ static int twl4030reg_disable(struct regulator_dev *rdev)
> if (grp < 0)
> return grp;
>
> - grp &= ~P1_GRP;
> + grp &= ~(P1_GRP & P2_GRP | P3_GRP);
^
This has actually a typo. So please ignore it. I'll resend it.

> return twl4030reg_write(info, VREG_GRP, grp);
> }
>
> --
> 1.6.5.7.g9ecb2

--
Eduardo Valentin

2009-11-20 19:08:54

by Liam Girdwood

Subject: Re: [PATCH 1/1] twl4030-regulator: Remove regulator from all groups when disabling

On Fri, 2009-11-20 at 18:29 +0200, Eduardo Valentin wrote:
> Just remove regulator from all groups when disabling. This way we
> avoid problems if boot loader touches twl4030 registers.
>
> Signed-off-by: Eduardo Valentin <[email protected]>
> ---
> drivers/regulator/twl4030-regulator.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c
> index e2032fb..27b3115 100644
> --- a/drivers/regulator/twl4030-regulator.c
> +++ b/drivers/regulator/twl4030-regulator.c
> @@ -126,7 +126,7 @@ static int twl4030reg_disable(struct regulator_dev *rdev)
> if (grp < 0)
> return grp;
>
> - grp &= ~P1_GRP;
> + grp &= ~(P1_GRP & P2_GRP | P3_GRP);
> return twl4030reg_write(info, VREG_GRP, grp);
> }
>

Applied.

Thanks

Liam

2009-11-23 07:08:50

by Eduardo Valentin

Subject: Re: [PATCH 1/1] twl4030-regulator: Remove regulator from all groups when disabling

Hello Liam,

On Fri, Nov 20, 2009 at 08:07:59PM +0100, ext Liam Girdwood wrote:
> On Fri, 2009-11-20 at 18:29 +0200, Eduardo Valentin wrote:
> > Just remove regulator from all groups when disabling. This way we
> > avoid problems if boot loader touches twl4030 registers.
> >
> > Signed-off-by: Eduardo Valentin <[email protected]>
> > ---
> > drivers/regulator/twl4030-regulator.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c
> > index e2032fb..27b3115 100644
> > --- a/drivers/regulator/twl4030-regulator.c
> > +++ b/drivers/regulator/twl4030-regulator.c
> > @@ -126,7 +126,7 @@ static int twl4030reg_disable(struct regulator_dev *rdev)
> > if (grp < 0)
> > return grp;
> >
> > - grp &= ~P1_GRP;
> > + grp &= ~(P1_GRP & P2_GRP | P3_GRP);
> > return twl4030reg_write(info, VREG_GRP, grp);
> > }
> >
>
> Applied.

Thanks for applying. But this one has actually a typo
It was supposed to be:

+ grp &= ~(P1_GRP | P2_GRP | P3_GRP);

Could you please apply this one instead:
http://lkml.org/lkml/2009/11/20/231

?

>
> Thanks
>
> Liam
>


BR,

--
Eduardo Valentin

2009-11-23 11:03:44

by Liam Girdwood

Subject: Re: [PATCH 1/1] twl4030-regulator: Remove regulator from all groups when disabling

On Mon, 2009-11-23 at 09:08 +0200, Eduardo Valentin wrote:
> Hello Liam,
>
> On Fri, Nov 20, 2009 at 08:07:59PM +0100, ext Liam Girdwood wrote:
> > On Fri, 2009-11-20 at 18:29 +0200, Eduardo Valentin wrote:
> > > Just remove regulator from all groups when disabling. This way we
> > > avoid problems if boot loader touches twl4030 registers.
> > >
> > > Signed-off-by: Eduardo Valentin <[email protected]>
> > > ---
> > > drivers/regulator/twl4030-regulator.c | 2 +-
> > > 1 files changed, 1 insertions(+), 1 deletions(-)
> > >
> > > diff --git a/drivers/regulator/twl4030-regulator.c b/drivers/regulator/twl4030-regulator.c
> > > index e2032fb..27b3115 100644
> > > --- a/drivers/regulator/twl4030-regulator.c
> > > +++ b/drivers/regulator/twl4030-regulator.c
> > > @@ -126,7 +126,7 @@ static int twl4030reg_disable(struct regulator_dev *rdev)
> > > if (grp < 0)
> > > return grp;
> > >
> > > - grp &= ~P1_GRP;
> > > + grp &= ~(P1_GRP & P2_GRP | P3_GRP);
> > > return twl4030reg_write(info, VREG_GRP, grp);
> > > }
> > >
> >
> > Applied.
>
> Thanks for applying. But this one has actually a typo
> It was supposed to be:
>
> + grp &= ~(P1_GRP | P2_GRP | P3_GRP);
>
> Could you please apply this one instead:
> http://lkml.org/lkml/2009/11/20/231
>
> ?

Ah, I did see the new message but applied the wrong one (they both had
the same subject, a V2 subject would have been better).

Applied correct version now.

Thanks

Liam