Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
---
_Must_ be tested on non-SDHI systems with and without aggressive clock
gating enabled.
drivers/mmc/host/tmio_mmc.c | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index 5e880c06..13e447a 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -1155,19 +1155,18 @@ 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 */
- switch (ios->power_mode) {
- case MMC_POWER_OFF: /* power down SD bus */
- if (host->set_pwr)
+ 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);
- break;
- case MMC_POWER_ON: /* start bus clock */
- tmio_mmc_clk_start(host);
- break;
- case MMC_POWER_UP: /* power up SD bus */
+ } else if (ios->power_mode == MMC_POWER_UP) {
+ /* power up SD bus */
if (host->set_pwr)
host->set_pwr(host->pdev, 1);
- break;
+ } else {
+ /* start bus clock */
+ tmio_mmc_clk_start(host);
}
switch (ios->bus_width) {
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
