diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2013-04-15 11:27:25 -0400 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-04-15 11:27:25 -0400 |
| commit | a08b17be8b984a7c51cd5a480cd977363df353f9 (patch) | |
| tree | 7bf4d23e4269b714b1aa6a86f8a7ff4730be85df /drivers/mmc | |
| parent | e48fc15aa205f380b2fc6d565724a55b1efd8083 (diff) | |
| download | linux-a08b17be8b984a7c51cd5a480cd977363df353f9.tar.gz linux-a08b17be8b984a7c51cd5a480cd977363df353f9.tar.bz2 linux-a08b17be8b984a7c51cd5a480cd977363df353f9.zip | |
mmc: core: fix init controller performance regression, updated patch
Add MMC_CAP2_NO_PRESCAN_POWERUP to sdhci-pci.c also, use mmc_power_off()
for MMC_CAP2_NO_PRESCAN_POWERUP.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
[cjb: previously applied v1 of this patch instead of v4]
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/core.c | 4 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci-pci.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index c1893c9c3c31..65f9ca7a56ad 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -2416,7 +2416,9 @@ void mmc_start_host(struct mmc_host *host) { host->f_init = max(freqs[0], host->f_min); host->rescan_disable = 0; - if (!(host->caps2 & MMC_CAP2_NO_PRESCAN_POWERUP)) + if (host->caps2 & MMC_CAP2_NO_PRESCAN_POWERUP) + mmc_power_off(host); + else mmc_power_up(host); mmc_detect_change(host, 0); } diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index c1f037266bdf..0012d3fdc999 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c @@ -1280,6 +1280,7 @@ static struct sdhci_pci_slot *sdhci_pci_probe_slot( host->mmc->pm_caps = MMC_PM_KEEP_POWER | MMC_PM_WAKE_SDIO_IRQ; host->mmc->slotno = slotno; + host->mmc->caps2 |= MMC_CAP2_NO_PRESCAN_POWERUP; ret = sdhci_add_host(host); if (ret) |