From 515d3e79fe79218502fd0cf36a29d5cb928dcc7c Mon Sep 17 00:00:00 2001
From: Denis Karpov <ext-denis.2.karpov@nokia.com>
Date: Tue, 22 Sep 2009 16:44:40 -0700
Subject: [PATCH] --- yaml --- r: 164715 b: refs/heads/master c:
 1887bde391a3216789c9a03ac111d5f6ebfb0c00 h: refs/heads/master i:   164713:
 6dd808ff5c3e907e883962bfaae194f82492a3e1   164711:
 7f8dd3636f83ea6bdcb46827143be743ada9d240 v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/arm/mach-omap2/mmc-twl4030.c     | 15 +++++++++++++++
 trunk/arch/arm/plat-omap/include/mach/mmc.h |  3 +++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 45ae2fbde65e..eec852b9a607 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e2ea6173d71cee81e53da00911dcab8cc092acc
+refs/heads/master: 1887bde391a3216789c9a03ac111d5f6ebfb0c00
diff --git a/trunk/arch/arm/mach-omap2/mmc-twl4030.c b/trunk/arch/arm/mach-omap2/mmc-twl4030.c
index 3c04c2f1b23f..30d028627c5b 100644
--- a/trunk/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/trunk/arch/arm/mach-omap2/mmc-twl4030.c
@@ -198,6 +198,18 @@ static int twl_mmc_resume(struct device *dev, int slot)
 #define twl_mmc_resume	NULL
 #endif
 
+#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
+
+static int twl4030_mmc_get_context_loss(struct device *dev)
+{
+	/* FIXME: PM DPS not implemented yet */
+	return 0;
+}
+
+#else
+#define twl4030_mmc_get_context_loss NULL
+#endif
+
 static int twl_mmc1_set_power(struct device *dev, int slot, int power_on,
 				int vdd)
 {
@@ -390,6 +402,9 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
 		} else
 			mmc->slots[0].switch_pin = -EINVAL;
 
+		mmc->get_context_loss_count =
+				twl4030_mmc_get_context_loss;
+
 		/* write protect normally uses an OMAP gpio */
 		if (gpio_is_valid(c->gpio_wp)) {
 			gpio_request(c->gpio_wp, "mmc_wp");
diff --git a/trunk/arch/arm/plat-omap/include/mach/mmc.h b/trunk/arch/arm/plat-omap/include/mach/mmc.h
index 81d5b36534b3..2f7cf31f9cd6 100644
--- a/trunk/arch/arm/plat-omap/include/mach/mmc.h
+++ b/trunk/arch/arm/plat-omap/include/mach/mmc.h
@@ -59,6 +59,9 @@ struct omap_mmc_platform_data {
 	int (*suspend)(struct device *dev, int slot);
 	int (*resume)(struct device *dev, int slot);
 
+	/* Return context loss count due to PM states changing */
+	int (*get_context_loss_count)(struct device *dev);
+
 	u64 dma_mask;
 
 	struct omap_mmc_slot_data {