[media] video: mx1_camera: Use clk_prepare_enable/clk_disable_unprepare

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>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/platform/mx1_camera.c b/drivers/media/platform/mx1_camera.c
index d2e6f82ecfac080cc951d1aa59014f58dbb35487..560a65aa7038dd3cded8d08395958c70e3c537bb 100644 (file)
--- a/drivers/media/platform/mx1_camera.c
+++ b/drivers/media/platform/mx1_camera.c
@@ -403,7 +403,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);
@@ -422,7 +422,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);
 }
 
 /*