Commit df9bcc2b authored by Joonyoung Shim's avatar Joonyoung Shim Committed by Ulf Hansson

mmc: dw_mmc: add missing codes for runtime resume

The commit 64997de4fd17 ("mmc: dw_mmc: remove system PM callback") is
missing to call dw_mci_ctrl_reset(). This adds to call
dw_mci_ctrl_reset() and to handle error of clocks.
Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarJaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 9b93d392
...@@ -3296,7 +3296,13 @@ int dw_mci_runtime_resume(struct device *dev) ...@@ -3296,7 +3296,13 @@ int dw_mci_runtime_resume(struct device *dev)
ret = clk_prepare_enable(host->ciu_clk); ret = clk_prepare_enable(host->ciu_clk);
if (ret) if (ret)
return ret; goto err;
if (!dw_mci_ctrl_reset(host, SDMMC_CTRL_ALL_RESET_FLAGS)) {
clk_disable_unprepare(host->ciu_clk);
ret = -ENODEV;
goto err;
}
if (host->use_dma && host->dma_ops->init) if (host->use_dma && host->dma_ops->init)
host->dma_ops->init(host); host->dma_ops->init(host);
...@@ -3331,6 +3337,14 @@ int dw_mci_runtime_resume(struct device *dev) ...@@ -3331,6 +3337,14 @@ int dw_mci_runtime_resume(struct device *dev)
/* Now that slots are all setup, we can enable card detect */ /* Now that slots are all setup, we can enable card detect */
dw_mci_enable_cd(host); dw_mci_enable_cd(host);
return 0;
err:
if (host->cur_slot &&
(mmc_can_gpio_cd(host->cur_slot->mmc) ||
!mmc_card_is_removable(host->cur_slot->mmc)))
clk_disable_unprepare(host->biu_clk);
return ret; return ret;
} }
EXPORT_SYMBOL(dw_mci_runtime_resume); EXPORT_SYMBOL(dw_mci_runtime_resume);
......
Markdown is supported
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