From d61393644b70a20889c0c4cb5ee050d4cf426e91 Mon Sep 17 00:00:00 2001 From: Dong Aisheng Date: Tue, 24 Jun 2014 17:25:03 +0800 Subject: [PATCH] MLK-11685-6 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 (cherry picked from commit 58f91ff6f6719fef44f5122ae1d8a5df7e0061d5) Signed-off-by: Haibo Chen Conflicts: drivers/mmc/host/sdhci-esdhc-imx.c --- drivers/mmc/host/sdhci-esdhc-imx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 3e97b79d5d14..4c3aeac7b2e4 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -1302,6 +1302,8 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) sdhci_esdhc_imx_hwinit(host); + device_set_wakeup_capable(&pdev->dev, 1); + err = sdhci_add_host(host); if (err) goto disable_clk; -- 2.17.1