Add mt9t001 and tvp5150 support to cm-t3x board.
Subsystems (3)
cover Add mt9t001 and tvp5150 support to cm-t3x board.
This patch set adds mt9t001 camera sensor and tvp5150 video decoder registration to cm-t35/cm-t3730 board support file. Base board (SB-T35) CIP of cm-t3x module can be connected to external video input adapter like Compulab VIP-ADP board.
VIP-ADP has a digital camera sensor connection port and two composite video input ports. Analog composite video is processed by TVP5151 NTSC/PAL/SECAM Video Decoder chip.
Dmitry Lifshitz (2):
ARM: OMAP3: cm-t35: add mt9t001 camera sensor support
ARM: OMAP3: cm-t35: add tvp5150 decoder support
arch/arm/mach-omap2/board-cm-t35.c | 89 ++++++++++++++++++++++++++++++++++++ 1 files changed, 89 insertions(+), 0 deletions(-)
Signature · 1 line
1.7.5.4
PATCH 1/2 ARM: OMAP3: cm-t35: add mt9t001 camera sensor support
Setup pinmux for CPI and register the mt9t001 camera sensor in ISP subsystem.
Signed-off-by Dmitry Lifshitz <[email protected]>
Signed-off-by Igor Grinberg <[email protected]>
--- arch/arm/mach-omap2/board-cm-t35.c | 69 ++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-cm-t35.c +69 -0
@@ -490,6 +490,51 @@ static struct twl4030_platform_data cm_t35_twldata = { .power = &cm_t35_power_data, }; +#if defined(CONFIG_VIDEO_OMAP3 ) || defined(CONFIG_VIDEO_OMAP3_MODULE ) +#include <media/omap3isp.h> +#include "devices.h" + +static struct i2c_board_info cm_t35_isp_i2c_boardinfo[] = { + { +I2C_BOARD_INFO ("mt9t001" ,0x5d ), + }, +}; + +static struct isp_subdev_i2c_board_info cm_t35_isp_primary_subdevs[] = { + { + .board_info = &cm_t35_isp_i2c_boardinfo[0 ], + .i2c_adapter_id =3 , + }, + {NULL ,0 , }, +}; + +static struct isp_v4l2_subdevs_group cm_t35_isp_subdevs[] = { + { + .subdevs = cm_t35_isp_primary_subdevs, + .interface =ISP_INTERFACE_PARALLEL , + .bus = { + .parallel = { + .clk_pol =1 , + }, + }, + }, + {NULL ,0 , }, +}; + +static struct isp_platform_data cm_t35_isp_pdata = { + .subdevs = cm_t35_isp_subdevs, +}; + +static void __init cm_t35_init_camera (void ) +{ +if (omap3_init_camera (&cm_t35_isp_pdata) <0 ) +pr_warn ("CM-T3x: Failed registering camera device!\n" ); +} + +#else +static inline void cm_t35_init_camera (void ) {} +#endif /* CONFIG_VIDEO_OMAP3 */ +static void __init cm_t35_init_i2c (void ) { omap3_pmic_get_config(&cm_t35_twldata, TWL_COMMON_PDATA_USB,
@@ -497,6 +542,8 @@ static void __init cm_t35_init_i2c(void) TWL_COMMON_PDATA_AUDIO);omap3_pmic_init ("tps65930" , &cm_t35_twldata); + +omap_register_i2c_bus (3 ,400 ,NULL ,0 ); }#ifdef CONFIG_OMAP_MUX
@@ -574,6 +621,27 @@ static struct omap_board_mux board_mux[] __initdata = {OMAP3_MUX (DSS_DATA16 ,OMAP_MUX_MODE0 |OMAP_PIN_OUTPUT ),OMAP3_MUX (DSS_DATA17 ,OMAP_MUX_MODE0 |OMAP_PIN_OUTPUT ), +/* Camera */ +OMAP3_MUX (CAM_HS ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), +OMAP3_MUX (CAM_VS ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), +OMAP3_MUX (CAM_XCLKA ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), +OMAP3_MUX (CAM_PCLK ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), +OMAP3_MUX (CAM_FLD ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), +OMAP3_MUX (CAM_D0 ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), +OMAP3_MUX (CAM_D1 ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), +OMAP3_MUX (CAM_D2 ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), +OMAP3_MUX (CAM_D3 ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), +OMAP3_MUX (CAM_D4 ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), +OMAP3_MUX (CAM_D5 ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), +OMAP3_MUX (CAM_D6 ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), +OMAP3_MUX (CAM_D7 ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), +OMAP3_MUX (CAM_D8 ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT_PULLDOWN ), +OMAP3_MUX (CAM_D9 ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT_PULLDOWN ), +OMAP3_MUX (CAM_STROBE ,OMAP_MUX_MODE0 |OMAP_PIN_INPUT ), + +OMAP3_MUX (CAM_D10 ,OMAP_MUX_MODE4 |OMAP_PIN_INPUT_PULLDOWN ), +OMAP3_MUX (CAM_D11 ,OMAP_MUX_MODE4 |OMAP_PIN_INPUT_PULLDOWN ), +/* display controls */ OMAP3_MUX (MCBSP1_FSR ,OMAP_MUX_MODE4 |OMAP_PIN_OUTPUT ), OMAP3_MUX(GPMC_NCS7, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
@@ -646,6 +714,7 @@ static void __init cm_t3x_common_init(void)usb_musb_init (NULL );cm_t35_init_usbh (); +cm_t35_init_camera (); }static void __init cm_t35_init (void )
Signature · 1 line
1.7.5.4
Tony Lindgren
maintainerPATCH 1/2 ARM: OMAP3: cm-t35: add mt9t001 camera sensor support
Quoted 2 lines · Dmitry Lifshitz
Setup pinmux for CPI and register the mt9t001 camera sensor in ISP subsystem.
Applying both into devel-board branch. Note that we are phasing out the board-*.c files with device tree support, so only minimal changes will be applied to the board-*.c files at this point.
Regards,
Tony
PATCH 2/2 ARM: OMAP3: cm-t35: add tvp5150 decoder support
In reply to Dmitry LifshitzRegister the tvp5150 video decoder in ISP subsystem.
Signed-off-by Dmitry Lifshitz <[email protected]>
Signed-off-by Igor Grinberg <[email protected]>
--- arch/arm/mach-omap2/board-cm-t35.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-cm-t35.c +20 -0
@@ -498,6 +498,9 @@ static struct i2c_board_info cm_t35_isp_i2c_boardinfo[] = { {I2C_BOARD_INFO ("mt9t001" ,0x5d ), }, + { + I2C_BOARD_INFO("tvp5150", 0x5c), + }, }; static struct isp_subdev_i2c_board_info cm_t35_isp_primary_subdevs[] = {
@@ -508,6 +511,14 @@ static struct isp_subdev_i2c_board_info cm_t35_isp_primary_subdevs[] = { { NULL, 0, }, }; +static struct isp_subdev_i2c_board_info cm_t35_isp_secondary_subdevs[] = { + { + .board_info = &cm_t35_isp_i2c_boardinfo[1], + .i2c_adapter_id = 3, + }, + { NULL, 0, }, +}; + static struct isp_v4l2_subdevs_group cm_t35_isp_subdevs[] = { { .subdevs = cm_t35_isp_primary_subdevs,
@@ -518,6 +529,15 @@ static struct isp_v4l2_subdevs_group cm_t35_isp_subdevs[] = { }, }, }, + { + .subdevs = cm_t35_isp_secondary_subdevs, + .interface = ISP_INTERFACE_PARALLEL, + .bus = { + .parallel = { + .clk_pol = 0, + }, + }, + }, { NULL, 0, }, };
Signature · 1 line
1.7.5.4