aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-01-07 09:35:06 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-01-08 11:32:43 -0500
commit70be208f0bd75eb81264f681e36485d0617d612f (patch)
tree8f305dd12a26fa09123e90039993946448849ee6
parent6dbb6ee090e810be337945a7a64d647549b70328 (diff)
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>
-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 fba51073e94f..442b01129626 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -20,6 +20,7 @@
20#include <linux/err.h> 20#include <linux/err.h>
21#include <linux/highmem.h> 21#include <linux/highmem.h>
22#include <linux/log2.h> 22#include <linux/log2.h>
23#include <linux/mmc/pm.h>
23#include <linux/mmc/host.h> 24#include <linux/mmc/host.h>
24#include <linux/mmc/card.h> 25#include <linux/mmc/card.h>
25#include <linux/amba/bus.h> 26#include <linux/amba/bus.h>
@@ -1416,6 +1417,9 @@ static int mmci_probe(struct amba_device *dev,
1416 mmc->caps = plat->capabilities; 1417 mmc->caps = plat->capabilities;
1417 mmc->caps2 = plat->capabilities2; 1418 mmc->caps2 = plat->capabilities2;
1418 1419
1420 /* We support these PM capabilities. */
1421 mmc->pm_caps = MMC_PM_KEEP_POWER;
1422
1419 /* 1423 /*
1420 * We can do SGIO 1424 * We can do SGIO
1421 */ 1425 */