From d39084e12d9ca8ba8eedfcfc8539ba2095151c88 Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Thu, 4 Apr 2013 16:41:06 +0300 Subject: [PATCH] --- yaml --- r: 372797 b: refs/heads/master c: 0d3e3350d5871c53464be4c92d57198744247005 h: refs/heads/master i: 372795: 6f7d79f47c3d7a8c689859989b2896935969da64 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/core/core.c | 3 ++- trunk/drivers/mmc/host/sdhci-acpi.c | 2 ++ trunk/include/linux/mmc/host.h | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 74075a26b954..a7c37b914853 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9a94e0a3f18ae4c0245d4a16d0ee20e93fd7bad +refs/heads/master: 0d3e3350d5871c53464be4c92d57198744247005 diff --git a/trunk/drivers/mmc/core/core.c b/trunk/drivers/mmc/core/core.c index 3bf1c462eded..c1893c9c3c31 100644 --- a/trunk/drivers/mmc/core/core.c +++ b/trunk/drivers/mmc/core/core.c @@ -2416,7 +2416,8 @@ void mmc_start_host(struct mmc_host *host) { host->f_init = max(freqs[0], host->f_min); host->rescan_disable = 0; - mmc_power_up(host); + if (!(host->caps2 & MMC_CAP2_NO_PRESCAN_POWERUP)) + mmc_power_up(host); mmc_detect_change(host, 0); } diff --git a/trunk/drivers/mmc/host/sdhci-acpi.c b/trunk/drivers/mmc/host/sdhci-acpi.c index 2592dddbd965..7bcf74b1a5cd 100644 --- a/trunk/drivers/mmc/host/sdhci-acpi.c +++ b/trunk/drivers/mmc/host/sdhci-acpi.c @@ -195,6 +195,8 @@ static int sdhci_acpi_probe(struct platform_device *pdev) host->mmc->pm_caps |= c->slot->pm_caps; } + host->mmc->caps2 |= MMC_CAP2_NO_PRESCAN_POWERUP; + err = sdhci_add_host(host); if (err) goto err_free; diff --git a/trunk/include/linux/mmc/host.h b/trunk/include/linux/mmc/host.h index 17d714801e94..8873e8349597 100644 --- a/trunk/include/linux/mmc/host.h +++ b/trunk/include/linux/mmc/host.h @@ -280,6 +280,7 @@ struct mmc_host { #define MMC_CAP2_PACKED_WR (1 << 13) /* Allow packed write */ #define MMC_CAP2_PACKED_CMD (MMC_CAP2_PACKED_RD | \ MMC_CAP2_PACKED_WR) +#define MMC_CAP2_NO_PRESCAN_POWERUP (1 << 14) /* Don't power up before scan */ mmc_pm_flag_t pm_caps; /* supported pm features */