projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4e7b6c9
)
media mx3 camera: prepare clk before enabling it
author
Sascha Hauer
<s.hauer@pengutronix.de>
Tue, 3 Apr 2012 10:35:16 +0000
(12:35 +0200)
committer
Sascha Hauer
<s.hauer@pengutronix.de>
Wed, 25 Apr 2012 15:03:42 +0000
(17:03 +0200)
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
drivers/media/video/mx3_camera.c
patch
|
blob
|
history
diff --git
a/drivers/media/video/mx3_camera.c
b/drivers/media/video/mx3_camera.c
index
93c35ef
..
e2e33df
100644
(file)
--- a/
drivers/media/video/mx3_camera.c
+++ b/
drivers/media/video/mx3_camera.c
@@
-508,7
+508,7
@@
static void mx3_camera_activate(struct mx3_camera_dev *mx3_cam,
/* ipu_csi_init_interface() */
csi_reg_write(mx3_cam, conf, CSI_SENS_CONF);
- clk_enable(mx3_cam->clk);
+ clk_
prepare_
enable(mx3_cam->clk);
rate = clk_round_rate(mx3_cam->clk, mx3_cam->mclk);
dev_dbg(icd->parent, "Set SENS_CONF to %x, rate %ld\n", conf, rate);
if (rate)
@@
-549,7
+549,7
@@
static void mx3_camera_remove_device(struct soc_camera_device *icd)
*ichan = NULL;
}
- clk_disable(mx3_cam->clk);
+ clk_disable
_unprepare
(mx3_cam->clk);
mx3_cam->icd = NULL;