diff --git a/[refs] b/[refs] index b4f9c66b6e0f..8be43e814629 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d396be47300a52faf834c1e5fdb48d7d36aa45cf +refs/heads/master: 3d6bbca9364f28976695e17fa8ef045ec31620b8 diff --git a/trunk/arch/arm/mach-omap2/board-cm-t35.c b/trunk/arch/arm/mach-omap2/board-cm-t35.c index 05c66e847484..97d719047af3 100644 --- a/trunk/arch/arm/mach-omap2/board-cm-t35.c +++ b/trunk/arch/arm/mach-omap2/board-cm-t35.c @@ -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, }, };