The commit 11dd62:[omap_hsmmc: context save/restore support] does a reset and restores AUTOIDLE settings. This patch saves the register does a reset and restores the same configuration.
Cc: Denis Karpov <[email protected]> Signed-off-by: Shubhrajyoti D <[email protected]> --- Untested drivers/mmc/host/omap_hsmmc.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index fd0c661..175029d 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -680,7 +680,7 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host) struct mmc_ios *ios = &host->mmc->ios; struct omap_mmc_platform_data *pdata = host->pdata; int context_loss = 0; - u32 hctl, capa; + u32 hctl, capa, sysc; unsigned long timeout; if (pdata->get_context_loss_count) { @@ -700,6 +700,7 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host) && time_before(jiffies, timeout)) ; + sysc = OMAP_HSMMC_READ(host->base, SYSCONFIG); /* Do software reset */ OMAP_HSMMC_WRITE(host->base, SYSCONFIG, SOFTRESET); timeout = jiffies + msecs_to_jiffies(MMC_TIMEOUT_MS); @@ -707,8 +708,7 @@ static int omap_hsmmc_context_restore(struct omap_hsmmc_host *host) && time_before(jiffies, timeout)) ; - OMAP_HSMMC_WRITE(host->base, SYSCONFIG, - OMAP_HSMMC_READ(host->base, SYSCONFIG) | AUTOIDLE); + OMAP_HSMMC_WRITE(host->base, SYSCONFIG, sysc); if (host->id == OMAP_MMC1_DEVID) { if (host->power_mode != MMC_POWER_OFF && -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
