diff options
| author | Andrei Andreyanau <a.andreyanau@sam-solutions.net> | 2013-05-30 13:07:26 +0300 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2013-11-07 12:19:32 -0500 |
| commit | 12a2156a40319c49f73ea92f84145ccbcd9dcb5a (patch) | |
| tree | 2da07038e68d644a8166e7606dc2339b7108d498 | |
| parent | 6487791749cf099f6ab67ad7e26050fd9b588d94 (diff) | |
Added new divider for 54MHz MCLK for mt9p031 camera. Also, recalculated dividers for 26MHz clock source and 48/96MHz PCLK for mt9p031 camera.
modified: arch/arm/mach-mx6/board-mx6q_phyflex.c
modified: drivers/media/video/mt9p031.c
Signed-off-by: Uladzimir Bely <u.bely@sam-solutions.net>
Signed-off-by: Christian Hemp <c.hemp@phytec.de>
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_phyflex.c | 4 | ||||
| -rw-r--r-- | drivers/media/video/mt9p031.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_phyflex.c b/arch/arm/mach-mx6/board-mx6q_phyflex.c index 9438ee707e3a..e594086f7a0f 100644 --- a/arch/arm/mach-mx6/board-mx6q_phyflex.c +++ b/arch/arm/mach-mx6/board-mx6q_phyflex.c @@ -1015,7 +1015,7 @@ static struct mxc_camera_pdata mxc_ipu_csi_pdata[] = { .flags = MXC_CAMERA_DATAWIDTH_10, .ipu = 0, .csi = 0, - .mclk_default_rate = 26400000, + .mclk_default_rate = 26000000, #ifdef CONFIG_SOC_CAMERA_MT9P031 .mclk_target_rate = 96000000, .use_pll = 1, @@ -1024,7 +1024,7 @@ static struct mxc_camera_pdata mxc_ipu_csi_pdata[] = { .flags = MXC_CAMERA_DATAWIDTH_10, .ipu = 1, .csi = 1, - .mclk_default_rate = 26400000, + .mclk_default_rate = 26000000, }, }; diff --git a/drivers/media/video/mt9p031.c b/drivers/media/video/mt9p031.c index 41fa46236675..a3ec7655c868 100644 --- a/drivers/media/video/mt9p031.c +++ b/drivers/media/video/mt9p031.c @@ -210,8 +210,9 @@ static void mt9p031_video_remove(struct soc_camera_device *icd) /*TODO: add new dividers */ static const struct mt9p031_pll_divs mt9p031_divs[] = { /* ext_freq target_freq m n p1 */ - {26400000, 48000000, 29, 2, 8}, - {26400000, 96000000, 58, 2, 8} + {26000000, 48000000, 37, 10, 2}, + {26000000, 96000000, 74, 10, 2}, + {54000000, 96000000, 32, 9, 2} }; static int mt9p031_pll_get_divs(struct mt9p031 *mt9p031) |