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

[karo-tx-linux.git] / include / media / s5p_fimc.h

diff --git a/include/media/s5p_fimc.h b/include/media/s5p_fimc.h
index 0d457cac8f7dbd7521db361a603ffdba9d881e23..9fdff8a4ed2667f36beb2b3d551419f561ba2626 100644 (file)
--- a/include/media/s5p_fimc.h
+++ b/include/media/s5p_fimc.h
@@ -33,6 +33,7 @@ struct i2c_board_info;
  * @board_info: pointer to I2C subdevice's board info
  * @clk_frequency: frequency of the clock the host interface provides to sensor
  * @bus_type: determines bus type, MIPI, ITU-R BT.601 etc.
+ * @csi_data_align: MIPI-CSI interface data alignment in bits
  * @i2c_bus_num: i2c control bus id the sensor is attached to
  * @mux_id: FIMC camera interface multiplexer index (separate for MIPI and ITU)
  * @flags: flags defining bus signals polarity inversion (High by default)
@@ -41,20 +42,20 @@ struct s5p_fimc_isp_info {
        struct i2c_board_info *board_info;
        unsigned long clk_frequency;
        enum cam_bus_type bus_type;
+       u16 csi_data_align;
        u16 i2c_bus_num;
        u16 mux_id;
        u16 flags;
 };
 
-
-#define FIMC_MAX_CAMIF_CLIENTS 2
-
 /**
  * struct s5p_platform_fimc - camera host interface platform data
  *
  * @isp_info: properties of camera sensor required for host interface setup
+ * @num_clients: the number of attached image sensors
  */
 struct s5p_platform_fimc {
-       struct s5p_fimc_isp_info *isp_info[FIMC_MAX_CAMIF_CLIENTS];
+       struct s5p_fimc_isp_info *isp_info;
+       int num_clients;
 };
 #endif /* S5P_FIMC_H_ */