* [PATCH] mmc: dw_mmc: Power on vqmmc in MMC_POWER_ON, not MMC_POWER_UP
@ 2015-01-13 23:58 Doug Anderson
2015-01-14 11:31 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Doug Anderson @ 2015-01-13 23:58 UTC (permalink / raw)
To: Jaehoon Chung, Seungwon Jeon, Ulf Hansson
Cc: Alim Akhtar, Sonny Rao, Andrew Bresticker, Heiko Stuebner,
amstan, addy.ke, yuvaraj.cd, Doug Anderson, chris, linux-mmc,
linux-kernel
If we power up vqmmc in MMC_POWER_ON then we end up turning it on
before mmc_power_up() sets the signal voltage. That's not so great
since we might be powering it up at the wrong voltage.
Note that this is how Yuvaraj originally coded things up in
<https://patchwork.kernel.org/patch/4401231/> but he changed it on my
suggestion. Apparently I was wrong.
Reported-by: Alexandru M Stan <amstan@chromium.org>
Signed-off-by: Doug Anderson <dianders@chromium.org>
---
drivers/mmc/host/dw_mmc.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 2e8abc8..4d2e3c2 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1119,6 +1119,12 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
return;
}
}
+ set_bit(DW_MMC_CARD_NEED_INIT, &slot->flags);
+ regs = mci_readl(slot->host, PWREN);
+ regs |= (1 << slot->id);
+ mci_writel(slot->host, PWREN, regs);
+ break;
+ case MMC_POWER_ON:
if (!IS_ERR(mmc->supply.vqmmc) && !slot->host->vqmmc_enabled) {
ret = regulator_enable(mmc->supply.vqmmc);
if (ret < 0)
@@ -1127,10 +1133,6 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
else
slot->host->vqmmc_enabled = true;
}
- set_bit(DW_MMC_CARD_NEED_INIT, &slot->flags);
- regs = mci_readl(slot->host, PWREN);
- regs |= (1 << slot->id);
- mci_writel(slot->host, PWREN, regs);
break;
case MMC_POWER_OFF:
if (!IS_ERR(mmc->supply.vmmc))
--
2.2.0.rc0.207.ga3a616c
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] mmc: dw_mmc: Power on vqmmc in MMC_POWER_ON, not MMC_POWER_UP
2015-01-13 23:58 [PATCH] mmc: dw_mmc: Power on vqmmc in MMC_POWER_ON, not MMC_POWER_UP Doug Anderson
@ 2015-01-14 11:31 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2015-01-14 11:31 UTC (permalink / raw)
To: Doug Anderson
Cc: Jaehoon Chung, Seungwon Jeon, Alim Akhtar, Sonny Rao,
Andrew Bresticker, Heiko Stuebner, Alexandru Stan, Addy Ke,
Yuvaraj Kumar, Chris Ball, linux-mmc, linux-kernel
On 14 January 2015 at 00:58, Doug Anderson <dianders@chromium.org> wrote:
> If we power up vqmmc in MMC_POWER_ON then we end up turning it on
> before mmc_power_up() sets the signal voltage. That's not so great
> since we might be powering it up at the wrong voltage.
>
> Note that this is how Yuvaraj originally coded things up in
> <https://patchwork.kernel.org/patch/4401231/> but he changed it on my
> suggestion. Apparently I was wrong.
>
> Reported-by: Alexandru M Stan <amstan@chromium.org>
> Signed-off-by: Doug Anderson <dianders@chromium.org>
Thanks! Applied for next.
Kind regards
Uffe
> ---
> drivers/mmc/host/dw_mmc.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
> index 2e8abc8..4d2e3c2 100644
> --- a/drivers/mmc/host/dw_mmc.c
> +++ b/drivers/mmc/host/dw_mmc.c
> @@ -1119,6 +1119,12 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
> return;
> }
> }
> + set_bit(DW_MMC_CARD_NEED_INIT, &slot->flags);
> + regs = mci_readl(slot->host, PWREN);
> + regs |= (1 << slot->id);
> + mci_writel(slot->host, PWREN, regs);
> + break;
> + case MMC_POWER_ON:
> if (!IS_ERR(mmc->supply.vqmmc) && !slot->host->vqmmc_enabled) {
> ret = regulator_enable(mmc->supply.vqmmc);
> if (ret < 0)
> @@ -1127,10 +1133,6 @@ static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
> else
> slot->host->vqmmc_enabled = true;
> }
> - set_bit(DW_MMC_CARD_NEED_INIT, &slot->flags);
> - regs = mci_readl(slot->host, PWREN);
> - regs |= (1 << slot->id);
> - mci_writel(slot->host, PWREN, regs);
> break;
> case MMC_POWER_OFF:
> if (!IS_ERR(mmc->supply.vmmc))
> --
> 2.2.0.rc0.207.ga3a616c
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-01-14 11:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-13 23:58 [PATCH] mmc: dw_mmc: Power on vqmmc in MMC_POWER_ON, not MMC_POWER_UP Doug Anderson
2015-01-14 11:31 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®