* [PATCH 06/15] video: mx1_camera: Use clk_prepare_enable/clk_disable_unprepare
[not found] <1337987696-31728-1-git-send-email-festevam@gmail.com>
@ 2012-05-25 23:14 ` Fabio Estevam
2012-05-29 9:20 ` Sascha Hauer
2012-05-25 23:14 ` [PATCH 07/15] video: mx2_camera: " Fabio Estevam
2012-05-25 23:14 ` [PATCH 08/15] video: mx2_emmaprp: " Fabio Estevam
2 siblings, 1 reply; 9+ messages in thread
From: Fabio Estevam @ 2012-05-25 23:14 UTC (permalink / raw)
To: kernel; +Cc: shawn.guo, Fabio Estevam, Guennadi Liakhovetski, linux-media
From: Fabio Estevam <fabio.estevam@freescale.com>
Prepare the clock before enabling it.
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: <linux-media@vger.kernel.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
drivers/media/video/mx1_camera.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c
index 4296a83..dc58084 100644
--- a/drivers/media/video/mx1_camera.c
+++ b/drivers/media/video/mx1_camera.c
@@ -402,7 +402,7 @@ static void mx1_camera_activate(struct mx1_camera_dev *pcdev)
dev_dbg(pcdev->icd->parent, "Activate device\n");
- clk_enable(pcdev->clk);
+ clk_prepare_enable(pcdev->clk);
/* enable CSI before doing anything else */
__raw_writel(csicr1, pcdev->base + CSICR1);
@@ -421,7 +421,7 @@ static void mx1_camera_deactivate(struct mx1_camera_dev *pcdev)
/* Disable all CSI interface */
__raw_writel(0x00, pcdev->base + CSICR1);
- clk_disable(pcdev->clk);
+ clk_disable_unprepare(pcdev->clk);
}
/*
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 07/15] video: mx2_camera: Use clk_prepare_enable/clk_disable_unprepare
[not found] <1337987696-31728-1-git-send-email-festevam@gmail.com>
2012-05-25 23:14 ` [PATCH 06/15] video: mx1_camera: Use clk_prepare_enable/clk_disable_unprepare Fabio Estevam
@ 2012-05-25 23:14 ` Fabio Estevam
2012-05-29 9:21 ` Sascha Hauer
2012-05-25 23:14 ` [PATCH 08/15] video: mx2_emmaprp: " Fabio Estevam
2 siblings, 1 reply; 9+ messages in thread
From: Fabio Estevam @ 2012-05-25 23:14 UTC (permalink / raw)
To: kernel; +Cc: shawn.guo, Fabio Estevam, Guennadi Liakhovetski, linux-media
From: Fabio Estevam <fabio.estevam@freescale.com>
Prepare the clock before enabling it.
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: <linux-media@vger.kernel.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
drivers/media/video/mx2_camera.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c
index ded26b7..71b67a3 100644
--- a/drivers/media/video/mx2_camera.c
+++ b/drivers/media/video/mx2_camera.c
@@ -402,7 +402,7 @@ static void mx2_camera_deactivate(struct mx2_camera_dev *pcdev)
{
unsigned long flags;
- clk_disable(pcdev->clk_csi);
+ clk_disable_unprepare(pcdev->clk_csi);
writel(0, pcdev->base_csi + CSICR1);
if (cpu_is_mx27()) {
writel(0, pcdev->base_emma + PRP_CNTL);
@@ -430,7 +430,7 @@ static int mx2_camera_add_device(struct soc_camera_device *icd)
if (pcdev->icd)
return -EBUSY;
- ret = clk_enable(pcdev->clk_csi);
+ ret = clk_prepare_enable(pcdev->clk_csi);
if (ret < 0)
return ret;
@@ -1664,7 +1664,7 @@ static int __devinit mx27_camera_emma_init(struct mx2_camera_dev *pcdev)
goto exit_free_irq;
}
- clk_enable(pcdev->clk_emma);
+ clk_prepare_enable(pcdev->clk_emma);
err = mx27_camera_emma_prp_reset(pcdev);
if (err)
@@ -1673,7 +1673,7 @@ static int __devinit mx27_camera_emma_init(struct mx2_camera_dev *pcdev)
return err;
exit_clk_emma_put:
- clk_disable(pcdev->clk_emma);
+ clk_disable_unprepare(pcdev->clk_emma);
clk_put(pcdev->clk_emma);
exit_free_irq:
free_irq(pcdev->irq_emma, pcdev);
@@ -1810,7 +1810,7 @@ exit_free_emma:
eallocctx:
if (cpu_is_mx27()) {
free_irq(pcdev->irq_emma, pcdev);
- clk_disable(pcdev->clk_emma);
+ clk_disable_unprepare(pcdev->clk_emma);
clk_put(pcdev->clk_emma);
iounmap(pcdev->base_emma);
release_mem_region(pcdev->res_emma->start, resource_size(pcdev->res_emma));
@@ -1850,7 +1850,7 @@ static int __devexit mx2_camera_remove(struct platform_device *pdev)
iounmap(pcdev->base_csi);
if (cpu_is_mx27()) {
- clk_disable(pcdev->clk_emma);
+ clk_disable_unprepare(pcdev->clk_emma);
clk_put(pcdev->clk_emma);
iounmap(pcdev->base_emma);
res = pcdev->res_emma;
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 08/15] video: mx2_emmaprp: Use clk_prepare_enable/clk_disable_unprepare
[not found] <1337987696-31728-1-git-send-email-festevam@gmail.com>
2012-05-25 23:14 ` [PATCH 06/15] video: mx1_camera: Use clk_prepare_enable/clk_disable_unprepare Fabio Estevam
2012-05-25 23:14 ` [PATCH 07/15] video: mx2_camera: " Fabio Estevam
@ 2012-05-25 23:14 ` Fabio Estevam
2012-05-29 9:21 ` Sascha Hauer
2 siblings, 1 reply; 9+ messages in thread
From: Fabio Estevam @ 2012-05-25 23:14 UTC (permalink / raw)
To: kernel; +Cc: shawn.guo, Fabio Estevam, Guennadi Liakhovetski, linux-media
From: Fabio Estevam <fabio.estevam@freescale.com>
Prepare the clock before enabling it.
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: <linux-media@vger.kernel.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
drivers/media/video/mx2_emmaprp.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/video/mx2_emmaprp.c b/drivers/media/video/mx2_emmaprp.c
index 0bd5815..b364557 100644
--- a/drivers/media/video/mx2_emmaprp.c
+++ b/drivers/media/video/mx2_emmaprp.c
@@ -800,7 +800,7 @@ static int emmaprp_open(struct file *file)
return ret;
}
- clk_enable(pcdev->clk_emma);
+ clk_prepare_enable(pcdev->clk_emma);
ctx->q_data[V4L2_M2M_SRC].fmt = &formats[1];
ctx->q_data[V4L2_M2M_DST].fmt = &formats[0];
@@ -816,7 +816,7 @@ static int emmaprp_release(struct file *file)
dprintk(pcdev, "Releasing instance %p\n", ctx);
- clk_disable(pcdev->clk_emma);
+ clk_disable_unprepare(pcdev->clk_emma);
v4l2_m2m_ctx_release(ctx->m2m_ctx);
kfree(ctx);
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 06/15] video: mx1_camera: Use clk_prepare_enable/clk_disable_unprepare
2012-05-25 23:14 ` [PATCH 06/15] video: mx1_camera: Use clk_prepare_enable/clk_disable_unprepare Fabio Estevam
@ 2012-05-29 9:20 ` Sascha Hauer
2012-06-06 3:43 ` Fabio Estevam
0 siblings, 1 reply; 9+ messages in thread
From: Sascha Hauer @ 2012-05-29 9:20 UTC (permalink / raw)
To: Fabio Estevam
Cc: kernel, shawn.guo, Fabio Estevam, Guennadi Liakhovetski,
linux-media
On Fri, May 25, 2012 at 08:14:47PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> Prepare the clock before enabling it.
>
> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> Cc: <linux-media@vger.kernel.org>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> drivers/media/video/mx1_camera.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c
> index 4296a83..dc58084 100644
> --- a/drivers/media/video/mx1_camera.c
> +++ b/drivers/media/video/mx1_camera.c
> @@ -402,7 +402,7 @@ static void mx1_camera_activate(struct mx1_camera_dev *pcdev)
>
> dev_dbg(pcdev->icd->parent, "Activate device\n");
>
> - clk_enable(pcdev->clk);
> + clk_prepare_enable(pcdev->clk);
>
> /* enable CSI before doing anything else */
> __raw_writel(csicr1, pcdev->base + CSICR1);
> @@ -421,7 +421,7 @@ static void mx1_camera_deactivate(struct mx1_camera_dev *pcdev)
> /* Disable all CSI interface */
> __raw_writel(0x00, pcdev->base + CSICR1);
>
> - clk_disable(pcdev->clk);
> + clk_disable_unprepare(pcdev->clk);
> }
>
> /*
> --
> 1.7.1
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 07/15] video: mx2_camera: Use clk_prepare_enable/clk_disable_unprepare
2012-05-25 23:14 ` [PATCH 07/15] video: mx2_camera: " Fabio Estevam
@ 2012-05-29 9:21 ` Sascha Hauer
0 siblings, 0 replies; 9+ messages in thread
From: Sascha Hauer @ 2012-05-29 9:21 UTC (permalink / raw)
To: Fabio Estevam
Cc: kernel, shawn.guo, Fabio Estevam, Guennadi Liakhovetski,
linux-media
On Fri, May 25, 2012 at 08:14:48PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> Prepare the clock before enabling it.
>
> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> Cc: <linux-media@vger.kernel.org>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> drivers/media/video/mx2_camera.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/video/mx2_camera.c b/drivers/media/video/mx2_camera.c
> index ded26b7..71b67a3 100644
> --- a/drivers/media/video/mx2_camera.c
> +++ b/drivers/media/video/mx2_camera.c
> @@ -402,7 +402,7 @@ static void mx2_camera_deactivate(struct mx2_camera_dev *pcdev)
> {
> unsigned long flags;
>
> - clk_disable(pcdev->clk_csi);
> + clk_disable_unprepare(pcdev->clk_csi);
> writel(0, pcdev->base_csi + CSICR1);
> if (cpu_is_mx27()) {
> writel(0, pcdev->base_emma + PRP_CNTL);
> @@ -430,7 +430,7 @@ static int mx2_camera_add_device(struct soc_camera_device *icd)
> if (pcdev->icd)
> return -EBUSY;
>
> - ret = clk_enable(pcdev->clk_csi);
> + ret = clk_prepare_enable(pcdev->clk_csi);
> if (ret < 0)
> return ret;
>
> @@ -1664,7 +1664,7 @@ static int __devinit mx27_camera_emma_init(struct mx2_camera_dev *pcdev)
> goto exit_free_irq;
> }
>
> - clk_enable(pcdev->clk_emma);
> + clk_prepare_enable(pcdev->clk_emma);
>
> err = mx27_camera_emma_prp_reset(pcdev);
> if (err)
> @@ -1673,7 +1673,7 @@ static int __devinit mx27_camera_emma_init(struct mx2_camera_dev *pcdev)
> return err;
>
> exit_clk_emma_put:
> - clk_disable(pcdev->clk_emma);
> + clk_disable_unprepare(pcdev->clk_emma);
> clk_put(pcdev->clk_emma);
> exit_free_irq:
> free_irq(pcdev->irq_emma, pcdev);
> @@ -1810,7 +1810,7 @@ exit_free_emma:
> eallocctx:
> if (cpu_is_mx27()) {
> free_irq(pcdev->irq_emma, pcdev);
> - clk_disable(pcdev->clk_emma);
> + clk_disable_unprepare(pcdev->clk_emma);
> clk_put(pcdev->clk_emma);
> iounmap(pcdev->base_emma);
> release_mem_region(pcdev->res_emma->start, resource_size(pcdev->res_emma));
> @@ -1850,7 +1850,7 @@ static int __devexit mx2_camera_remove(struct platform_device *pdev)
> iounmap(pcdev->base_csi);
>
> if (cpu_is_mx27()) {
> - clk_disable(pcdev->clk_emma);
> + clk_disable_unprepare(pcdev->clk_emma);
> clk_put(pcdev->clk_emma);
> iounmap(pcdev->base_emma);
> res = pcdev->res_emma;
> --
> 1.7.1
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 08/15] video: mx2_emmaprp: Use clk_prepare_enable/clk_disable_unprepare
2012-05-25 23:14 ` [PATCH 08/15] video: mx2_emmaprp: " Fabio Estevam
@ 2012-05-29 9:21 ` Sascha Hauer
0 siblings, 0 replies; 9+ messages in thread
From: Sascha Hauer @ 2012-05-29 9:21 UTC (permalink / raw)
To: Fabio Estevam
Cc: kernel, shawn.guo, Fabio Estevam, Guennadi Liakhovetski,
linux-media
On Fri, May 25, 2012 at 08:14:49PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> Prepare the clock before enabling it.
>
> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> Cc: <linux-media@vger.kernel.org>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> drivers/media/video/mx2_emmaprp.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/video/mx2_emmaprp.c b/drivers/media/video/mx2_emmaprp.c
> index 0bd5815..b364557 100644
> --- a/drivers/media/video/mx2_emmaprp.c
> +++ b/drivers/media/video/mx2_emmaprp.c
> @@ -800,7 +800,7 @@ static int emmaprp_open(struct file *file)
> return ret;
> }
>
> - clk_enable(pcdev->clk_emma);
> + clk_prepare_enable(pcdev->clk_emma);
> ctx->q_data[V4L2_M2M_SRC].fmt = &formats[1];
> ctx->q_data[V4L2_M2M_DST].fmt = &formats[0];
>
> @@ -816,7 +816,7 @@ static int emmaprp_release(struct file *file)
>
> dprintk(pcdev, "Releasing instance %p\n", ctx);
>
> - clk_disable(pcdev->clk_emma);
> + clk_disable_unprepare(pcdev->clk_emma);
> v4l2_m2m_ctx_release(ctx->m2m_ctx);
> kfree(ctx);
>
> --
> 1.7.1
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 06/15] video: mx1_camera: Use clk_prepare_enable/clk_disable_unprepare
2012-05-29 9:20 ` Sascha Hauer
@ 2012-06-06 3:43 ` Fabio Estevam
2012-06-06 16:04 ` Guennadi Liakhovetski
0 siblings, 1 reply; 9+ messages in thread
From: Fabio Estevam @ 2012-06-06 3:43 UTC (permalink / raw)
To: Sascha Hauer
Cc: kernel, shawn.guo, Fabio Estevam, Guennadi Liakhovetski,
linux-media
Guennadi,
On Tue, May 29, 2012 at 6:20 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> On Fri, May 25, 2012 at 08:14:47PM -0300, Fabio Estevam wrote:
>> From: Fabio Estevam <fabio.estevam@freescale.com>
>>
>> Prepare the clock before enabling it.
>>
>> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
>> Cc: <linux-media@vger.kernel.org>
>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>
> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Can patches 6, 7 and 8 be applied?
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 06/15] video: mx1_camera: Use clk_prepare_enable/clk_disable_unprepare
2012-06-06 3:43 ` Fabio Estevam
@ 2012-06-06 16:04 ` Guennadi Liakhovetski
2012-06-06 16:37 ` Fabio Estevam
0 siblings, 1 reply; 9+ messages in thread
From: Guennadi Liakhovetski @ 2012-06-06 16:04 UTC (permalink / raw)
To: Fabio Estevam; +Cc: Sascha Hauer, kernel, shawn.guo, Fabio Estevam, linux-media
On Wed, 6 Jun 2012, Fabio Estevam wrote:
> Guennadi,
>
> On Tue, May 29, 2012 at 6:20 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> > On Fri, May 25, 2012 at 08:14:47PM -0300, Fabio Estevam wrote:
> >> From: Fabio Estevam <fabio.estevam@freescale.com>
> >>
> >> Prepare the clock before enabling it.
> >>
> >> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> >> Cc: <linux-media@vger.kernel.org>
> >> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> >
> > Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
>
> Can patches 6, 7 and 8 be applied?
Yes, I'll pick up #6 and 7. #8 is not for me - mx2_emmaprp is not an
soc-camera driver, I'm not maintaining it. I understand, these patches are
not really bug-fixes (is clk_prepare() a NOP on mx*?) and can wait until
3.6? Or should they be considered correctness fixes and go into 3.5?
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 06/15] video: mx1_camera: Use clk_prepare_enable/clk_disable_unprepare
2012-06-06 16:04 ` Guennadi Liakhovetski
@ 2012-06-06 16:37 ` Fabio Estevam
0 siblings, 0 replies; 9+ messages in thread
From: Fabio Estevam @ 2012-06-06 16:37 UTC (permalink / raw)
To: Guennadi Liakhovetski
Cc: Sascha Hauer, kernel, shawn.guo, Fabio Estevam, linux-media
Hi Guennadi,
On Wed, Jun 6, 2012 at 1:04 PM, Guennadi Liakhovetski
<g.liakhovetski@gmx.de> wrote:
> Yes, I'll pick up #6 and 7. #8 is not for me - mx2_emmaprp is not an
> soc-camera driver, I'm not maintaining it. I understand, these patches are
> not really bug-fixes (is clk_prepare() a NOP on mx*?) and can wait until
> 3.6? Or should they be considered correctness fixes and go into 3.5?
On i.MX we have transitioned to the common clock framework and my
understanding is that we need the
clk_prepare_enable/clk_disable_unprepare changes now. I experienced
some kernel oops in some drivers that were not converted, so this
patch series aim to address the clock conversion for the remaining imx
drivers.
I think this is 3.5 material.
Sascha, would you agree?
Thanks,
Fabio Estevam
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-06-06 16:37 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1337987696-31728-1-git-send-email-festevam@gmail.com>
2012-05-25 23:14 ` [PATCH 06/15] video: mx1_camera: Use clk_prepare_enable/clk_disable_unprepare Fabio Estevam
2012-05-29 9:20 ` Sascha Hauer
2012-06-06 3:43 ` Fabio Estevam
2012-06-06 16:04 ` Guennadi Liakhovetski
2012-06-06 16:37 ` Fabio Estevam
2012-05-25 23:14 ` [PATCH 07/15] video: mx2_camera: " Fabio Estevam
2012-05-29 9:21 ` Sascha Hauer
2012-05-25 23:14 ` [PATCH 08/15] video: mx2_emmaprp: " Fabio Estevam
2012-05-29 9:21 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).