diff options
| author | Balaji T K <balajitk@ti.com> | 2012-02-24 21:14:34 +0530 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2012-04-05 20:32:27 -0400 |
| commit | 92a3aebf06bdef849cc53aba99f963a9ae397e9d (patch) | |
| tree | d87b00575049f36325563532b77d891cf278aa37 /drivers/mmc | |
| parent | d59d77ed1e0cdd254f99260013b27d64dc1dffac (diff) | |
| download | linux-92a3aebf06bdef849cc53aba99f963a9ae397e9d.tar.gz linux-92a3aebf06bdef849cc53aba99f963a9ae397e9d.tar.bz2 linux-92a3aebf06bdef849cc53aba99f963a9ae397e9d.zip | |
mmc: omap_hsmmc: context save after enabling runtime pm
Call context save api after enabling runtime pm to make sure that
register access in context save api happens with clk enabled.
Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Venkatraman S <svenkatr@ti.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index f15b04b9da27..4ee1570d18d6 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1875,8 +1875,6 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) goto err1; } - omap_hsmmc_context_save(host); - if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) { dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n"); mmc->caps2 |= MMC_CAP2_NO_MULTI_READ; @@ -1887,6 +1885,8 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev) pm_runtime_set_autosuspend_delay(host->dev, MMC_AUTOSUSPEND_DELAY); pm_runtime_use_autosuspend(host->dev); + omap_hsmmc_context_save(host); + if (cpu_is_omap2430()) { host->dbclk = clk_get(&pdev->dev, "mmchsdb_fck"); /* |