diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-10-21 10:47:52 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-10-21 10:47:52 -0700 |
| commit | 67dbcd572bcf0855dcf4a53cdcfd3e01acfd1064 (patch) | |
| tree | 28ffa2364821705636147ef24dcb635ef9ffaeb9 /arch/arm/mach-mx6 | |
| parent | 2c6c13bb17c10ef1551aea19327bef293f892089 (diff) | |
Allow OV5640 parallel
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
Diffstat (limited to 'arch/arm/mach-mx6')
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6_nitrogen6x.c | 9 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/pads-mx6_nitrogen6x.h | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/mach-mx6/board-mx6_nitrogen6x.c b/arch/arm/mach-mx6/board-mx6_nitrogen6x.c index 043329494d22..8a7981b8b811 100644 --- a/arch/arm/mach-mx6/board-mx6_nitrogen6x.c +++ b/arch/arm/mach-mx6/board-mx6_nitrogen6x.c @@ -525,7 +525,8 @@ static struct fsl_mxc_camera_platform_data ov5640_mipi_data = { }; #endif -#if defined(CONFIG_MXC_CAMERA_OV5642) || defined(CONFIG_MXC_CAMERA_OV5642_MODULE) +#if defined(CONFIG_MXC_CAMERA_OV5642) || defined(CONFIG_MXC_CAMERA_OV5642_MODULE) || \ + defined(CONFIG_MXC_CAMERA_OV5640) || defined(CONFIG_MXC_CAMERA_OV5640_MODULE) /* * GPIO_6 GPIO[1]:6 (ov5642) - J5 - CSI0 power down * GPIO_8 GPIO[1]:8 (ov5642) - J5 - CSI0 reset @@ -608,6 +609,12 @@ static struct i2c_board_info mxc_i2c1_board_info[] __initdata = { .platform_data = (void *)&ov5640_mipi_data, }, #endif +#if defined(CONFIG_MXC_CAMERA_OV5640) || defined(CONFIG_MXC_CAMERA_OV5640_MODULE) + { + I2C_BOARD_INFO("ov5640", 0x3c), + .platform_data = (void *)&ov5642_data, + }, +#endif #if defined(CONFIG_MXC_CAMERA_OV5642) || defined(CONFIG_MXC_CAMERA_OV5642_MODULE) { I2C_BOARD_INFO("ov5642", 0x3c), diff --git a/arch/arm/mach-mx6/pads-mx6_nitrogen6x.h b/arch/arm/mach-mx6/pads-mx6_nitrogen6x.h index ad36d697c4ee..9e11273c2831 100644 --- a/arch/arm/mach-mx6/pads-mx6_nitrogen6x.h +++ b/arch/arm/mach-mx6/pads-mx6_nitrogen6x.h @@ -333,7 +333,8 @@ static iomux_v3_cfg_t MX6NAME(mipi_pads)[] = { }; #endif -#if defined(CONFIG_MXC_CAMERA_OV5642) || defined(CONFIG_MXC_CAMERA_OV5642_MODULE) +#if defined(CONFIG_MXC_CAMERA_OV5642) || defined(CONFIG_MXC_CAMERA_OV5642_MODULE) || \ + defined(CONFIG_MXC_CAMERA_OV5640) || defined(CONFIG_MXC_CAMERA_OV5640_MODULE) static iomux_v3_cfg_t MX6NAME(csi0_sensor_pads)[] = { /* IPU1 Camera */ MX6PAD(CSI0_DAT8__IPU1_CSI0_D_8), |