[PATCH 00/12] Prepare various SH/R Mobile/Car drivers for CCF migration

[PATCH 00/12] Prepare various SH/R Mobile/Car drivers for CCF migration

[Laurent Pinchart]

Hello,

This patch series, based on v3.12-rc7, prepares various Renesas SH-Mobile,
R-Mobile and R-Car drivers for migration to CCF by adding clock prepare and
unprepare support.

The patches are pretty straightforward. Most of the drivers called
clk_enable and clk_disable in sleepable context, I've thus just converted them
to clk_prepare_enable and clk_disable_unprepare.

The clocksource drivers were slightly more complex to handle as clk_enable and
clk_disable were called in non-sleepable context. As the clocksource framework
architecture doesn't provide any sleepable callback in which clocks could be
prepared and unprepared, I've added clk_prepare and clk_unprepare calls in the
probe and suspend/resume handlers (clocksources can't be removed so the remove
handler doesn't need a clk_unprepare call).

I'd like to get all these patches merged in v3.14. As they will need to go
through their respective subsystems' trees, I would appreciate if all
maintainers involved could notify me when they merge patches from this series
in their tree to help me tracking the merge status. I don't plan to send pull
requests individually for these patches, and I will repost patches
individually if changes are requested during review.

Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-kernel@vger.kernel.org
Cc: Tejun Heo <tj@kernel.org>
Cc: linux-ide@vger.kernel.org
Cc: David Airlie <airlied@linux.ie>
Cc: dri-devel@lists.freedesktop.org
Cc: Wolfram Sang <wsa@the-dreams.de>
Cc: linux-i2c@vger.kernel.org
Cc: Chris Ball <cjb@laptop.org>
Cc: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Cc: linux-mmc@vger.kernel.org
Cc: Felipe Balbi <balbi@ti.com>
Cc: linux-usb@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org

Laurent Pinchart (12):
  clocksource: sh_cmt: Add clk_prepare/unprepare support
  clocksource: sh_mtu2: Add clk_prepare/unprepare support
  clocksource: sh_tmu: Add clk_prepare/unprepare support
  sata_rcar: Convert to clk_prepare/unprepare
  drm: shmob_drm: Convert to clk_prepare/unprepare
  i2c: sh_mobile: Convert to clk_prepare/unprepare
  mmc: sh_mmcif: Convert to clk_prepare/unprepare
  mmc: sh_mobile_sdhi: Convert to clk_prepare/unprepare
  usb: gadget: r8a66597-udc: Convert to clk_prepare/unprepare
  usb: r8a66597-hcd: Convert to clk_prepare/unprepare
  fbdev: shmobile-hdmi: Convert to clk_prepare/unprepare
  fbdev: shmobile-lcdcfb: Convert to clk_prepare/unprepare

 drivers/ata/sata_rcar.c                   | 10 +++++-----
 drivers/clocksource/sh_cmt.c              | 20 ++++++++++++++++----
 drivers/clocksource/sh_mtu2.c             | 16 ++++++++++++++--
 drivers/clocksource/sh_tmu.c              | 20 +++++++++++++++++---
 drivers/gpu/drm/shmobile/shmob_drm_crtc.c |  4 ++--
 drivers/i2c/busses/i2c-sh_mobile.c        |  8 ++++----
 drivers/mmc/host/sh_mmcif.c               | 12 ++++++------
 drivers/mmc/host/sh_mobile_sdhi.c         |  4 ++--
 drivers/usb/gadget/r8a66597-udc.c         |  6 +++---
 drivers/usb/host/r8a66597-hcd.c           |  4 ++--
 drivers/video/sh_mobile_hdmi.c            |  6 +++---
 drivers/video/sh_mobile_lcdcfb.c          |  4 ++--
 12 files changed, 76 insertions(+), 38 deletions(-)

-- 
Regards,

Laurent Pinchart

[PATCH 07/12] mmc: sh_mmcif: Convert to clk_prepare/unprepare

[Laurent Pinchart]

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: Chris Ball <cjb@laptop.org>
Cc: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Cc: linux-mmc@vger.kernel.org
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/mmc/host/sh_mmcif.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 36629a0..37a6c57 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -964,7 +964,7 @@ static void sh_mmcif_request(struct mmc_host *mmc, struct mmc_request *mrq)
 
 static int sh_mmcif_clk_update(struct sh_mmcif_host *host)
 {
-	int ret = clk_enable(host->hclk);
+	int ret = clk_prepare_enable(host->hclk);
 
 	if (!ret) {
 		host->clk = clk_get_rate(host->hclk);
@@ -1018,7 +1018,7 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 		}
 		if (host->power) {
 			pm_runtime_put_sync(&host->pd->dev);
-			clk_disable(host->hclk);
+			clk_disable_unprepare(host->hclk);
 			host->power = false;
 			if (ios->power_mode == MMC_POWER_OFF)
 				sh_mmcif_set_power(host, ios);
@@ -1466,7 +1466,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
 
 	mutex_init(&host->thread_lock);
 
-	clk_disable(host->hclk);
+	clk_disable_unprepare(host->hclk);
 	ret = mmc_add_host(mmc);
 	if (ret < 0)
 		goto emmcaddh;
@@ -1487,7 +1487,7 @@ ereqirq1:
 ereqirq0:
 	pm_runtime_suspend(&pdev->dev);
 eresume:
-	clk_disable(host->hclk);
+	clk_disable_unprepare(host->hclk);
 eclkupdate:
 	clk_put(host->hclk);
 eclkget:
@@ -1505,7 +1505,7 @@ static int sh_mmcif_remove(struct platform_device *pdev)
 	int irq[2];
 
 	host->dying = true;
-	clk_enable(host->hclk);
+	clk_prepare_enable(host->hclk);
 	pm_runtime_get_sync(&pdev->dev);
 
 	dev_pm_qos_hide_latency_limit(&pdev->dev);
@@ -1530,7 +1530,7 @@ static int sh_mmcif_remove(struct platform_device *pdev)
 	if (irq[1] >= 0)
 		free_irq(irq[1], host);
 
-	clk_disable(host->hclk);
+	clk_disable_unprepare(host->hclk);
 	mmc_free_host(host->mmc);
 	pm_runtime_put_sync(&pdev->dev);
 	pm_runtime_disable(&pdev->dev);
-- 
1.8.1.5

[PATCH 08/12] mmc: sh_mobile_sdhi: Convert to clk_prepare/unprepare

[Laurent Pinchart]

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: Chris Ball <cjb@laptop.org>
Cc: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
Cc: linux-mmc@vger.kernel.org
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/mmc/host/sh_mobile_sdhi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
index f344659..ed1718a 100644
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
@@ -54,7 +54,7 @@ static int sh_mobile_sdhi_clk_enable(struct platform_device *pdev, unsigned int
 	struct mmc_host *mmc = platform_get_drvdata(pdev);
 	struct tmio_mmc_host *host = mmc_priv(mmc);
 	struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data);
-	int ret = clk_enable(priv->clk);
+	int ret = clk_prepare_enable(priv->clk);
 	if (ret < 0)
 		return ret;
 
@@ -67,7 +67,7 @@ static void sh_mobile_sdhi_clk_disable(struct platform_device *pdev)
 	struct mmc_host *mmc = platform_get_drvdata(pdev);
 	struct tmio_mmc_host *host = mmc_priv(mmc);
 	struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data);
-	clk_disable(priv->clk);
+	clk_disable_unprepare(priv->clk);
 }
 
 static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host)
-- 
1.8.1.5

Re: [PATCH 08/12] mmc: sh_mobile_sdhi: Convert to clk_prepare/unprepare

[Guennadi Liakhovetski]

On Mon, 28 Oct 2013, 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: Chris Ball <cjb@laptop.org>
> Cc: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> Cc: linux-mmc@vger.kernel.org
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

Thanks
Guennadi

> ---
>  drivers/mmc/host/sh_mobile_sdhi.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c
> index f344659..ed1718a 100644
> --- a/drivers/mmc/host/sh_mobile_sdhi.c
> +++ b/drivers/mmc/host/sh_mobile_sdhi.c
> @@ -54,7 +54,7 @@ static int sh_mobile_sdhi_clk_enable(struct platform_device *pdev, unsigned int
>  	struct mmc_host *mmc = platform_get_drvdata(pdev);
>  	struct tmio_mmc_host *host = mmc_priv(mmc);
>  	struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data);
> -	int ret = clk_enable(priv->clk);
> +	int ret = clk_prepare_enable(priv->clk);
>  	if (ret < 0)
>  		return ret;
>  
> @@ -67,7 +67,7 @@ static void sh_mobile_sdhi_clk_disable(struct platform_device *pdev)
>  	struct mmc_host *mmc = platform_get_drvdata(pdev);
>  	struct tmio_mmc_host *host = mmc_priv(mmc);
>  	struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data);
> -	clk_disable(priv->clk);
> +	clk_disable_unprepare(priv->clk);
>  }
>  
>  static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host)
> -- 
> 1.8.1.5
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

Re: [PATCH 07/12] mmc: sh_mmcif: Convert to clk_prepare/unprepare

[Guennadi Liakhovetski]

On Mon, 28 Oct 2013, 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: Chris Ball <cjb@laptop.org>
> Cc: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> Cc: linux-mmc@vger.kernel.org
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

Thanks
Guennadi

> ---
>  drivers/mmc/host/sh_mmcif.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
> index 36629a0..37a6c57 100644
> --- a/drivers/mmc/host/sh_mmcif.c
> +++ b/drivers/mmc/host/sh_mmcif.c
> @@ -964,7 +964,7 @@ static void sh_mmcif_request(struct mmc_host *mmc, struct mmc_request *mrq)
>  
>  static int sh_mmcif_clk_update(struct sh_mmcif_host *host)
>  {
> -	int ret = clk_enable(host->hclk);
> +	int ret = clk_prepare_enable(host->hclk);
>  
>  	if (!ret) {
>  		host->clk = clk_get_rate(host->hclk);
> @@ -1018,7 +1018,7 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
>  		}
>  		if (host->power) {
>  			pm_runtime_put_sync(&host->pd->dev);
> -			clk_disable(host->hclk);
> +			clk_disable_unprepare(host->hclk);
>  			host->power = false;
>  			if (ios->power_mode == MMC_POWER_OFF)
>  				sh_mmcif_set_power(host, ios);
> @@ -1466,7 +1466,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
>  
>  	mutex_init(&host->thread_lock);
>  
> -	clk_disable(host->hclk);
> +	clk_disable_unprepare(host->hclk);
>  	ret = mmc_add_host(mmc);
>  	if (ret < 0)
>  		goto emmcaddh;
> @@ -1487,7 +1487,7 @@ ereqirq1:
>  ereqirq0:
>  	pm_runtime_suspend(&pdev->dev);
>  eresume:
> -	clk_disable(host->hclk);
> +	clk_disable_unprepare(host->hclk);
>  eclkupdate:
>  	clk_put(host->hclk);
>  eclkget:
> @@ -1505,7 +1505,7 @@ static int sh_mmcif_remove(struct platform_device *pdev)
>  	int irq[2];
>  
>  	host->dying = true;
> -	clk_enable(host->hclk);
> +	clk_prepare_enable(host->hclk);
>  	pm_runtime_get_sync(&pdev->dev);
>  
>  	dev_pm_qos_hide_latency_limit(&pdev->dev);
> @@ -1530,7 +1530,7 @@ static int sh_mmcif_remove(struct platform_device *pdev)
>  	if (irq[1] >= 0)
>  		free_irq(irq[1], host);
>  
> -	clk_disable(host->hclk);
> +	clk_disable_unprepare(host->hclk);
>  	mmc_free_host(host->mmc);
>  	pm_runtime_put_sync(&pdev->dev);
>  	pm_runtime_disable(&pdev->dev);
> -- 
> 1.8.1.5
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

Re: [PATCH 07/12] mmc: sh_mmcif: Convert to clk_prepare/unprepare

[Guennadi Liakhovetski]

On Tue, 29 Oct 2013, Guennadi Liakhovetski wrote:

> On Mon, 28 Oct 2013, 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: Chris Ball <cjb@laptop.org>
> > Cc: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> > Cc: linux-mmc@vger.kernel.org
> > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

Sorry, I just realised, that an identical patch

http://patches.linaro.org/21212/

has been submitted prior to this one, so, we should really take the other 
one.

Thanks
Guennadi
> 
> > ---
> >  drivers/mmc/host/sh_mmcif.c | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
> > index 36629a0..37a6c57 100644
> > --- a/drivers/mmc/host/sh_mmcif.c
> > +++ b/drivers/mmc/host/sh_mmcif.c
> > @@ -964,7 +964,7 @@ static void sh_mmcif_request(struct mmc_host *mmc, struct mmc_request *mrq)
> >  
> >  static int sh_mmcif_clk_update(struct sh_mmcif_host *host)
> >  {
> > -	int ret = clk_enable(host->hclk);
> > +	int ret = clk_prepare_enable(host->hclk);
> >  
> >  	if (!ret) {
> >  		host->clk = clk_get_rate(host->hclk);
> > @@ -1018,7 +1018,7 @@ static void sh_mmcif_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
> >  		}
> >  		if (host->power) {
> >  			pm_runtime_put_sync(&host->pd->dev);
> > -			clk_disable(host->hclk);
> > +			clk_disable_unprepare(host->hclk);
> >  			host->power = false;
> >  			if (ios->power_mode == MMC_POWER_OFF)
> >  				sh_mmcif_set_power(host, ios);
> > @@ -1466,7 +1466,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
> >  
> >  	mutex_init(&host->thread_lock);
> >  
> > -	clk_disable(host->hclk);
> > +	clk_disable_unprepare(host->hclk);
> >  	ret = mmc_add_host(mmc);
> >  	if (ret < 0)
> >  		goto emmcaddh;
> > @@ -1487,7 +1487,7 @@ ereqirq1:
> >  ereqirq0:
> >  	pm_runtime_suspend(&pdev->dev);
> >  eresume:
> > -	clk_disable(host->hclk);
> > +	clk_disable_unprepare(host->hclk);
> >  eclkupdate:
> >  	clk_put(host->hclk);
> >  eclkget:
> > @@ -1505,7 +1505,7 @@ static int sh_mmcif_remove(struct platform_device *pdev)
> >  	int irq[2];
> >  
> >  	host->dying = true;
> > -	clk_enable(host->hclk);
> > +	clk_prepare_enable(host->hclk);
> >  	pm_runtime_get_sync(&pdev->dev);
> >  
> >  	dev_pm_qos_hide_latency_limit(&pdev->dev);
> > @@ -1530,7 +1530,7 @@ static int sh_mmcif_remove(struct platform_device *pdev)
> >  	if (irq[1] >= 0)
> >  		free_irq(irq[1], host);
> >  
> > -	clk_disable(host->hclk);
> > +	clk_disable_unprepare(host->hclk);
> >  	mmc_free_host(host->mmc);
> >  	pm_runtime_put_sync(&pdev->dev);
> >  	pm_runtime_disable(&pdev->dev);
> > -- 
> > 1.8.1.5
> > 
> 
> ---
> Guennadi Liakhovetski, Ph.D.
> Freelance Open-Source Software Developer
> http://www.open-technology.de/
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

Re: [PATCH 07/12] mmc: sh_mmcif: Convert to clk_prepare/unprepare

[Laurent Pinchart]

Hi Guennadi,

On Wednesday 30 October 2013 23:23:37 Guennadi Liakhovetski wrote:
> On Tue, 29 Oct 2013, Guennadi Liakhovetski wrote:
> > On Mon, 28 Oct 2013, 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: Chris Ball <cjb@laptop.org>
> > > Cc: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> > > Cc: linux-mmc@vger.kernel.org
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas@ideasonboard.com>
> > 
> > Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> 
> Sorry, I just realised, that an identical patch
> 
> http://patches.linaro.org/21212/
> 
> has been submitted prior to this one, so, we should really take the other
> one.

I'm fine with that, as long as one of the two patches hit mainline as soon as 
possible.

-- 
Regards,

Laurent Pinchart

Re: [PATCH 07/12] mmc: sh_mmcif: Convert to clk_prepare/unprepare

[Ulf Hansson]

On 31 October 2013 00:13, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> Hi Guennadi,
>
> On Wednesday 30 October 2013 23:23:37 Guennadi Liakhovetski wrote:
>> On Tue, 29 Oct 2013, Guennadi Liakhovetski wrote:
>> > On Mon, 28 Oct 2013, 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: Chris Ball <cjb@laptop.org>
>> > > Cc: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
>> > > Cc: linux-mmc@vger.kernel.org
>> > > Signed-off-by: Laurent Pinchart
>> > > <laurent.pinchart+renesas@ideasonboard.com>
>> >
>> > Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
>>
>> Sorry, I just realised, that an identical patch
>>
>> http://patches.linaro.org/21212/
>>
>> has been submitted prior to this one, so, we should really take the other
>> one.
>
> I'm fine with that, as long as one of the two patches hit mainline as soon as
> possible.

I can put together a new pull request for Chris asap, but in the end
it will be his call to take it now or later.

Kind regards
Ulf Hansson

>
> --
> Regards,
>
> Laurent Pinchart
>
> --
> 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

Re: [PATCH 07/12] mmc: sh_mmcif: Convert to clk_prepare/unprepare

[Laurent Pinchart]

Hi Uluf,

On Thursday 31 October 2013 00:27:23 Ulf Hansson wrote:
> On 31 October 2013 00:13, Laurent Pinchart wrote:
> > On Wednesday 30 October 2013 23:23:37 Guennadi Liakhovetski wrote:
> >> On Tue, 29 Oct 2013, Guennadi Liakhovetski wrote:
> >> > On Mon, 28 Oct 2013, 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: Chris Ball <cjb@laptop.org>
> >> > > Cc: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> >> > > Cc: linux-mmc@vger.kernel.org
> >> > > Signed-off-by: Laurent Pinchart
> >> > > <laurent.pinchart+renesas@ideasonboard.com>
> >> > 
> >> > Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> >> 
> >> Sorry, I just realised, that an identical patch
> >> 
> >> http://patches.linaro.org/21212/
> >> 
> >> has been submitted prior to this one, so, we should really take the other
> >> one.
> > 
> > I'm fine with that, as long as one of the two patches hit mainline as soon
> > as possible.
> 
> I can put together a new pull request for Chris asap, but in the end
> it will be his call to take it now or later.

That would be great. It can wait for v3.14 though, but having the patch in 
v3.13 would be nice.

-- 
Regards,

Laurent Pinchart

Re: [PATCH 08/12] mmc: sh_mobile_sdhi: Convert to clk_prepare/unprepare

[Laurent Pinchart]

Hi Chris,

Could you please pick this patch up ?

On Tuesday 29 October 2013 09:09:37 Guennadi Liakhovetski wrote:
> On Mon, 28 Oct 2013, 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: Chris Ball <cjb@laptop.org>
> > Cc: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> > Cc: linux-mmc@vger.kernel.org
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> 
> Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> 
> Thanks
> Guennadi
> 
> > ---
> > 
> >  drivers/mmc/host/sh_mobile_sdhi.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/mmc/host/sh_mobile_sdhi.c
> > b/drivers/mmc/host/sh_mobile_sdhi.c index f344659..ed1718a 100644
> > --- a/drivers/mmc/host/sh_mobile_sdhi.c
> > +++ b/drivers/mmc/host/sh_mobile_sdhi.c
> > @@ -54,7 +54,7 @@ static int sh_mobile_sdhi_clk_enable(struct
> > platform_device *pdev, unsigned int> 
> >  	struct mmc_host *mmc = platform_get_drvdata(pdev);
> >  	struct tmio_mmc_host *host = mmc_priv(mmc);
> >  	struct sh_mobile_sdhi *priv = container_of(host->pdata, struct
> >  	sh_mobile_sdhi, mmc_data);> 
> > -	int ret = clk_enable(priv->clk);
> > +	int ret = clk_prepare_enable(priv->clk);
> > 
> >  	if (ret < 0)
> >  	
> >  		return ret;
> > 
> > @@ -67,7 +67,7 @@ static void sh_mobile_sdhi_clk_disable(struct
> > platform_device *pdev)> 
> >  	struct mmc_host *mmc = platform_get_drvdata(pdev);
> >  	struct tmio_mmc_host *host = mmc_priv(mmc);
> >  	struct sh_mobile_sdhi *priv = container_of(host->pdata, struct
> >  	sh_mobile_sdhi, mmc_data);> 
> > -	clk_disable(priv->clk);
> > +	clk_disable_unprepare(priv->clk);
> > 
> >  }
> >  
> >  static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host)

-- 
Regards,

Laurent Pinchart

Re: [PATCH 08/12] mmc: sh_mobile_sdhi: Convert to clk_prepare/unprepare

[Laurent Pinchart]

Hi Chris,

On Saturday 09 November 2013 13:56:40 Laurent Pinchart wrote:
> Hi Chris,
> 
> Could you please pick this patch up ?

Ping ?

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 ?

> On Tuesday 29 October 2013 09:09:37 Guennadi Liakhovetski wrote:
> > On Mon, 28 Oct 2013, 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: Chris Ball <cjb@laptop.org>
> > > Cc: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> > > Cc: linux-mmc@vger.kernel.org
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas@ideasonboard.com>
> > 
> > Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > 
> > Thanks
> > Guennadi
> > 
> > > ---
> > > 
> > >  drivers/mmc/host/sh_mobile_sdhi.c | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/drivers/mmc/host/sh_mobile_sdhi.c
> > > b/drivers/mmc/host/sh_mobile_sdhi.c index f344659..ed1718a 100644
> > > --- a/drivers/mmc/host/sh_mobile_sdhi.c
> > > +++ b/drivers/mmc/host/sh_mobile_sdhi.c
> > > @@ -54,7 +54,7 @@ static int sh_mobile_sdhi_clk_enable(struct
> > > platform_device *pdev, unsigned int>
> > >  	struct mmc_host *mmc = platform_get_drvdata(pdev);
> > >  	struct tmio_mmc_host *host = mmc_priv(mmc);
> > >  	struct sh_mobile_sdhi *priv = container_of(host->pdata, struct
> > >  	sh_mobile_sdhi, mmc_data);
> > > -	int ret = clk_enable(priv->clk);
> > > +	int ret = clk_prepare_enable(priv->clk);
> > >  	if (ret < 0)
> > >  		return ret;
> > > 
> > > @@ -67,7 +67,7 @@ static void sh_mobile_sdhi_clk_disable(struct
> > > platform_device *pdev)>
> > >  	struct mmc_host *mmc = platform_get_drvdata(pdev);
> > >  	struct tmio_mmc_host *host = mmc_priv(mmc);
> > >  	struct sh_mobile_sdhi *priv = container_of(host->pdata, struct
> > >  	sh_mobile_sdhi, mmc_data);
> > > -	clk_disable(priv->clk);
> > > +	clk_disable_unprepare(priv->clk);
> > >  }
> > >  
> > >  static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host)
-- 
Regards,

Laurent Pinchart

Re: [PATCH 08/12] mmc: sh_mobile_sdhi: Convert to clk_prepare/unprepare

[Laurent Pinchart]

Hi Chris,

On Tuesday 26 November 2013 03:02:48 Laurent Pinchart wrote:
> On Saturday 09 November 2013 13:56:40 Laurent Pinchart wrote:
> > Hi Chris,
> > 
> > Could you please pick this patch up ?
> 
> Ping ?

PING ?

> 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 ?
> 
> > On Tuesday 29 October 2013 09:09:37 Guennadi Liakhovetski wrote:
> > > On Mon, 28 Oct 2013, 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: Chris Ball <cjb@laptop.org>
> > > > Cc: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
> > > > Cc: linux-mmc@vger.kernel.org
> > > > Signed-off-by: Laurent Pinchart
> > > > <laurent.pinchart+renesas@ideasonboard.com>
> > > 
> > > Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > > 
> > > Thanks
> > > Guennadi
> > > 
> > > > ---
> > > > 
> > > >  drivers/mmc/host/sh_mobile_sdhi.c | 4 ++--
> > > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > > > 
> > > > diff --git a/drivers/mmc/host/sh_mobile_sdhi.c
> > > > b/drivers/mmc/host/sh_mobile_sdhi.c index f344659..ed1718a 100644
> > > > --- a/drivers/mmc/host/sh_mobile_sdhi.c
> > > > +++ b/drivers/mmc/host/sh_mobile_sdhi.c
> > > > @@ -54,7 +54,7 @@ static int sh_mobile_sdhi_clk_enable(struct
> > > > platform_device *pdev, unsigned int
> > > >  	struct mmc_host *mmc = platform_get_drvdata(pdev);
> > > >  	struct tmio_mmc_host *host = mmc_priv(mmc);
> > > >  	struct sh_mobile_sdhi *priv = container_of(host->pdata, struct
> > > >  	sh_mobile_sdhi, mmc_data);
> > > > 
> > > > -	int ret = clk_enable(priv->clk);
> > > > +	int ret = clk_prepare_enable(priv->clk);
> > > >  	if (ret < 0)
> > > >  		return ret;
> > > > 
> > > > @@ -67,7 +67,7 @@ static void sh_mobile_sdhi_clk_disable(struct
> > > > platform_device *pdev)
> > > >  	struct mmc_host *mmc = platform_get_drvdata(pdev);
> > > >  	struct tmio_mmc_host *host = mmc_priv(mmc);
> > > >  	struct sh_mobile_sdhi *priv = container_of(host->pdata, struct
> > > >  	sh_mobile_sdhi, mmc_data);
> > > > 
> > > > -	clk_disable(priv->clk);
> > > > +	clk_disable_unprepare(priv->clk);
> > > >  }
> > > >  
> > > >  static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host)

-- 
Regards,

Laurent Pinchart

Re: [PATCH 08/12] mmc: sh_mobile_sdhi: Convert to clk_prepare/unprepare

[Chris Ball]

Hi Laurent,

On Wed, Dec 11 2013, Laurent Pinchart wrote:
> PING ?

I'm sorry about the delay -- it's in mmc-next for 3.14 now.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>

Re: [PATCH 08/12] mmc: sh_mobile_sdhi: Convert to clk_prepare/unprepare

[Laurent Pinchart]

Hi Chris,

On Wednesday 11 December 2013 20:29:56 Chris Ball wrote:
> Hi Laurent,
> 
> On Wed, Dec 11 2013, Laurent Pinchart wrote:
> > PING ?
> 
> I'm sorry about the delay -- it's in mmc-next for 3.14 now.

Thanks a lot and sorry about shouting. Don't worry about the delay, I only 
wanted to make sure the patch would get in v3.14.

Now, if you wanted to review (and hopefully apply) the following patches as 
well that would be perfect :-)

[PATCH v3 1/3] mmc: sh_mmcif: Factorize DMA channel request and configuration 
code
[PATCH v3 2/3] mmc: sh_mmcif: Fix compilation warning on 64-bit platforms
mmc: sdhi: Enable driver compilation with COMPILE_TEST
mmc: sh_mmcif: Enable driver compilation with COMPILE_TEST

(Please note that "[PATCH v3 3/3] mmc: sh_mmcif: Enable the driver on all ARM 
platforms" has been superseded by "mmc: sh_mmcif: Enable driver compilation 
with COMPILE_TEST")

-- 
Regards,

Laurent Pinchart

Re: [PATCH 08/12] mmc: sh_mobile_sdhi: Convert to clk_prepare/unprepare

[Chris Ball]

Hi Laurent,

On Wed, Dec 11 2013, Laurent Pinchart wrote:
>> I'm sorry about the delay -- it's in mmc-next for 3.14 now.
>
> Thanks a lot and sorry about shouting. Don't worry about the delay, I only 
> wanted to make sure the patch would get in v3.14.

No worries, it was deserved yelling.  :-)

> [PATCH v3 1/3] mmc: sh_mmcif: Factorize DMA channel request and configuration 
> code
> [PATCH v3 2/3] mmc: sh_mmcif: Fix compilation warning on 64-bit platforms

These two are in mmc-next now too.  (I usually wait for someone with
SH hardware to ACK, but I understand that Guennadi's not around as
much anymore.)

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>

Re: [PATCH 08/12] mmc: sh_mobile_sdhi: Convert to clk_prepare/unprepare

[Simon Horman]

On Wed, Dec 11, 2013 at 09:25:09PM -0500, Chris Ball wrote:
> Hi Laurent,
> 
> On Wed, Dec 11 2013, Laurent Pinchart wrote:
> >> I'm sorry about the delay -- it's in mmc-next for 3.14 now.
> >
> > Thanks a lot and sorry about shouting. Don't worry about the delay, I only 
> > wanted to make sure the patch would get in v3.14.
> 
> No worries, it was deserved yelling.  :-)
> 
> > [PATCH v3 1/3] mmc: sh_mmcif: Factorize DMA channel request and configuration 
> > code
> > [PATCH v3 2/3] mmc: sh_mmcif: Fix compilation warning on 64-bit platforms
> 
> These two are in mmc-next now too.  (I usually wait for someone with
> SH hardware to ACK, but I understand that Guennadi's not around as
> much anymore.)

I believe I can provide such Acks going forwards.