From c7113e851b9847a39d6fa01609676243d095f091 Mon Sep 17 00:00:00 2001
From: Sakari Ailus <sakari.ailus@iki.fi>
Date: Mon, 10 Oct 2011 14:13:26 -0300
Subject: [PATCH] --- yaml --- r: 306283 b: refs/heads/master c:
 fe6adc1991b6ce0f6d1c4ca74ec9f02d2d8cb3b4 h: refs/heads/master i:   306281:
 05e68d3042f3e5904a050bf7916230d666d1ffbd   306279:
 c5c8ee015a80123ee16bec8c1a2390623e78545a v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/video/omap3isp/ispcsiphy.h  | 15 ++---------
 trunk/include/media/omap3isp.h                | 25 +++++++++++++++++++
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 2ac650f2b765..58de10de5f9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da39257f0bc5a5780735abb8c8031e20a701d49a
+refs/heads/master: fe6adc1991b6ce0f6d1c4ca74ec9f02d2d8cb3b4
diff --git a/trunk/drivers/media/video/omap3isp/ispcsiphy.h b/trunk/drivers/media/video/omap3isp/ispcsiphy.h
index 9596dc6830a6..e93a661e65d9 100644
--- a/trunk/drivers/media/video/omap3isp/ispcsiphy.h
+++ b/trunk/drivers/media/video/omap3isp/ispcsiphy.h
@@ -27,22 +27,11 @@
 #ifndef OMAP3_ISP_CSI_PHY_H
 #define OMAP3_ISP_CSI_PHY_H
 
+#include <media/omap3isp.h>
+
 struct isp_csi2_device;
 struct regulator;
 
-struct csiphy_lane {
-	u8 pos;
-	u8 pol;
-};
-
-#define ISP_CSIPHY2_NUM_DATA_LANES	2
-#define ISP_CSIPHY1_NUM_DATA_LANES	1
-
-struct isp_csiphy_lanes_cfg {
-	struct csiphy_lane data[ISP_CSIPHY2_NUM_DATA_LANES];
-	struct csiphy_lane clk;
-};
-
 struct isp_csiphy_dphy_cfg {
 	u8 ths_term;
 	u8 ths_settle;
diff --git a/trunk/include/media/omap3isp.h b/trunk/include/media/omap3isp.h
index 3f4928df6ed0..4d94be5226af 100644
--- a/trunk/include/media/omap3isp.h
+++ b/trunk/include/media/omap3isp.h
@@ -90,6 +90,29 @@ enum {
 	ISP_CCP2_MODE_CCP2 = 1,
 };
 
+/**
+ * struct isp_csiphy_lane: CCP2/CSI2 lane position and polarity
+ * @pos: position of the lane
+ * @pol: polarity of the lane
+ */
+struct isp_csiphy_lane {
+	u8 pos;
+	u8 pol;
+};
+
+#define ISP_CSIPHY1_NUM_DATA_LANES	1
+#define ISP_CSIPHY2_NUM_DATA_LANES	2
+
+/**
+ * struct isp_csiphy_lanes_cfg - CCP2/CSI2 lane configuration
+ * @data: Configuration of one or two data lanes
+ * @clk: Clock lane configuration
+ */
+struct isp_csiphy_lanes_cfg {
+	struct isp_csiphy_lane data[ISP_CSIPHY2_NUM_DATA_LANES];
+	struct isp_csiphy_lane clk;
+};
+
 /**
  * struct isp_ccp2_platform_data - CCP2 interface platform data
  * @strobe_clk_pol: Strobe/clock polarity
@@ -109,6 +132,7 @@ struct isp_ccp2_platform_data {
 	unsigned int ccp2_mode:1;
 	unsigned int phy_layer:1;
 	unsigned int vpclk_div:2;
+	struct isp_csiphy_lanes_cfg lanecfg;
 };
 
 /**
@@ -119,6 +143,7 @@ struct isp_ccp2_platform_data {
 struct isp_csi2_platform_data {
 	unsigned crc:1;
 	unsigned vpclk_div:2;
+	struct isp_csiphy_lanes_cfg lanecfg;
 };
 
 struct isp_subdev_i2c_board_info {