summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-mx6/board-mx6q_phyflex.c4
-rw-r--r--arch/arm/plat-mxc/include/mach/mxc_camera.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_phyflex.c b/arch/arm/mach-mx6/board-mx6q_phyflex.c
index fc41f71b727c..b98344145981 100644
--- a/arch/arm/mach-mx6/board-mx6q_phyflex.c
+++ b/arch/arm/mach-mx6/board-mx6q_phyflex.c
@@ -982,6 +982,10 @@ static struct mxc_camera_pdata mxc_ipu_csi_pdata[] = {
.ipu = 0,
.csi = 0,
.mclk_default_rate = 26400000,
+#ifdef CONFIG_SOC_CAMERA_MT9P031
+ .mclk_target_rate = 96000000,
+ .use_pll = 1,
+#endif /* CONFIG_SOC_CAMERA_MT9P031 */
}, {
.flags = MXC_CAMERA_DATAWIDTH_10,
.ipu = 1,
diff --git a/arch/arm/plat-mxc/include/mach/mxc_camera.h b/arch/arm/plat-mxc/include/mach/mxc_camera.h
index 21cf05c83e66..b7e6d4e30615 100644
--- a/arch/arm/plat-mxc/include/mach/mxc_camera.h
+++ b/arch/arm/plat-mxc/include/mach/mxc_camera.h
@@ -35,9 +35,11 @@
struct mxc_camera_pdata {
unsigned long flags;
unsigned long mclk_default_rate;
+ unsigned long mclk_target_rate;
char *mclk_clock_source;
int ipu;
int csi;
+ bool use_pll;
};
#endif