Commit 52cf3e42 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mauro Carvalho Chehab

[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: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent dc5d5982
...@@ -403,7 +403,7 @@ static void mx1_camera_activate(struct mx1_camera_dev *pcdev) ...@@ -403,7 +403,7 @@ static void mx1_camera_activate(struct mx1_camera_dev *pcdev)
dev_dbg(pcdev->icd->parent, "Activate device\n"); dev_dbg(pcdev->icd->parent, "Activate device\n");
clk_enable(pcdev->clk); clk_prepare_enable(pcdev->clk);
/* enable CSI before doing anything else */ /* enable CSI before doing anything else */
__raw_writel(csicr1, pcdev->base + CSICR1); __raw_writel(csicr1, pcdev->base + CSICR1);
...@@ -422,7 +422,7 @@ static void mx1_camera_deactivate(struct mx1_camera_dev *pcdev) ...@@ -422,7 +422,7 @@ static void mx1_camera_deactivate(struct mx1_camera_dev *pcdev)
/* Disable all CSI interface */ /* Disable all CSI interface */
__raw_writel(0x00, pcdev->base + CSICR1); __raw_writel(0x00, pcdev->base + CSICR1);
clk_disable(pcdev->clk); clk_disable_unprepare(pcdev->clk);
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment