]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
mmc: omap_hsmmc: context save after enabling runtime pm
authorBalaji T K <balajitk@ti.com>
Fri, 24 Feb 2012 15:44:34 +0000 (21:14 +0530)
committerChris Ball <cjb@laptop.org>
Fri, 6 Apr 2012 00:32:27 +0000 (20:32 -0400)
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>
drivers/mmc/host/omap_hsmmc.c

index f15b04b9da2742d6cdd569bb86a96ad1576e33fd..4ee1570d18d6bf7ad671631408a34e915d1a76d0 100644 (file)
@@ -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");
                /*