mmc-omap: Fix omap to use MMC_POWER_ON

46a6730e · Tony Lindgren <[email protected]> · 2007-05-01 16:34:16 +02:00

As discussed earlier on LKML:

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

Signed-off-by: Tony Lindgren <[email protected]>
Signed-off-by: Pierre Ossman <[email protected]>

Commit: 46a6730e3ff9add5089ddd007f998b97fb4e8571
Parents: 3647afce

Changes

1 files changed · +4 −2

File	Status	Add	Del	Content
drivers/mmc/host/omap.c	modified	+4	−2	View file

drivers/mmc/host/omap.c

View file

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 1b232c6..fc044a5 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -969,8 +969,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;
 	}
@@ -986,7 +988,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);