]> Pileus Git - ~andy/linux/commitdiff
ARM: 7618/1: mmc: mmci: Support MMC_PM_KEEP_POWER
authorUlf Hansson <ulf.hansson@linaro.org>
Mon, 7 Jan 2013 14:35:06 +0000 (15:35 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 8 Jan 2013 16:32:43 +0000 (16:32 +0000)
Add MMC_PM_KEEP_POWER to pm_caps so SDIO clients are able
to use this option to prevent power off in suspend.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
drivers/mmc/host/mmci.c

index fba51073e94f2fc255815e93c87fda56e96819e2..442b01129626824ba6fd4283dc0e638885e5cab0 100644 (file)
@@ -20,6 +20,7 @@
 #include <linux/err.h>
 #include <linux/highmem.h>
 #include <linux/log2.h>
+#include <linux/mmc/pm.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
 #include <linux/amba/bus.h>
@@ -1416,6 +1417,9 @@ static int mmci_probe(struct amba_device *dev,
        mmc->caps = plat->capabilities;
        mmc->caps2 = plat->capabilities2;
 
+       /* We support these PM capabilities. */
+       mmc->pm_caps = MMC_PM_KEEP_POWER;
+
        /*
         * We can do SGIO
         */