diff options
| author | Tony Lindgren <tony@atomide.com> | 2007-05-01 16:34:16 +0200 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2007-05-01 16:34:16 +0200 |
| commit | 46a6730e3ff9add5089ddd007f998b97fb4e8571 (patch) | |
| tree | 996144a83f8c8b6430bf9a90a45189fc9e2d7de1 /drivers/mmc | |
| parent | 3647afcec11f2fcfc6269e513ff97fec1374d1b8 (diff) | |
| download | linux-46a6730e3ff9add5089ddd007f998b97fb4e8571.tar.bz2 | |
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>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/omap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 1b232c6dd016..fc044a5ed64e 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); |