summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorYi Li <r80015@freescale.com>2012-01-02 14:02:19 -0600
committerJason Liu <r64343@freescale.com>2012-01-19 12:41:27 +0800
commitb4c2d7c93336613b7f903251b0f358a5950e7e7c (patch)
tree7c685940cdf4a591641e9a7d81450fda700d447c /drivers/media
parenta80d4fce21121be5cd98473d33a0e7b3abeae946 (diff)
ENGR00169489-2 Add OV5642 csi camera support for i.mx6 sabre-lite board.
Add OV5642 csi camera support for i.mx6 sabre-lite board Signed-off-by: Yi Li <R80015@freescale.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/mxc/capture/sensor_clock.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/video/mxc/capture/sensor_clock.c b/drivers/media/video/mxc/capture/sensor_clock.c
index 357c01fef361..2159836699f3 100644
--- a/drivers/media/video/mxc/capture/sensor_clock.c
+++ b/drivers/media/video/mxc/capture/sensor_clock.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2004-2012 Freescale Semiconductor, Inc. All Rights Reserved.
*/
/*
@@ -24,6 +24,7 @@
#include <linux/device.h>
#include <linux/clk.h>
#include <mach/hardware.h>
+#include <asm/mach-types.h>
#if defined(CONFIG_MXC_IPU_V1) || defined(CONFIG_VIDEO_MXC_EMMA_CAMERA) \
|| defined(CONFIG_VIDEO_MXC_CSI_CAMERA_MODULE) \
@@ -72,7 +73,10 @@ void set_mclk_rate(uint32_t *p_mclk_freq, uint32_t csi)
}
} else if (cpu_is_mx6q()) {
if (csi == 0) {
- mclk = "cko1_clk0";
+ if (machine_is_mx6q_sabrelite())
+ mclk = "clko2_clk";
+ else
+ mclk = "cko1_clk0";
} else {
pr_err("invalid csi num %d\n", csi);
return;