summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-01-07 15:35:06 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-01-08 16:32:43 +0000
commit70be208f0bd75eb81264f681e36485d0617d612f (patch)
tree8f305dd12a26fa09123e90039993946448849ee6 /drivers/mmc
parent6dbb6ee090e810be337945a7a64d647549b70328 (diff)
downloadop-kernel-dev-70be208f0bd75eb81264f681e36485d0617d612f.zip
op-kernel-dev-70be208f0bd75eb81264f681e36485d0617d612f.tar.gz
ARM: 7618/1: mmc: mmci: Support MMC_PM_KEEP_POWER
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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/mmci.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index fba5107..442b011 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -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
*/
OpenPOWER on IntegriCloud