Commit 29d0d161 authored by Doug Anderson's avatar Doug Anderson Committed by Ulf Hansson
Browse files

mmc: dw_mmc: Power on vqmmc in MMC_POWER_ON, not MMC_POWER_UP 

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: default avatarAlexandru M Stan <amstan@chromium.org>
Signed-off-by: default avatarDoug Anderson <dianders@chromium.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent c63705e1

drivers/mmc/host/dw_mmc.c

+6 −4
Original line number Diff line number Diff line
@@ -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))