dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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>
This commit is contained in:
Fabio Estevam 2012-05-25 20:14:47 -03:00 committed by Mauro Carvalho Chehab
parent 1690d86aa3
commit 5c4dfc84a8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/mx1_camera.c
View File

@ -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);
}
/*