From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Mon, 7 Jan 2013 14:35:06 +0000 (+0100)
Subject: ARM: 7618/1: mmc: mmci: Support MMC_PM_KEEP_POWER
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=70be208f0bd75eb81264f681e36485d0617d612f;p=deliverable%2Flinux.git

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>
---

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 @@
 #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
 	 */