aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2011-03-09 14:38:58 +0100
committerChris Ball <cjb@laptop.org>2011-03-25 10:39:58 -0400
commita7edbe399b40fb82ccd11216fd88d24e428025c5 (patch)
tree2a46ebea94bf3cad5c9973fad6381a3450dec4a0 /drivers/mmc
parentd9b03421775d5cf8b4d5518a3e80b28cf3f999ce (diff)
downloadkernel_samsung_tuna-a7edbe399b40fb82ccd11216fd88d24e428025c5.zip
kernel_samsung_tuna-a7edbe399b40fb82ccd11216fd88d24e428025c5.tar.gz
kernel_samsung_tuna-a7edbe399b40fb82ccd11216fd88d24e428025c5.tar.bz2
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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/tmio_mmc_pio.c10
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 e1aed25..69772ab 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) {