[PATCH] [media] V4L: pxa_camera: add clk_prepare/clk_unprepare calls

[PATCH] [media] V4L: pxa_camera: add clk_prepare/clk_unprepare calls

[Philipp Zabel]

This patch adds clk_prepare/clk_unprepare calls to the pxa_camera
driver by using the helper functions clk_prepare_enable and
clk_disable_unprepare.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
---
 drivers/media/video/pxa_camera.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index 0bd7da2..5a413f4 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -921,12 +921,12 @@ static void pxa_camera_activate(struct pxa_camera_dev *pcdev)
 		/* "Safe default" - 13MHz */
 		recalculate_fifo_timeout(pcdev, 13000000);
 
-	clk_enable(pcdev->clk);
+	clk_prepare_enable(pcdev->clk);
 }
 
 static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev)
 {
-	clk_disable(pcdev->clk);
+	clk_disable_unprepare(pcdev->clk);
 }
 
 static irqreturn_t pxa_camera_irq(int irq, void *data)
-- 
1.7.9.1

Re: [PATCH] [media] V4L: pxa_camera: add clk_prepare/clk_unprepare calls

[Robert Jarzmik]

Philipp Zabel <philipp.zabel@gmail.com> writes:

> This patch adds clk_prepare/clk_unprepare calls to the pxa_camera
> driver by using the helper functions clk_prepare_enable and
> clk_disable_unprepare.
>
> Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
> Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>

Certainly, clocks have to be prepared before being enabled AFAIK.
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>

Cheers.

--
Robert

Re: [PATCH] [media] V4L: pxa_camera: add clk_prepare/clk_unprepare calls

[Guennadi Liakhovetski]

Hi Robert

On Sat, 17 Mar 2012, Robert Jarzmik wrote:

> Philipp Zabel <philipp.zabel@gmail.com> writes:
> 
> > This patch adds clk_prepare/clk_unprepare calls to the pxa_camera
> > driver by using the helper functions clk_prepare_enable and
> > clk_disable_unprepare.
> >
> > Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
> > Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
> > Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> 
> Certainly, clocks have to be prepared before being enabled AFAIK.
> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>

Thanks for the ack, but I've already pushed this patch up to Mauro. Now, 
only if he picks it up when pushing to Linus.

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