* [PATCH] OMAP: mmc_twl4030 nicely disable vmmc_aux
@ 2009-03-24 12:15 Adrian Hunter
2009-03-24 20:01 ` David Brownell
2009-03-25 0:29 ` [APPLIED] " Tony Lindgren
0 siblings, 2 replies; 3+ messages in thread
From: Adrian Hunter @ 2009-03-24 12:15 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap Mailing List, David Brownell
>From 1a3f939d95122d8e58a3750cf5bce09247357203 Mon Sep 17 00:00:00 2001
From: Adrian Hunter <adrian.hunter@nokia.com>
The MMC driver turns the power off before it turns it
on. To avoid regulator warnings, vmmc_aux must only be
disabled if it has previously been enabled.
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
---
arch/arm/mach-omap2/mmc-twl4030.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
index 2ff50f0..cb56fe2 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/arch/arm/mach-omap2/mmc-twl4030.c
@@ -305,7 +305,7 @@ static int twl_mmc23_set_power(struct device *dev, int slot, int power_on, int v
ret = mmc_regulator_set_ocr(c->vcc, 0);
}
} else {
- if (c->vcc_aux)
+ if (c->vcc_aux && (ret = regulator_is_enabled(c->vcc_aux)) > 0)
ret = regulator_disable(c->vcc_aux);
if (ret == 0)
ret = mmc_regulator_set_ocr(c->vcc, 0);
--
1.5.6.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] OMAP: mmc_twl4030 nicely disable vmmc_aux
2009-03-24 12:15 [PATCH] OMAP: mmc_twl4030 nicely disable vmmc_aux Adrian Hunter
@ 2009-03-24 20:01 ` David Brownell
2009-03-25 0:29 ` [APPLIED] " Tony Lindgren
1 sibling, 0 replies; 3+ messages in thread
From: David Brownell @ 2009-03-24 20:01 UTC (permalink / raw)
To: Adrian Hunter; +Cc: Tony Lindgren, linux-omap Mailing List
On Tuesday 24 March 2009, Adrian Hunter wrote:
> >From 1a3f939d95122d8e58a3750cf5bce09247357203 Mon Sep 17 00:00:00 2001
> From: Adrian Hunter <adrian.hunter@nokia.com>
>
> The MMC driver turns the power off before it turns it
> on. To avoid regulator warnings, vmmc_aux must only be
> disabled if it has previously been enabled.
>
> Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
good catch.
> ---
> arch/arm/mach-omap2/mmc-twl4030.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
> index 2ff50f0..cb56fe2 100644
> --- a/arch/arm/mach-omap2/mmc-twl4030.c
> +++ b/arch/arm/mach-omap2/mmc-twl4030.c
> @@ -305,7 +305,7 @@ static int twl_mmc23_set_power(struct device *dev, int slot, int power_on, int v
> ret = mmc_regulator_set_ocr(c->vcc, 0);
> }
> } else {
> - if (c->vcc_aux)
> + if (c->vcc_aux && (ret = regulator_is_enabled(c->vcc_aux)) > 0)
> ret = regulator_disable(c->vcc_aux);
> if (ret == 0)
> ret = mmc_regulator_set_ocr(c->vcc, 0);
> --
> 1.5.6.3
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* [APPLIED] [PATCH] OMAP: mmc_twl4030 nicely disable vmmc_aux
2009-03-24 12:15 [PATCH] OMAP: mmc_twl4030 nicely disable vmmc_aux Adrian Hunter
2009-03-24 20:01 ` David Brownell
@ 2009-03-25 0:29 ` Tony Lindgren
1 sibling, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2009-03-25 0:29 UTC (permalink / raw)
To: linux-omap
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Commit: 0268abf95f935c2fe45f778b2a223685e68c7823
PatchWorks
http://patchwork.kernel.org/patch/13958/
Git
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=0268abf95f935c2fe45f778b2a223685e68c7823
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-03-25 0:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-24 12:15 [PATCH] OMAP: mmc_twl4030 nicely disable vmmc_aux Adrian Hunter
2009-03-24 20:01 ` David Brownell
2009-03-25 0:29 ` [APPLIED] " Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox