diff options
| author | Andrei Andreyanau <a.andreyanau@sam-solutions.net> | 2013-05-07 13:25:14 +0300 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2013-11-07 12:19:30 -0500 |
| commit | 546d12ff33b4ab944c37903dbf7764fc1afd4b09 (patch) | |
| tree | d0d133cd7a5cf394d4eb9110334c23569e552f72 /arch | |
| parent | fc35bae9a23509e181cb5f1ac437208f79be40b5 (diff) | |
Added support for switching on/off internal pll for MT9P031 camera. Also added support for selecting target frequency for MT9P031 camera. modified: arch/arm/mach-mx6/board-mx6q_phyflex.c modified: arch/arm/plat-mxc/include/mach/mxc_camera.h
Signed-off-by: Uladzimir Bely <u.bely@sam-solutions.net>
Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_phyflex.c | 4 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mxc_camera.h | 2 |
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 |