Message ID | 1475225317-2815-5-git-send-email-shawn.lin@rock-chips.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 09/30/2016 05:48 PM, Shawn Lin wrote: > We could disable biu clk and power-off genpd if gpio > card detect available. > > Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> > --- > > drivers/mmc/host/dw_mmc-rockchip.c | 18 +++++++++++++++++- > 1 file changed, 17 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c > index 3ad041c..e7b3b6d 100644 > --- a/drivers/mmc/host/dw_mmc-rockchip.c > +++ b/drivers/mmc/host/dw_mmc-rockchip.c > @@ -13,6 +13,7 @@ > #include <linux/mmc/host.h> > #include <linux/mmc/dw_mmc.h> > #include <linux/of_address.h> > +#include <linux/mmc/slot-gpio.h> > #include <linux/pm_runtime.h> > #include <linux/slab.h> > > @@ -366,14 +367,29 @@ static int dw_mci_rockchip_remove(struct platform_device *pdev) > static int dw_mci_rockchip_runtime_suspend(struct device *dev) > { > struct dw_mci *host = dev_get_drvdata(dev); > + int ret; > > - return dw_mci_runtime_suspend(host); > + ret = dw_mci_runtime_suspend(host); > + if (ret) > + return ret; > + > + if (mmc_can_gpio_cd(host->slot[0]->mmc)) { Can use cur_slot instead of slot[0]? And doesn't need to check "host->slot[]" or "host->cur_slot"? Best Regards, Jaehoon Chung > + clk_disable_unprepare(host->biu_clk); > + pm_runtime_put(dev); > + } > + > + return 0; > } > > static int dw_mci_rockchip_runtime_resume(struct device *dev) > { > struct dw_mci *host = dev_get_drvdata(dev); > > + if (mmc_can_gpio_cd(host->slot[0]->mmc)) { > + pm_runtime_get_sync(dev); > + clk_prepare_enable(host->biu_clk); > + } > + > return dw_mci_runtime_resume(host); > } > #endif /* CONFIG_PM */ >
在 2016/10/7 12:15, Jaehoon Chung 写道: > On 09/30/2016 05:48 PM, Shawn Lin wrote: >> We could disable biu clk and power-off genpd if gpio >> card detect available. >> >> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> >> --- >> >> drivers/mmc/host/dw_mmc-rockchip.c | 18 +++++++++++++++++- >> 1 file changed, 17 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c >> index 3ad041c..e7b3b6d 100644 >> --- a/drivers/mmc/host/dw_mmc-rockchip.c >> +++ b/drivers/mmc/host/dw_mmc-rockchip.c >> @@ -13,6 +13,7 @@ >> #include <linux/mmc/host.h> >> #include <linux/mmc/dw_mmc.h> >> #include <linux/of_address.h> >> +#include <linux/mmc/slot-gpio.h> >> #include <linux/pm_runtime.h> >> #include <linux/slab.h> >> >> @@ -366,14 +367,29 @@ static int dw_mci_rockchip_remove(struct platform_device *pdev) >> static int dw_mci_rockchip_runtime_suspend(struct device *dev) >> { >> struct dw_mci *host = dev_get_drvdata(dev); >> + int ret; >> >> - return dw_mci_runtime_suspend(host); >> + ret = dw_mci_runtime_suspend(host); >> + if (ret) >> + return ret; >> + >> + if (mmc_can_gpio_cd(host->slot[0]->mmc)) { > > Can use cur_slot instead of slot[0]? And doesn't need to check "host->slot[]" or "host->cur_slot"? yes, we could. I will fix this for RFC-V3. Also I think we could disable biu_clk and genpd for non-removable devices since in these cases, we don't have interaction from devices 2 host.. But for sd, we should consider the card detect interrupt. > > Best Regards, > Jaehoon Chung > >> + clk_disable_unprepare(host->biu_clk); >> + pm_runtime_put(dev); >> + } >> + >> + return 0; >> } >> >> static int dw_mci_rockchip_runtime_resume(struct device *dev) >> { >> struct dw_mci *host = dev_get_drvdata(dev); >> >> + if (mmc_can_gpio_cd(host->slot[0]->mmc)) { >> + pm_runtime_get_sync(dev); >> + clk_prepare_enable(host->biu_clk); >> + } >> + >> return dw_mci_runtime_resume(host); >> } >> #endif /* CONFIG_PM */ >> > > > _______________________________________________ > Linux-rockchip mailing list > Linux-rockchip@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-rockchip >
diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c index 3ad041c..e7b3b6d 100644 --- a/drivers/mmc/host/dw_mmc-rockchip.c +++ b/drivers/mmc/host/dw_mmc-rockchip.c @@ -13,6 +13,7 @@ #include <linux/mmc/host.h> #include <linux/mmc/dw_mmc.h> #include <linux/of_address.h> +#include <linux/mmc/slot-gpio.h> #include <linux/pm_runtime.h> #include <linux/slab.h> @@ -366,14 +367,29 @@ static int dw_mci_rockchip_remove(struct platform_device *pdev) static int dw_mci_rockchip_runtime_suspend(struct device *dev) { struct dw_mci *host = dev_get_drvdata(dev); + int ret; - return dw_mci_runtime_suspend(host); + ret = dw_mci_runtime_suspend(host); + if (ret) + return ret; + + if (mmc_can_gpio_cd(host->slot[0]->mmc)) { + clk_disable_unprepare(host->biu_clk); + pm_runtime_put(dev); + } + + return 0; } static int dw_mci_rockchip_runtime_resume(struct device *dev) { struct dw_mci *host = dev_get_drvdata(dev); + if (mmc_can_gpio_cd(host->slot[0]->mmc)) { + pm_runtime_get_sync(dev); + clk_prepare_enable(host->biu_clk); + } + return dw_mci_runtime_resume(host); } #endif /* CONFIG_PM */
We could disable biu clk and power-off genpd if gpio card detect available. Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> --- drivers/mmc/host/dw_mmc-rockchip.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)