From ba758d34fa653a9c14dd6baedccfaa3cd5cf33e5 Mon Sep 17 00:00:00 2001
From: Ulf Hansson <ulf.hansson@linaro.org>
Date: Wed, 9 Jan 2013 11:15:26 +0100
Subject: [PATCH] --- yaml --- r: 351127 b: refs/heads/master c:
 8259293aee1d44d7ebf0c644ef48db835653ebc3 h: refs/heads/master i:   351125:
 a7f4236b25f3e54633a7dfc07d05613c647b361f   351123:
 2138b7792b707a0f05e25f255d5c7d56a6f18217   351119:
 435f7877db085e765a07523d95888d8c3ad8af07 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/mmc/host/mmci.c | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 77e05b39758c..1c2fcc79c71e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 599c1d5c750ddf528c7c6d3cdc466708f0502e66
+refs/heads/master: 8259293aee1d44d7ebf0c644ef48db835653ebc3
diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c
index 3094ea3ed722..b43e1ab5cb5c 100644
--- a/trunk/drivers/mmc/host/mmci.c
+++ b/trunk/drivers/mmc/host/mmci.c
@@ -1614,8 +1614,37 @@ static int mmci_resume(struct device *dev)
 }
 #endif
 
+#ifdef CONFIG_PM_RUNTIME
+static int mmci_runtime_suspend(struct device *dev)
+{
+	struct amba_device *adev = to_amba_device(dev);
+	struct mmc_host *mmc = amba_get_drvdata(adev);
+
+	if (mmc) {
+		struct mmci_host *host = mmc_priv(mmc);
+		clk_disable_unprepare(host->clk);
+	}
+
+	return 0;
+}
+
+static int mmci_runtime_resume(struct device *dev)
+{
+	struct amba_device *adev = to_amba_device(dev);
+	struct mmc_host *mmc = amba_get_drvdata(adev);
+
+	if (mmc) {
+		struct mmci_host *host = mmc_priv(mmc);
+		clk_prepare_enable(host->clk);
+	}
+
+	return 0;
+}
+#endif
+
 static const struct dev_pm_ops mmci_dev_pm_ops = {
 	SET_SYSTEM_SLEEP_PM_OPS(mmci_suspend, mmci_resume)
+	SET_RUNTIME_PM_OPS(mmci_runtime_suspend, mmci_runtime_resume, NULL)
 };
 
 static struct amba_id mmci_ids[] = {