Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

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

0 views
Skip to first unread message

Eduardo Valentin

unread,
Nov 20, 2009, 11:40:02 AM11/20/09
to
Just remove regulator from all groups when disabling. This way we
avoid problems if boot loader touches twl4030 registers.

Signed-off-by: Eduardo Valentin <eduardo....@nokia.com>
---
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Eduardo Valentin

unread,
Nov 20, 2009, 12:10:03 PM11/20/09
to
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 <eduardo....@nokia.com>
> ---
> 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

Eduardo Valentin

unread,
Nov 20, 2009, 12:20:02 PM11/20/09
to
From: Eduardo Valentin <eduardo....@nokia.com>

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

Signed-off-by: Eduardo Valentin <eduardo....@nokia.com>
---
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..9365140 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

--

Liam Girdwood

unread,
Nov 20, 2009, 2:10:01 PM11/20/09
to
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 <eduardo....@nokia.com>
> ---
> 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

Eduardo Valentin

unread,
Nov 23, 2009, 2:10:02 AM11/23/09
to
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 <eduardo....@nokia.com>
> > ---
> > 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

Liam Girdwood

unread,
Nov 23, 2009, 6:10:02 AM11/23/09
to

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

0 new messages