summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHu Ziji <huziji@marvell.com>2017-07-12 15:16:19 -0700
committerUlf Hansson <ulf.hansson@linaro.org>2017-08-30 14:01:57 +0200
commita0fd95b30edb12d8be714674dbd5377b0441786b (patch)
treea38718df166481f875cafcffd857926863446bb7
parent03de19212ea3bce221e0e79dba8752ddc5b350cb (diff)
downloadlinux-stable-a0fd95b30edb12d8be714674dbd5377b0441786b.tar.gz
linux-stable-a0fd95b30edb12d8be714674dbd5377b0441786b.tar.bz2
linux-stable-a0fd95b30edb12d8be714674dbd5377b0441786b.zip
mmc: sdhci-xenon: Add Xenon SDHCI specific system-level PM support
Add Xenon specific system-level suspend and resume support. Especially during resume, re-configure Xenon specific registers since registers setting will be lost in suspend if Xenon is power off. Signed-off-by: Hu Ziji <huziji@marvell.com> Signed-off-by: Zhoujie Wu <zjwu@marvell.com> Tested-by: Jisheng Zhang <jszhang@marvell.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/sdhci-xenon.c42
1 files changed, 41 insertions, 1 deletions
diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c
index edd4d9151071..6012926b1aed 100644
--- a/drivers/mmc/host/sdhci-xenon.c
+++ b/drivers/mmc/host/sdhci-xenon.c
@@ -518,6 +518,46 @@ static int xenon_remove(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_PM_SLEEP
+static int xenon_suspend(struct device *dev)
+{
+ struct sdhci_host *host = dev_get_drvdata(dev);
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ int ret;
+
+ ret = sdhci_suspend_host(host);
+ if (ret)
+ return ret;
+
+ clk_disable_unprepare(pltfm_host->clk);
+ return ret;
+}
+
+static int xenon_resume(struct device *dev)
+{
+ struct sdhci_host *host = dev_get_drvdata(dev);
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ int ret;
+
+ ret = clk_prepare_enable(pltfm_host->clk);
+ if (ret)
+ return ret;
+
+ /*
+ * If SoCs power off the entire Xenon, registers setting will
+ * be lost.
+ * Re-configure Xenon specific register to enable current SDHC
+ */
+ ret = xenon_sdhc_prepare(host);
+ if (ret)
+ return ret;
+
+ return sdhci_resume_host(host);
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(xenon_pmops, xenon_suspend, xenon_resume);
+
static const struct of_device_id sdhci_xenon_dt_ids[] = {
{ .compatible = "marvell,armada-ap806-sdhci",},
{ .compatible = "marvell,armada-cp110-sdhci",},
@@ -530,7 +570,7 @@ static struct platform_driver sdhci_xenon_driver = {
.driver = {
.name = "xenon-sdhci",
.of_match_table = sdhci_xenon_dt_ids,
- .pm = &sdhci_pltfm_pmops,
+ .pm = &xenon_pmops,
},
.probe = xenon_probe,
.remove = xenon_remove,