aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2011-10-10 13:13:26 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-14 07:50:23 -0400
commitfe6adc1991b6ce0f6d1c4ca74ec9f02d2d8cb3b4 (patch)
tree8639dbb667311cfc2d8ccc132a16f927045c5ba1 /include
parentda39257f0bc5a5780735abb8c8031e20a701d49a (diff)
[media] omap3isp: Add lane configuration to platform data
Add lane configuration (order of clock and data lane) to platform data on both CCP2 and CSI-2. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/media/omap3isp.h25
1 files changed, 25 insertions, 0 deletions
diff --git a/include/media/omap3isp.h b/include/media/omap3isp.h
index 3f4928df6ed0..4d94be5226af 100644
--- a/include/media/omap3isp.h
+++ b/include/media/omap3isp.h
@@ -91,6 +91,29 @@ enum {
91}; 91};
92 92
93/** 93/**
94 * struct isp_csiphy_lane: CCP2/CSI2 lane position and polarity
95 * @pos: position of the lane
96 * @pol: polarity of the lane
97 */
98struct isp_csiphy_lane {
99 u8 pos;
100 u8 pol;
101};
102
103#define ISP_CSIPHY1_NUM_DATA_LANES 1
104#define ISP_CSIPHY2_NUM_DATA_LANES 2
105
106/**
107 * struct isp_csiphy_lanes_cfg - CCP2/CSI2 lane configuration
108 * @data: Configuration of one or two data lanes
109 * @clk: Clock lane configuration
110 */
111struct isp_csiphy_lanes_cfg {
112 struct isp_csiphy_lane data[ISP_CSIPHY2_NUM_DATA_LANES];
113 struct isp_csiphy_lane clk;
114};
115
116/**
94 * struct isp_ccp2_platform_data - CCP2 interface platform data 117 * struct isp_ccp2_platform_data - CCP2 interface platform data
95 * @strobe_clk_pol: Strobe/clock polarity 118 * @strobe_clk_pol: Strobe/clock polarity
96 * 0 - Non Inverted, 1 - Inverted 119 * 0 - Non Inverted, 1 - Inverted
@@ -109,6 +132,7 @@ struct isp_ccp2_platform_data {
109 unsigned int ccp2_mode:1; 132 unsigned int ccp2_mode:1;
110 unsigned int phy_layer:1; 133 unsigned int phy_layer:1;
111 unsigned int vpclk_div:2; 134 unsigned int vpclk_div:2;
135 struct isp_csiphy_lanes_cfg lanecfg;
112}; 136};
113 137
114/** 138/**
@@ -119,6 +143,7 @@ struct isp_ccp2_platform_data {
119struct isp_csi2_platform_data { 143struct isp_csi2_platform_data {
120 unsigned crc:1; 144 unsigned crc:1;
121 unsigned vpclk_div:2; 145 unsigned vpclk_div:2;
146 struct isp_csiphy_lanes_cfg lanecfg;
122}; 147};
123 148
124struct isp_subdev_i2c_board_info { 149struct isp_subdev_i2c_board_info {