diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-04-21 09:09:59 +0200 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-04-27 19:16:29 -0400 |
| commit | c919c2a073c5d2e076e52a56b44281d922721b61 (patch) | |
| tree | 1e179f87a4c7830c9abaf0c7b0a9452e1d72e69d /drivers | |
| parent | 26fc8775b51484d8c0a671198639c6d5ae60533e (diff) | |
| download | linux-3.10-c919c2a073c5d2e076e52a56b44281d922721b61.tar.gz linux-3.10-c919c2a073c5d2e076e52a56b44281d922721b61.tar.bz2 linux-3.10-c919c2a073c5d2e076e52a56b44281d922721b61.zip | |
mmc: tmio: fix .set_ios(MMC_POWER_UP) handling
The aggressive clock gating for TMIO MMC patch has broken switching
interface power on, using MFD or platform callbacks. Restore the
ios->power_mode == MMC_POWER_UP && ios->clock == 0 case handling.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers')
| -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 62d37de6de7..710339a85c8 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -728,15 +728,15 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) tmio_mmc_set_clock(host, ios->clock); /* Power sequence - OFF -> UP -> ON */ - if (ios->power_mode == MMC_POWER_OFF || !ios->clock) { + if (ios->power_mode == MMC_POWER_UP) { + /* power up SD bus */ + if (host->set_pwr) + host->set_pwr(host->pdev, 1); + } else if (ios->power_mode == MMC_POWER_OFF || !ios->clock) { /* power down SD bus */ if (ios->power_mode == MMC_POWER_OFF && host->set_pwr) host->set_pwr(host->pdev, 0); tmio_mmc_clk_stop(host); - } else if (ios->power_mode == MMC_POWER_UP) { - /* power up SD bus */ - if (host->set_pwr) - host->set_pwr(host->pdev, 1); } else { /* start bus clock */ tmio_mmc_clk_start(host); |