diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-03-09 14:38:58 +0100 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-03-25 15:39:58 +0100 |
| commit | a7edbe399b40fb82ccd11216fd88d24e428025c5 (patch) | |
| tree | 2a46ebea94bf3cad5c9973fad6381a3450dec4a0 | |
| parent | mmc: tmio: remove work-around for unmasked SDIO interrupts (diff) | |
| download | linux-a7edbe399b40fb82ccd11216fd88d24e428025c5.tar.xz linux-a7edbe399b40fb82ccd11216fd88d24e428025c5.zip | |
mmc: tmio: fix power-mode interpretation
The power-mode sequence on MMC is MMC_POWER_OFF -> MMC_POWER_UP ->
MMC_POWER_ON and not MMC_POWER_ON -> MMC_POWER_UP, as the driver currently
is implying.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
| -rw-r--r-- | drivers/mmc/host/tmio_mmc_pio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index e1aed2555126..69772ab3ca22 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -746,20 +746,20 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) if (ios->clock) tmio_mmc_set_clock(host, ios->clock); - /* Power sequence - OFF -> ON -> UP */ + /* Power sequence - OFF -> UP -> ON */ switch (ios->power_mode) { case MMC_POWER_OFF: /* power down SD bus */ if (host->set_pwr) host->set_pwr(host->pdev, 0); tmio_mmc_clk_stop(host); break; - case MMC_POWER_ON: /* power up SD bus */ + case MMC_POWER_ON: /* start bus clock */ + tmio_mmc_clk_start(host); + break; + case MMC_POWER_UP: /* power up SD bus */ if (host->set_pwr) host->set_pwr(host->pdev, 1); break; - case MMC_POWER_UP: /* start bus clock */ - tmio_mmc_clk_start(host); - break; } switch (ios->bus_width) { |