diff options
| author | Andrei Andreyanau <a.andreyanau@sam-solutions.com> | 2013-06-28 17:48:44 +0200 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2013-11-07 12:19:34 -0500 |
| commit | c592b5a835329df9eee445f3766536de1675da72 (patch) | |
| tree | e898ebcb13ad3950b7ade2864f2c8140fc3f8319 | |
| parent | 03df44bfc2a2503a224b3fe5ccd3381154ce3254 (diff) | |
Fixed registration of tw9910 capture board on csi interfaces.
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.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_phyflex.c b/arch/arm/mach-mx6/board-mx6q_phyflex.c index bd8dc67ebd19..c69d014b1e34 100644 --- a/arch/arm/mach-mx6/board-mx6q_phyflex.c +++ b/arch/arm/mach-mx6/board-mx6q_phyflex.c @@ -1271,13 +1271,14 @@ static void __init mx6_phyflex_init(void) }; static struct soc_camera_link phyflex_iclinks[] = { {SOC_CAM_LINK(0, &phyflex_cameras[0], 2)}, //CSI-PORT,phyflex_cameras,I2C-INTERFACE - {SOC_CAM_LINK(0, &phyflex_cameras[1], 2)}, + {SOC_CAM_LINK(0, &phyflex_cameras[1], 2), + .priv=&tw9910_info}, {SOC_CAM_LINK(0, &phyflex_cameras[2], 2)}, {SOC_CAM_LINK(0, &phyflex_cameras[3], 2)}, {SOC_CAM_LINK(1, &phyflex_cameras[4], 2)}, {SOC_CAM_LINK(0, &phyflex_cameras[5], 2), .flags=SOCAM_SENSOR_INVERT_PCLK}, - {SOC_CAM_LINK(1, &phyflex_cameras[6], 2), + {SOC_CAM_LINK(1, &phyflex_cameras[6], 2), .flags=SOCAM_SENSOR_INVERT_PCLK}, }; static struct platform_device mxc_ipu_cameras[] = { @@ -1314,6 +1315,7 @@ static void __init mx6_phyflex_init(void) {SOC_CAM_PDRV(0, phyflex_iclinks),}, {SOC_CAM_PDRV(1, phyflex_iclinks),}, }; + if(csi0_cam_type!=NULL){/* set the max MCLK for the Camera-Type and Interface-Type */ if(strcmp(csi0_interface_type,"phyCAM-P")==0) { if(strcmp("mt9m001",csi0_cam_type)==0) { @@ -1322,6 +1324,7 @@ static void __init mx6_phyflex_init(void) } if(strcmp("tw9911",csi0_cam_type)==0) { mxc_ipu_csi_pdata[0].mclk_default_rate = 26700000; + phyflex_iclinks[0].priv=&tw9910_info; } if(strcmp("mt9m111",csi0_cam_type)==0) { mxc_ipu_csi_pdata[0].mclk_default_rate = 54000000; @@ -1340,6 +1343,7 @@ static void __init mx6_phyflex_init(void) } if(strcmp("tw9910",csi0_cam_type)==0) { mxc_ipu_csi_pdata[0].mclk_default_rate = 26700000; + phyflex_iclinks[0].priv=&tw9910_info; } if(strcmp("mt9m111",csi0_cam_type)==0) { mxc_ipu_csi_pdata[0].mclk_default_rate = 40000000; @@ -1362,6 +1366,7 @@ static void __init mx6_phyflex_init(void) } if(strcmp("tw9910",csi1_cam_type)==0) { mxc_ipu_csi_pdata[1].mclk_default_rate = 26700000; + phyflex_iclinks[1].priv=&tw9910_info; } if(strcmp("mt9m111",csi1_cam_type)==0) { mxc_ipu_csi_pdata[1].mclk_default_rate = 54000000; @@ -1381,6 +1386,7 @@ static void __init mx6_phyflex_init(void) } if(strcmp("tw9910",csi1_cam_type)==0) { mxc_ipu_csi_pdata[1].mclk_default_rate = 26700000; + phyflex_iclinks[1].priv=&tw9910_info; } if(strcmp("mt9m111",csi1_cam_type)==0) { mxc_ipu_csi_pdata[1].mclk_default_rate = 40000000; |