summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2011-10-10 14:13:26 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-14 08:50:23 -0300
commitfe6adc1991b6ce0f6d1c4ca74ec9f02d2d8cb3b4 (patch)
tree8639dbb667311cfc2d8ccc132a16f927045c5ba1 /include/media
parentda39257f0bc5a5780735abb8c8031e20a701d49a (diff)
downloadkernel-common-fe6adc1991b6ce0f6d1c4ca74ec9f02d2d8cb3b4.tar.gz
kernel-common-fe6adc1991b6ce0f6d1c4ca74ec9f02d2d8cb3b4.tar.bz2
kernel-common-fe6adc1991b6ce0f6d1c4ca74ec9f02d2d8cb3b4.zip
[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/media')
-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 {
};
/**
+ * 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
* 0 - Non Inverted, 1 - Inverted
@@ -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 {