summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-08-03 10:07:56 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-08-03 10:07:55 -0700
commit071e7f4168ccc4e2d101371e9227c7eec6a40468 (patch)
tree2f9bfe3f809189be081c38ccd6f794f53d74a8ec
parentb26562a8d37095aba53b390bcf246683fffd32d0 (diff)
parent4bc0ffd0fd0ff56cee7d3bc0fd573e79bc8aa29a (diff)
Merge "mmc: card: blk: Add support for deferred SD bus resume"
-rw-r--r--drivers/mmc/card/block.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 01e5502917f7..2a58061f3de6 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -4623,6 +4623,10 @@ static int mmc_blk_probe(struct mmc_card *card)
dev_set_drvdata(&card->dev, md);
+#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME
+ mmc_set_bus_resume_policy(card->host, 1);
+#endif
+
if (mmc_add_disk(md))
goto out;
@@ -4666,6 +4670,9 @@ static void mmc_blk_remove(struct mmc_card *card)
pm_runtime_put_noidle(&card->dev);
mmc_blk_remove_req(md);
dev_set_drvdata(&card->dev, NULL);
+#ifdef CONFIG_MMC_BLOCK_DEFERRED_RESUME
+ mmc_set_bus_resume_policy(card->host, 0);
+#endif
}
static int _mmc_blk_suspend(struct mmc_card *card, bool wait)