summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Andreyanau <a.andreyanau@sam-solutions.com>2013-06-19 12:04:15 +0300
committerJustin Waters <justin.waters@timesys.com>2013-11-07 12:19:33 -0500
commit741f187b8423c69d76f29fe55418a3ff4fa6fad8 (patch)
tree283163a5e129d36ed6bca59a0e7c26db956a447b
parentd923367ca2d562d29011e1820fa61b2cc3a4e34b (diff)
Fixed support for mt9v022 (VM-007/VM-010) camera.
Signed-off-by: Andrei Andreyanau <a.andreyanau@sam-solutions.com> modified: arch/arm/mach-mx6/board-mx6q_phyflex.c Signed-off-by: Christian Hemp <c.hemp@phytec.de>
-rw-r--r--arch/arm/mach-mx6/board-mx6q_phyflex.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_phyflex.c b/arch/arm/mach-mx6/board-mx6q_phyflex.c
index 0af10a6c101f..78c5fc233a9f 100644
--- a/arch/arm/mach-mx6/board-mx6q_phyflex.c
+++ b/arch/arm/mach-mx6/board-mx6q_phyflex.c
@@ -1028,7 +1028,7 @@ static struct mxc_camera_pdata mxc_ipu_csi_pdata[] = {
.flags = MXC_CAMERA_DATAWIDTH_10,
.ipu = 1,
.csi = 1,
- .mclk_default_rate = 26000000,
+ .mclk_default_rate = 40000000,
},
};
@@ -1069,7 +1069,7 @@ static struct i2c_board_info phyflex_cameras[] = {
I2C_BOARD_INFO("mt9p031", 0x48), /* CTRL1 = 0 */
},
[1] = {
- I2C_BOARD_INFO("mt9v022", 0x4c), /* CTRL1 = 1 */
+ I2C_BOARD_INFO("mt9v022", 0x48), /* CTRL1 = 0 */
},
[2] = {
I2C_BOARD_INFO("mt9m111", 0x48),
@@ -1078,7 +1078,7 @@ static struct i2c_board_info phyflex_cameras[] = {
I2C_BOARD_INFO("mt9m001", 0x5d),
},
[4] = {
- I2C_BOARD_INFO("mt9v022", 0x48), /* CTRL1 = 1 */
+ I2C_BOARD_INFO("mt9v022", 0x4c), /* CTRL1 = 1 */
},
[5] = {
I2C_BOARD_INFO("tw9910", 0x45), /* CTRL1 = 1 */
@@ -1124,7 +1124,7 @@ static struct soc_camera_link phyflex_iclinks[] = {
SOC_CAM_LINK(1, &phyflex_cameras[5], 2),
.priv = &tw9910_info,
}, {
- SOC_CAM_LINK(1, &phyflex_cameras[1], 2)
+ SOC_CAM_LINK(0, &phyflex_cameras[1], 2)
}, {
SOC_CAM_LINK(1, &phyflex_cameras[3], 2)
}, {