Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 313471
b: refs/heads/master
c: 3d6bbca
h: refs/heads/master
i:
  313469: 63767b9
  313467: 5ff2238
  313463: 72d2143
  313455: d7a4e73
  313439: ef1aae3
  313407: 5e21ffe
  313343: 63050c9
v: v3
  • Loading branch information
Dmitry Lifshitz authored and Tony Lindgren committed Jul 2, 2012
1 parent 42a0a6d commit c88ceee
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d396be47300a52faf834c1e5fdb48d7d36aa45cf
refs/heads/master: 3d6bbca9364f28976695e17fa8ef045ec31620b8
20 changes: 20 additions & 0 deletions trunk/arch/arm/mach-omap2/board-cm-t35.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand All @@ -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,
Expand All @@ -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, },
};

Expand Down

0 comments on commit c88ceee

Please sign in to comment.