Commit 8861474a authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Revert "mmc: tmio: move runtime PM enablement to the driver implementations"

This reverts commit 7ff21319.

It turns out that the above commit introduces other problems. For example,
calling pm_runtime_set_active() must not be done prior calling
pm_runtime_enable() as that makes it fail. This leads to additional
problems, such as clock enables being wrongly balanced.

Rather than fixing the problem on top, let's start over by doing a revert.

Fixes: 7ff21319

 ("mmc: tmio: move runtime PM enablement to the driver implementations")
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Tested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 49baa01c
...@@ -774,8 +774,6 @@ int renesas_sdhi_probe(struct platform_device *pdev, ...@@ -774,8 +774,6 @@ int renesas_sdhi_probe(struct platform_device *pdev,
/* All SDHI have SDIO status bits which must be 1 */ /* All SDHI have SDIO status bits which must be 1 */
mmc_data->flags |= TMIO_MMC_SDIO_STATUS_SETBITS; mmc_data->flags |= TMIO_MMC_SDIO_STATUS_SETBITS;
pm_runtime_enable(&pdev->dev);
ret = renesas_sdhi_clk_enable(host); ret = renesas_sdhi_clk_enable(host);
if (ret) if (ret)
goto efree; goto efree;
...@@ -856,8 +854,6 @@ edisclk: ...@@ -856,8 +854,6 @@ edisclk:
efree: efree:
tmio_mmc_host_free(host); tmio_mmc_host_free(host);
pm_runtime_disable(&pdev->dev);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(renesas_sdhi_probe); EXPORT_SYMBOL_GPL(renesas_sdhi_probe);
...@@ -869,8 +865,6 @@ int renesas_sdhi_remove(struct platform_device *pdev) ...@@ -869,8 +865,6 @@ int renesas_sdhi_remove(struct platform_device *pdev)
tmio_mmc_host_remove(host); tmio_mmc_host_remove(host);
renesas_sdhi_clk_disable(host); renesas_sdhi_clk_disable(host);
pm_runtime_disable(&pdev->dev);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(renesas_sdhi_remove); EXPORT_SYMBOL_GPL(renesas_sdhi_remove);
......
...@@ -172,8 +172,6 @@ static int tmio_mmc_probe(struct platform_device *pdev) ...@@ -172,8 +172,6 @@ static int tmio_mmc_probe(struct platform_device *pdev)
host->mmc->f_max = pdata->hclk; host->mmc->f_max = pdata->hclk;
host->mmc->f_min = pdata->hclk / 512; host->mmc->f_min = pdata->hclk / 512;
pm_runtime_enable(&pdev->dev);
ret = tmio_mmc_host_probe(host); ret = tmio_mmc_host_probe(host);
if (ret) if (ret)
goto host_free; goto host_free;
...@@ -193,7 +191,6 @@ host_remove: ...@@ -193,7 +191,6 @@ host_remove:
tmio_mmc_host_remove(host); tmio_mmc_host_remove(host);
host_free: host_free:
tmio_mmc_host_free(host); tmio_mmc_host_free(host);
pm_runtime_disable(&pdev->dev);
cell_disable: cell_disable:
if (cell->disable) if (cell->disable)
cell->disable(pdev); cell->disable(pdev);
...@@ -210,8 +207,6 @@ static int tmio_mmc_remove(struct platform_device *pdev) ...@@ -210,8 +207,6 @@ static int tmio_mmc_remove(struct platform_device *pdev)
if (cell->disable) if (cell->disable)
cell->disable(pdev); cell->disable(pdev);
pm_runtime_disable(&pdev->dev);
return 0; return 0;
} }
......
...@@ -1153,15 +1153,6 @@ void tmio_mmc_host_free(struct tmio_mmc_host *host) ...@@ -1153,15 +1153,6 @@ void tmio_mmc_host_free(struct tmio_mmc_host *host)
} }
EXPORT_SYMBOL_GPL(tmio_mmc_host_free); EXPORT_SYMBOL_GPL(tmio_mmc_host_free);
/**
* tmio_mmc_host_probe() - Common probe for all implementations
* @_host: Host to probe
*
* Perform tasks common to all implementations probe functions.
*
* The caller should have called pm_runtime_enable() prior to calling
* the common probe function.
*/
int tmio_mmc_host_probe(struct tmio_mmc_host *_host) int tmio_mmc_host_probe(struct tmio_mmc_host *_host)
{ {
struct platform_device *pdev = _host->pdev; struct platform_device *pdev = _host->pdev;
...@@ -1260,6 +1251,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) ...@@ -1260,6 +1251,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host)
pm_runtime_set_active(&pdev->dev); pm_runtime_set_active(&pdev->dev);
pm_runtime_set_autosuspend_delay(&pdev->dev, 50); pm_runtime_set_autosuspend_delay(&pdev->dev, 50);
pm_runtime_use_autosuspend(&pdev->dev); pm_runtime_use_autosuspend(&pdev->dev);
pm_runtime_enable(&pdev->dev);
ret = mmc_add_host(mmc); ret = mmc_add_host(mmc);
if (ret) if (ret)
...@@ -1295,6 +1287,7 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host) ...@@ -1295,6 +1287,7 @@ void tmio_mmc_host_remove(struct tmio_mmc_host *host)
pm_runtime_dont_use_autosuspend(&pdev->dev); pm_runtime_dont_use_autosuspend(&pdev->dev);
pm_runtime_put_sync(&pdev->dev); pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
} }
EXPORT_SYMBOL_GPL(tmio_mmc_host_remove); EXPORT_SYMBOL_GPL(tmio_mmc_host_remove);
......
...@@ -631,7 +631,6 @@ static int uniphier_sd_probe(struct platform_device *pdev) ...@@ -631,7 +631,6 @@ static int uniphier_sd_probe(struct platform_device *pdev)
host->clk_disable = uniphier_sd_clk_disable; host->clk_disable = uniphier_sd_clk_disable;
host->set_clock = uniphier_sd_set_clock; host->set_clock = uniphier_sd_set_clock;
pm_runtime_enable(&pdev->dev);
ret = uniphier_sd_clk_enable(host); ret = uniphier_sd_clk_enable(host);
if (ret) if (ret)
goto free_host; goto free_host;
...@@ -653,7 +652,6 @@ static int uniphier_sd_probe(struct platform_device *pdev) ...@@ -653,7 +652,6 @@ static int uniphier_sd_probe(struct platform_device *pdev)
free_host: free_host:
tmio_mmc_host_free(host); tmio_mmc_host_free(host);
pm_runtime_disable(&pdev->dev);
return ret; return ret;
} }
...@@ -664,7 +662,6 @@ static int uniphier_sd_remove(struct platform_device *pdev) ...@@ -664,7 +662,6 @@ static int uniphier_sd_remove(struct platform_device *pdev)
tmio_mmc_host_remove(host); tmio_mmc_host_remove(host);
uniphier_sd_clk_disable(host); uniphier_sd_clk_disable(host);
pm_runtime_disable(&pdev->dev);
return 0; return 0;
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment