aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorDong Aisheng <b29396@freescale.com>2014-06-24 05:25:03 -0400
committerDong Aisheng <b29396@freescale.com>2014-06-25 00:54:32 -0400
commit58f91ff6f6719fef44f5122ae1d8a5df7e0061d5 (patch)
treebb7d7d2e2e8953c4d7f4d4ac6e04232ff2429253 /drivers/mmc
parentbe2efae1597064a5862a831c5db436e8d7f85012 (diff)
ENGR00319936-1 mmc: sdhci-esdhc-imx: do not enable wakeup by default
After adding mega fast support, the default enabled usdhc wakeup will block M/F to gate off power domain. To avoid this issue, we only claim wakeup capability and reply on user to enable it via sysfs according to real needs. The drawback of such change is that for SDIO WiFi Wakeup On Wireless feature, User has to enable both uSDHC and WiFi WoW wakeup mannually to make WoW work well. BTW, due to the wakeup feature is controller itself, so we do not need to reply on WiFi PM flags to enable it. Signed-off-by: Dong Aisheng <b29396@freescale.com>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci-esdhc-imx.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index bf02355121ed..5afec1ecceac 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -1180,9 +1180,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
1180 host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V; 1180 host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
1181 } 1181 }
1182 1182
1183 if (host->mmc->pm_caps & MMC_PM_KEEP_POWER && 1183 device_set_wakeup_capable(&pdev->dev, 1);
1184 host->mmc->pm_caps & MMC_PM_WAKE_SDIO_IRQ)
1185 device_init_wakeup(&pdev->dev, 1);
1186 1184
1187 err = sdhci_add_host(host); 1185 err = sdhci_add_host(host);
1188 if (err) 1186 if (err)