| Message ID | 1413776535-10123-3-git-send-email-wenyou.yang@atmel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Oct 20, 2014 at 11:42:13AM +0800, Wenyou Yang wrote: > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> Acked by: Ludovic Desroches <ludovic.desroches@atmel.com> > --- > drivers/i2c/busses/i2c-at91.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c > index 03b9f48..8f408f8 100644 > --- a/drivers/i2c/busses/i2c-at91.c > +++ b/drivers/i2c/busses/i2c-at91.c > @@ -845,6 +845,35 @@ static int at91_twi_remove(struct platform_device *pdev) > } > > #ifdef CONFIG_PM > +#ifdef CONFIG_PM_SLEEP > +static int at91_twi_suspend(struct device *dev) > +{ > + struct at91_twi_dev *twi_dev = dev_get_drvdata(dev); > + > + if (!pm_runtime_suspended(dev)) > + clk_disable_unprepare(twi_dev->clk); > + > + return 0; > +} > + > +static int at91_twi_resume(struct device *dev) > +{ > + struct at91_twi_dev *twi_dev = dev_get_drvdata(dev); > + int ret; > + > + if (!pm_runtime_suspended(dev)) { > + ret = clk_prepare_enable(twi_dev->clk); > + if (ret) > + return ret; > + } > + > + pm_runtime_mark_last_busy(dev); > + pm_request_autosuspend(dev); > + > + return 0; > +} > +#endif > + > #ifdef CONFIG_PM_RUNTIME > static int at91_twi_runtime_suspend(struct device *dev) > { > @@ -864,6 +893,7 @@ static int at91_twi_runtime_resume(struct device *dev) > #endif > > static const struct dev_pm_ops at91_twi_pm = { > + SET_SYSTEM_SLEEP_PM_OPS(at91_twi_suspend, at91_twi_resume) > SET_RUNTIME_PM_OPS(at91_twi_runtime_suspend, > at91_twi_runtime_resume, NULL) > }; > -- > 1.7.9.5 >
Adding Kevin in the CC list since he had some comments about the PM runtime support for the SPI driver. On Mon, Oct 20, 2014 at 02:42:42PM +0200, Ludovic Desroches wrote: > On Mon, Oct 20, 2014 at 11:42:13AM +0800, Wenyou Yang wrote: > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > > Acked by: Ludovic Desroches <ludovic.desroches@atmel.com> > > > --- > > drivers/i2c/busses/i2c-at91.c | 30 ++++++++++++++++++++++++++++++ > > 1 file changed, 30 insertions(+) > > > > diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c > > index 03b9f48..8f408f8 100644 > > --- a/drivers/i2c/busses/i2c-at91.c > > +++ b/drivers/i2c/busses/i2c-at91.c > > @@ -845,6 +845,35 @@ static int at91_twi_remove(struct platform_device *pdev) > > } > > > > #ifdef CONFIG_PM > > +#ifdef CONFIG_PM_SLEEP > > +static int at91_twi_suspend(struct device *dev) > > +{ > > + struct at91_twi_dev *twi_dev = dev_get_drvdata(dev); > > + > > + if (!pm_runtime_suspended(dev)) > > + clk_disable_unprepare(twi_dev->clk); > > + > > + return 0; > > +} > > + > > +static int at91_twi_resume(struct device *dev) > > +{ > > + struct at91_twi_dev *twi_dev = dev_get_drvdata(dev); > > + int ret; > > + > > + if (!pm_runtime_suspended(dev)) { > > + ret = clk_prepare_enable(twi_dev->clk); > > + if (ret) > > + return ret; > > + } > > + > > + pm_runtime_mark_last_busy(dev); > > + pm_request_autosuspend(dev); > > + > > + return 0; > > +} > > +#endif > > + > > #ifdef CONFIG_PM_RUNTIME > > static int at91_twi_runtime_suspend(struct device *dev) > > { > > @@ -864,6 +893,7 @@ static int at91_twi_runtime_resume(struct device *dev) > > #endif > > > > static const struct dev_pm_ops at91_twi_pm = { > > + SET_SYSTEM_SLEEP_PM_OPS(at91_twi_suspend, at91_twi_resume) > > SET_RUNTIME_PM_OPS(at91_twi_runtime_suspend, > > at91_twi_runtime_resume, NULL) > > }; > > -- > > 1.7.9.5 > >
Wenyou Yang <wenyou.yang@atmel.com> writes: Add a changelog here describing what you're doing, and why. > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > --- > drivers/i2c/busses/i2c-at91.c | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > > diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c > index 03b9f48..8f408f8 100644 > --- a/drivers/i2c/busses/i2c-at91.c > +++ b/drivers/i2c/busses/i2c-at91.c > @@ -845,6 +845,35 @@ static int at91_twi_remove(struct platform_device *pdev) > } > > #ifdef CONFIG_PM > +#ifdef CONFIG_PM_SLEEP > +static int at91_twi_suspend(struct device *dev) > +{ > + struct at91_twi_dev *twi_dev = dev_get_drvdata(dev); > + > + if (!pm_runtime_suspended(dev)) > + clk_disable_unprepare(twi_dev->clk); I would just call at91_twi_runtime_suspend() here. Then, if you need to add additional steps, you only have to add them in once place. This also makes it obvious that ->suspend and ->runtime_suspend are doing the exact same thing. NOTE: you'll need to wrap the runtime_suspend|resume functions in just CONFIG_PM instead of CONFIG_PM_RUNTIME for this to work. Kevin
Hi Kevin, > -----Original Message----- > From: Kevin Hilman [mailto:khilman@kernel.org] > Sent: Tuesday, October 21, 2014 2:16 AM > To: Yang, Wenyou > Cc: wsa@the-dreams.de; Desroches, Ludovic; linux-i2c@vger.kernel.org; linux- > kernel@vger.kernel.org; Ferre, Nicolas; linux-arm-kernel@lists.infradead.org > Subject: Re: [PATCH 2/3] i2c/at91: add support for system PM > > Wenyou Yang <wenyou.yang@atmel.com> writes: > > Add a changelog here describing what you're doing, and why. > > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > > --- > > drivers/i2c/busses/i2c-at91.c | 30 ++++++++++++++++++++++++++++++ > > 1 file changed, 30 insertions(+) > > > > diff --git a/drivers/i2c/busses/i2c-at91.c > > b/drivers/i2c/busses/i2c-at91.c index 03b9f48..8f408f8 100644 > > --- a/drivers/i2c/busses/i2c-at91.c > > +++ b/drivers/i2c/busses/i2c-at91.c > > @@ -845,6 +845,35 @@ static int at91_twi_remove(struct platform_device > > *pdev) } > > > > #ifdef CONFIG_PM > > +#ifdef CONFIG_PM_SLEEP > > +static int at91_twi_suspend(struct device *dev) { > > + struct at91_twi_dev *twi_dev = dev_get_drvdata(dev); > > + > > + if (!pm_runtime_suspended(dev)) > > + clk_disable_unprepare(twi_dev->clk); > > I would just call at91_twi_runtime_suspend() here. > > Then, if you need to add additional steps, you only have to add them in once > place. This also makes it obvious that ->suspend and > ->runtime_suspend are doing the exact same thing. > > NOTE: you'll need to wrap the runtime_suspend|resume functions in just > CONFIG_PM instead of CONFIG_PM_RUNTIME for this to work. Thanks a lot, I will modify it. > > Kevin Best Regards, Wenyou Yang
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c index 03b9f48..8f408f8 100644 --- a/drivers/i2c/busses/i2c-at91.c +++ b/drivers/i2c/busses/i2c-at91.c @@ -845,6 +845,35 @@ static int at91_twi_remove(struct platform_device *pdev) } #ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP +static int at91_twi_suspend(struct device *dev) +{ + struct at91_twi_dev *twi_dev = dev_get_drvdata(dev); + + if (!pm_runtime_suspended(dev)) + clk_disable_unprepare(twi_dev->clk); + + return 0; +} + +static int at91_twi_resume(struct device *dev) +{ + struct at91_twi_dev *twi_dev = dev_get_drvdata(dev); + int ret; + + if (!pm_runtime_suspended(dev)) { + ret = clk_prepare_enable(twi_dev->clk); + if (ret) + return ret; + } + + pm_runtime_mark_last_busy(dev); + pm_request_autosuspend(dev); + + return 0; +} +#endif + #ifdef CONFIG_PM_RUNTIME static int at91_twi_runtime_suspend(struct device *dev) { @@ -864,6 +893,7 @@ static int at91_twi_runtime_resume(struct device *dev) #endif static const struct dev_pm_ops at91_twi_pm = { + SET_SYSTEM_SLEEP_PM_OPS(at91_twi_suspend, at91_twi_resume) SET_RUNTIME_PM_OPS(at91_twi_runtime_suspend, at91_twi_runtime_resume, NULL) };
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> --- drivers/i2c/busses/i2c-at91.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)