From c88ceeea7ae0df82eb7aa768227ca61d0689f063 Mon Sep 17 00:00:00 2001
From: Dmitry Lifshitz <lifshitz@compulab.co.il>
Date: Wed, 13 Jun 2012 15:55:10 +0300
Subject: [PATCH] --- yaml --- r: 313471 b: refs/heads/master c:
 3d6bbca9364f28976695e17fa8ef045ec31620b8 h: refs/heads/master i:   313469:
 63767b9efdfc260e5a8642900c3f8c2c00946b9e   313467:
 5ff223819bfbb552e73196e395a5e0552881cf02   313463:
 72d21438f95d738c59a162d7aaf903486b767aa4   313455:
 d7a4e738b65ce66e94dbb4bd59d1677136b886ed   313439:
 ef1aae30e9709d6aaccc53a6a859c4ee6cf0b18d   313407:
 5e21ffe9211209bfa8bc5db3b7bc96a912f30ab9   313343:
 63050c95227e116ed259ee1b3546d4d55151c917 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/arm/mach-omap2/board-cm-t35.c | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

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, },
 };