evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mmc: sdhci: move remaining power handling into sdhci_set_power()

Browse source 
Move the remaining parts of the power handling in sdhci_do_set_ios()
into sdhci_set_power().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Tested-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>
This commit is contained in:
Russell King 2014-04-25 13:00:06 +01:00 • committed by Chris Ball
parent e921a8b6c4
commit 24fbb3ca14
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/mmc/host/sdhci.c
View file

@ -1216,12 +1216,13 @@ clock_set:
} }
EXPORT_SYMBOL_GPL(sdhci_set_clock); EXPORT_SYMBOL_GPL(sdhci_set_clock);
static void sdhci_set_power(struct sdhci_host *host, unsigned short power) static void sdhci_set_power(struct sdhci_host *host, unsigned char mode,
unsigned short vdd)
{ {
u8 pwr = 0; u8 pwr = 0;
if (power != (unsigned short)-1) { if (mode != MMC_POWER_OFF) {
switch (1 << power) { switch (1 << vdd) {
case MMC_VDD_165_195: case MMC_VDD_165_195:
pwr = SDHCI_POWER_180; pwr = SDHCI_POWER_180;
break; break;
@ -1247,7 +1248,7 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power)
sdhci_writeb(host, 0, SDHCI_POWER_CONTROL); sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
if (host->quirks2 & SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON) if (host->quirks2 & SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON)
sdhci_runtime_pm_bus_off(host); sdhci_runtime_pm_bus_off(host);
power = 0; vdd = 0;
} else { } else {
/* /*
* Spec says that we should clear the power reg before setting * Spec says that we should clear the power reg before setting
@ -1281,7 +1282,7 @@ static void sdhci_set_power(struct sdhci_host *host, unsigned short power)
if (host->vmmc) { if (host->vmmc) {
spin_unlock_irq(&host->lock); spin_unlock_irq(&host->lock);
mmc_regulator_set_ocr(host->mmc, host->vmmc, power); mmc_regulator_set_ocr(host->mmc, host->vmmc, vdd);
spin_lock_irq(&host->lock); spin_lock_irq(&host->lock);
} }
} }
@ -1464,10 +1465,7 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)
host->clock = ios->clock; host->clock = ios->clock;
} }
if (ios->power_mode == MMC_POWER_OFF) sdhci_set_power(host, ios->power_mode, ios->vdd);
sdhci_set_power(host, -1);
else
sdhci_set_power(host, ios->vdd);
if (host->ops->platform_send_init_74_clocks) if (host->ops->platform_send_init_74_clocks)
host->ops->platform_send_init_74_clocks(host, ios->power_mode); host->ops->platform_send_init_74_clocks(host, ios->power_mode);