renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 04:34:11 +08:00
Code

mmc: sdhci: move regulator handling into sdhci_set_power()

Browse Source 
Move the regulator handling into sdhci_set_power() rather than being in
sdhci_do_set_ios().  This wraps all power control up into this function.

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:01 +01:00 committed by Chris Ball
parent b4f3b7c8b1
commit e921a8b6c4
1 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
drivers/mmc/host/sdhci.c
View File

@ -1216,7 +1216,7 @@ clock_set:
} }
EXPORT_SYMBOL_GPL(sdhci_set_clock); EXPORT_SYMBOL_GPL(sdhci_set_clock);
static int sdhci_set_power(struct sdhci_host *host, unsigned short power) static void sdhci_set_power(struct sdhci_host *host, unsigned short power)
{ {
u8 pwr = 0; u8 pwr = 0;
@ -1239,7 +1239,7 @@ static int sdhci_set_power(struct sdhci_host *host, unsigned short power)
} }
if (host->pwr == pwr) if (host->pwr == pwr)
return -1; return;
host->pwr = pwr; host->pwr = pwr;
@ -1247,38 +1247,43 @@ static int 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);
return 0; power = 0;
} } else {
/*
* Spec says that we should clear the power reg before setting
* a new value. Some controllers don't seem to like this though.
*/
if (!(host->quirks & SDHCI_QUIRK_SINGLE_POWER_WRITE))
sdhci_writeb(host, 0, SDHCI_POWER_CONTROL);
/* /*
* Spec says that we should clear the power reg before setting * At least the Marvell CaFe chip gets confused if we set the
* a new value. Some controllers don't seem to like this though. * voltage and set turn on power at the same time, so set the
*/ * voltage first.
if (!(host->quirks & SDHCI_QUIRK_SINGLE_POWER_WRITE)) */
sdhci_writeb(host, 0, SDHCI_POWER_CONTROL); if (host->quirks & SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER)
sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL);
pwr |= SDHCI_POWER_ON;
/*
* At least the Marvell CaFe chip gets confused if we set the voltage
* and set turn on power at the same time, so set the voltage first.
*/
if (host->quirks & SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER)
sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL); sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL);
pwr |= SDHCI_POWER_ON; if (host->quirks2 & SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON)
sdhci_runtime_pm_bus_on(host);
sdhci_writeb(host, pwr, SDHCI_POWER_CONTROL); /*
* Some controllers need an extra 10ms delay of 10ms before
* they can apply clock after applying power
*/
if (host->quirks & SDHCI_QUIRK_DELAY_AFTER_POWER)
mdelay(10);
}
if (host->quirks2 & SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON) if (host->vmmc) {
sdhci_runtime_pm_bus_on(host); spin_unlock_irq(&host->lock);
mmc_regulator_set_ocr(host->mmc, host->vmmc, power);
/* spin_lock_irq(&host->lock);
* Some controllers need an extra 10ms delay of 10ms before they }
* can apply clock after applying power
*/
if (host->quirks & SDHCI_QUIRK_DELAY_AFTER_POWER)
mdelay(10);
return power;
} }
/*****************************************************************************\ /*****************************************************************************\
@ -1429,7 +1434,6 @@ EXPORT_SYMBOL_GPL(sdhci_set_uhs_signaling);
static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios) static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)
{ {
unsigned long flags; unsigned long flags;
int vdd_bit = -1;
u8 ctrl; u8 ctrl;
spin_lock_irqsave(&host->lock, flags); spin_lock_irqsave(&host->lock, flags);
@ -1461,15 +1465,9 @@ static void sdhci_do_set_ios(struct sdhci_host *host, struct mmc_ios *ios)
} }
if (ios->power_mode == MMC_POWER_OFF) if (ios->power_mode == MMC_POWER_OFF)
vdd_bit = sdhci_set_power(host, -1); sdhci_set_power(host, -1);
else else
vdd_bit = sdhci_set_power(host, ios->vdd); sdhci_set_power(host, ios->vdd);
if (host->vmmc && vdd_bit != -1) {
spin_unlock_irqrestore(&host->lock, flags);
mmc_regulator_set_ocr(host->mmc, host->vmmc, vdd_bit);
spin_lock_irqsave(&host->lock, flags);
}
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);