Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / media / omap3isp.h

diff --git a/include/media/omap3isp.h b/include/media/omap3isp.h
index 95842696857f26122b9a3233b19c251ec6038eb2..c9d06d9f7e6eaa823eb4eb8b286ada0008abc176 100644 (file)
--- a/include/media/omap3isp.h
+++ b/include/media/omap3isp.h
@@ -29,10 +29,6 @@
 struct i2c_board_info;
 struct isp_device;
 
-#define ISP_XCLK_NONE                  0
-#define ISP_XCLK_A                     1
-#define ISP_XCLK_B                     2
-
 enum isp_interface_type {
        ISP_INTERFACE_PARALLEL,
        ISP_INTERFACE_CSI2A_PHY2,
@@ -153,7 +149,13 @@ struct isp_v4l2_subdevs_group {
        } bus; /* gcc < 4.6.0 chokes on anonymous union initializers */
 };
 
+struct isp_platform_xclk {
+       const char *dev_id;
+       const char *con_id;
+};
+
 struct isp_platform_data {
+       struct isp_platform_xclk xclks[2];
        struct isp_v4l2_subdevs_group *subdevs;
        void (*set_constraints)(struct isp_device *isp, bool enable);
 };