From: Tony Lindgren <tony@atomide.com>
Date: Sat, 10 Feb 2007 18:35:03 +0000 (-0800)
Subject: MMC: OMAP: Fix omap to use MMC_POWER_ON
X-Git-Tag: v2.6.21-omap1~111
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=35b382f1499c1a7cd975df2c878b3dd7506cc785;p=linux-2.6-omap-h63xx.git

MMC: OMAP: Fix omap to use MMC_POWER_ON

As discussed earlier on LKML:

http://lkml.org/lkml/2006/5/4/44

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c
index 16aeb8d75b3..3f8fd1eed4c 100644
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/omap.c
@@ -973,8 +973,10 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 		mmc_omap_power(host, 0);
 		break;
 	case MMC_POWER_UP:
-	case MMC_POWER_ON:
+		/* Cannot touch dsor yet, just power up MMC */
 		mmc_omap_power(host, 1);
+		return;
+	case MMC_POWER_ON:
 		dsor |= 1 << 11;
 		break;
 	}
@@ -990,7 +992,7 @@ static void mmc_omap_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 	 * Writing to the CON register twice seems to do the trick. */
 	for (i = 0; i < 2; i++)
 		OMAP_MMC_WRITE(host, CON, dsor);
-	if (ios->power_mode == MMC_POWER_UP) {
+	if (ios->power_mode == MMC_POWER_ON) {
 		/* Send clock cycles, poll completion */
 		OMAP_MMC_WRITE(host, IE, 0);
 		OMAP_MMC_WRITE(host, STAT, 0xffff);