diff mbox

[10/12] usb: r8a66597-hcd: Convert to clk_prepare/unprepare

Message ID 1383000569-8916-11-git-send-email-laurent.pinchart+renesas@ideasonboard.com (mailing list archive)
State New, archived
Headers show

Commit Message

Laurent Pinchart Oct. 28, 2013, 10:49 p.m. UTC
Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
clk_disable_unprepare() to get ready for the migration to the common
clock framework.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/usb/host/r8a66597-hcd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Yoshihiro Shimoda Oct. 29, 2013, 9:47 a.m. UTC | #1
Hi Laurent-san,

(2013/10/29 7:49), Laurent Pinchart wrote:
> Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
> clk_disable_unprepare() to get ready for the migration to the common
> clock framework.
> 
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> Cc: linux-usb@vger.kernel.org
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Thank you for the patch.

Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Best regards,
Yoshihro Shimoda

> ---
>  drivers/usb/host/r8a66597-hcd.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
> index 2ad004a..a2fdd85 100644
> --- a/drivers/usb/host/r8a66597-hcd.c
> +++ b/drivers/usb/host/r8a66597-hcd.c
> @@ -95,7 +95,7 @@ static int r8a66597_clock_enable(struct r8a66597 *r8a66597)
>  	int i = 0;
>  
>  	if (r8a66597->pdata->on_chip) {
> -		clk_enable(r8a66597->clk);
> +		clk_prepare_enable(r8a66597->clk);
>  		do {
>  			r8a66597_write(r8a66597, SCKE, SYSCFG0);
>  			tmp = r8a66597_read(r8a66597, SYSCFG0);
> @@ -139,7 +139,7 @@ static void r8a66597_clock_disable(struct r8a66597 *r8a66597)
>  	udelay(1);
>  
>  	if (r8a66597->pdata->on_chip) {
> -		clk_disable(r8a66597->clk);
> +		clk_disable_unprepare(r8a66597->clk);
>  	} else {
>  		r8a66597_bclr(r8a66597, PLLC, SYSCFG0);
>  		r8a66597_bclr(r8a66597, XCKE, SYSCFG0);
>
Laurent Pinchart Nov. 9, 2013, 2:12 p.m. UTC | #2
Hi Greg,

On Tuesday 29 October 2013 18:47:26 Shimoda, Yoshihiro wrote:
> Hi Laurent-san,
> 
> (2013/10/29 7:49), Laurent Pinchart wrote:
> > Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
> > clk_disable_unprepare() to get ready for the migration to the common
> > clock framework.
> > 
> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > Cc: linux-usb@vger.kernel.org
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> 
> Thank you for the patch.
> 
> Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Could you please pick this patch up ?

> > ---
> > 
> >  drivers/usb/host/r8a66597-hcd.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/usb/host/r8a66597-hcd.c
> > b/drivers/usb/host/r8a66597-hcd.c index 2ad004a..a2fdd85 100644
> > --- a/drivers/usb/host/r8a66597-hcd.c
> > +++ b/drivers/usb/host/r8a66597-hcd.c
> > @@ -95,7 +95,7 @@ static int r8a66597_clock_enable(struct r8a66597
> > *r8a66597)> 
> >  	int i = 0;
> >  	
> >  	if (r8a66597->pdata->on_chip) {
> > 
> > -		clk_enable(r8a66597->clk);
> > +		clk_prepare_enable(r8a66597->clk);
> > 
> >  		do {
> >  		
> >  			r8a66597_write(r8a66597, SCKE, SYSCFG0);
> >  			tmp = r8a66597_read(r8a66597, SYSCFG0);
> > 
> > @@ -139,7 +139,7 @@ static void r8a66597_clock_disable(struct r8a66597
> > *r8a66597)> 
> >  	udelay(1);
> >  	
> >  	if (r8a66597->pdata->on_chip) {
> > 
> > -		clk_disable(r8a66597->clk);
> > +		clk_disable_unprepare(r8a66597->clk);
> > 
> >  	} else {
> >  	
> >  		r8a66597_bclr(r8a66597, PLLC, SYSCFG0);
> >  		r8a66597_bclr(r8a66597, XCKE, SYSCFG0);
Greg Kroah-Hartman Nov. 9, 2013, 4:10 p.m. UTC | #3
On Sat, Nov 09, 2013 at 03:12:05PM +0100, Laurent Pinchart wrote:
> Hi Greg,
> 
> On Tuesday 29 October 2013 18:47:26 Shimoda, Yoshihiro wrote:
> > Hi Laurent-san,
> > 
> > (2013/10/29 7:49), Laurent Pinchart wrote:
> > > Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
> > > clk_disable_unprepare() to get ready for the migration to the common
> > > clock framework.
> > > 
> > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > Cc: linux-usb@vger.kernel.org
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas@ideasonboard.com>
> > 
> > Thank you for the patch.
> > 
> > Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> 
> Could you please pick this patch up ?

I'll pick things up after 3.13-rc1 is out, I can't do anything until
then.

thanks,

greg k-h
Laurent Pinchart Nov. 26, 2013, 2 a.m. UTC | #4
Hi Greg,

On Saturday 09 November 2013 08:10:59 Greg Kroah-Hartman wrote:
> On Sat, Nov 09, 2013 at 03:12:05PM +0100, Laurent Pinchart wrote:
> > On Tuesday 29 October 2013 18:47:26 Shimoda, Yoshihiro wrote:
> > > Hi Laurent-san,
> > > 
> > > (2013/10/29 7:49), Laurent Pinchart wrote:
> > > > Turn clk_enable() and clk_disable() calls into clk_prepare_enable()
> > > > and
> > > > clk_disable_unprepare() to get ready for the migration to the common
> > > > clock framework.
> > > > 
> > > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > > Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > > Cc: linux-usb@vger.kernel.org
> > > > Signed-off-by: Laurent Pinchart
> > > > <laurent.pinchart+renesas@ideasonboard.com>
> > > 
> > > Thank you for the patch.
> > > 
> > > Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > 
> > Could you please pick this patch up ?
> 
> I'll pick things up after 3.13-rc1 is out, I can't do anything until
> then.

Sure.

As this patch is a dependency for other series that will go through different 
trees, could you please provide a stable branch in your tree with this patch 
included that you will push to v3.14 ?
Greg Kroah-Hartman Nov. 26, 2013, 2:36 a.m. UTC | #5
On Tue, Nov 26, 2013 at 03:00:30AM +0100, Laurent Pinchart wrote:
> Hi Greg,
> 
> On Saturday 09 November 2013 08:10:59 Greg Kroah-Hartman wrote:
> > On Sat, Nov 09, 2013 at 03:12:05PM +0100, Laurent Pinchart wrote:
> > > On Tuesday 29 October 2013 18:47:26 Shimoda, Yoshihiro wrote:
> > > > Hi Laurent-san,
> > > > 
> > > > (2013/10/29 7:49), Laurent Pinchart wrote:
> > > > > Turn clk_enable() and clk_disable() calls into clk_prepare_enable()
> > > > > and
> > > > > clk_disable_unprepare() to get ready for the migration to the common
> > > > > clock framework.
> > > > > 
> > > > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > > > Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > > > Cc: linux-usb@vger.kernel.org
> > > > > Signed-off-by: Laurent Pinchart
> > > > > <laurent.pinchart+renesas@ideasonboard.com>
> > > > 
> > > > Thank you for the patch.
> > > > 
> > > > Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > 
> > > Could you please pick this patch up ?
> > 
> > I'll pick things up after 3.13-rc1 is out, I can't do anything until
> > then.
> 
> Sure.
> 
> As this patch is a dependency for other series that will go through different 
> trees, could you please provide a stable branch in your tree with this patch 
> included that you will push to v3.14 ?

If you need this for other work, feel free to take it in your tree, I
have no real need for it to go in mine.

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Laurent Pinchart Nov. 26, 2013, 2:08 p.m. UTC | #6
Hi Greg,

On Monday 25 November 2013 18:36:08 Greg Kroah-Hartman wrote:
> On Tue, Nov 26, 2013 at 03:00:30AM +0100, Laurent Pinchart wrote:
> > On Saturday 09 November 2013 08:10:59 Greg Kroah-Hartman wrote:
> > > On Sat, Nov 09, 2013 at 03:12:05PM +0100, Laurent Pinchart wrote:
> > > > On Tuesday 29 October 2013 18:47:26 Shimoda, Yoshihiro wrote:
> > > > > Hi Laurent-san,
> > > > > 
> > > > > (2013/10/29 7:49), Laurent Pinchart wrote:
> > > > > > Turn clk_enable() and clk_disable() calls into
> > > > > > clk_prepare_enable() and clk_disable_unprepare() to get ready for
> > > > > > the migration to the common clock framework.
> > > > > > 
> > > > > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > > > > Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > > > > Cc: linux-usb@vger.kernel.org
> > > > > > Signed-off-by: Laurent Pinchart
> > > > > > <laurent.pinchart+renesas@ideasonboard.com>
> > > > > 
> > > > > Thank you for the patch.
> > > > > 
> > > > > Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > > 
> > > > Could you please pick this patch up ?
> > > 
> > > I'll pick things up after 3.13-rc1 is out, I can't do anything until
> > > then.
> > 
> > Sure.
> > 
> > As this patch is a dependency for other series that will go through
> > different trees, could you please provide a stable branch in your tree
> > with this patch included that you will push to v3.14 ?
> 
> If you need this for other work, feel free to take it in your tree, I
> have no real need for it to go in mine.
> 
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Sounds good to me, thanks.

Simon, could you please pick this patch then ?
Simon Horman Nov. 28, 2013, 8:20 a.m. UTC | #7
On Tue, Nov 26, 2013 at 03:08:27PM +0100, Laurent Pinchart wrote:
> Hi Greg,
> 
> On Monday 25 November 2013 18:36:08 Greg Kroah-Hartman wrote:
> > On Tue, Nov 26, 2013 at 03:00:30AM +0100, Laurent Pinchart wrote:
> > > On Saturday 09 November 2013 08:10:59 Greg Kroah-Hartman wrote:
> > > > On Sat, Nov 09, 2013 at 03:12:05PM +0100, Laurent Pinchart wrote:
> > > > > On Tuesday 29 October 2013 18:47:26 Shimoda, Yoshihiro wrote:
> > > > > > Hi Laurent-san,
> > > > > > 
> > > > > > (2013/10/29 7:49), Laurent Pinchart wrote:
> > > > > > > Turn clk_enable() and clk_disable() calls into
> > > > > > > clk_prepare_enable() and clk_disable_unprepare() to get ready for
> > > > > > > the migration to the common clock framework.
> > > > > > > 
> > > > > > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > > > > > Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > > > > > Cc: linux-usb@vger.kernel.org
> > > > > > > Signed-off-by: Laurent Pinchart
> > > > > > > <laurent.pinchart+renesas@ideasonboard.com>
> > > > > > 
> > > > > > Thank you for the patch.
> > > > > > 
> > > > > > Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > > > 
> > > > > Could you please pick this patch up ?
> > > > 
> > > > I'll pick things up after 3.13-rc1 is out, I can't do anything until
> > > > then.
> > > 
> > > Sure.
> > > 
> > > As this patch is a dependency for other series that will go through
> > > different trees, could you please provide a stable branch in your tree
> > > with this patch included that you will push to v3.14 ?
> > 
> > If you need this for other work, feel free to take it in your tree, I
> > have no real need for it to go in mine.
> > 
> > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> Sounds good to me, thanks.
> 
> Simon, could you please pick this patch then ?

Sure. I have queued it up.
But I may not push it for a day or two.
diff mbox

Patch

diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 2ad004a..a2fdd85 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -95,7 +95,7 @@  static int r8a66597_clock_enable(struct r8a66597 *r8a66597)
 	int i = 0;
 
 	if (r8a66597->pdata->on_chip) {
-		clk_enable(r8a66597->clk);
+		clk_prepare_enable(r8a66597->clk);
 		do {
 			r8a66597_write(r8a66597, SCKE, SYSCFG0);
 			tmp = r8a66597_read(r8a66597, SYSCFG0);
@@ -139,7 +139,7 @@  static void r8a66597_clock_disable(struct r8a66597 *r8a66597)
 	udelay(1);
 
 	if (r8a66597->pdata->on_chip) {
-		clk_disable(r8a66597->clk);
+		clk_disable_unprepare(r8a66597->clk);
 	} else {
 		r8a66597_bclr(r8a66597, PLLC, SYSCFG0);
 		r8a66597_bclr(r8a66597, XCKE, SYSCFG0);