| Message ID | 1499451072-16513-1-git-send-email-zjwu@marvell.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Zhoujie, On Fri, 7 Jul 2017 11:11:12 -0700 Zhoujie Wu wrote: > 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. This email shows you are the author of this patch. However, IIRC, "Hu Ziji <huziji@marvell.com>" is the author of this patch, you are just the committer. We'd better be honest. > Hu Ziji has given his Signed off, why do you remove it? PS: We'd better send patch after 4.13-rc1 is released. Thanks > Signed-off-by: Zhoujie Wu <zjwu@marvell.com> > Tested-by: Jisheng Zhang <jszhang@marvell.com> > --- > drivers/mmc/host/sdhci-xenon.c | 42 +++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 41 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c > index bc1781b..9f399c4 100644 > --- a/drivers/mmc/host/sdhci-xenon.c > +++ b/drivers/mmc/host/sdhci-xenon.c > @@ -519,6 +519,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",}, > @@ -531,7 +571,7 @@ static int xenon_remove(struct platform_device *pdev) > .driver = { > .name = "xenon-sdhci", > .of_match_table = sdhci_xenon_dt_ids, > - .pm = &sdhci_pltfm_pmops, > + .pm = &xenon_pmops, > }, > .probe = xenon_probe, > .remove = xenon_remove, -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mmc/host/sdhci-xenon.c b/drivers/mmc/host/sdhci-xenon.c index bc1781b..9f399c4 100644 --- a/drivers/mmc/host/sdhci-xenon.c +++ b/drivers/mmc/host/sdhci-xenon.c @@ -519,6 +519,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",}, @@ -531,7 +571,7 @@ static int xenon_remove(struct platform_device *pdev) .driver = { .name = "xenon-sdhci", .of_match_table = sdhci_xenon_dt_ids, - .pm = &sdhci_pltfm_pmops, + .pm = &xenon_pmops, }, .probe = xenon_probe, .remove = xenon_remove,