From c97e9623dd11305b5d69e72c48c513344a3d2f62 Mon Sep 17 00:00:00 2001 From: Kassey Li Date: Thu, 7 Apr 2011 14:01:29 -0300 Subject: [PATCH] --- yaml --- r: 250291 b: refs/heads/master c: ee1b6f4bf3aa827b0daf65d7441e75212604b1c9 h: refs/heads/master i: 250289: 999050c8b16a338f5e53bce353709fe221b21135 250287: 06106a579f7951adc76d2f3668ad3b4de9161a31 v: v3 --- [refs] | 2 +- trunk/include/media/soc_camera.h | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 54ee877251f0..8159ef8a0cf8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64149deb6a9ec35cc8a3ac3e7b5bc19d4a79ff44 +refs/heads/master: ee1b6f4bf3aa827b0daf65d7441e75212604b1c9 diff --git a/trunk/include/media/soc_camera.h b/trunk/include/media/soc_camera.h index 844cd09d7d3e..238bd334fd83 100644 --- a/trunk/include/media/soc_camera.h +++ b/trunk/include/media/soc_camera.h @@ -109,6 +109,12 @@ struct soc_camera_host_ops { #define SOCAM_SENSOR_INVERT_HSYNC (1 << 2) #define SOCAM_SENSOR_INVERT_VSYNC (1 << 3) #define SOCAM_SENSOR_INVERT_DATA (1 << 4) +#define SOCAM_MIPI_1LANE (1 << 5) +#define SOCAM_MIPI_2LANE (1 << 6) +#define SOCAM_MIPI_3LANE (1 << 7) +#define SOCAM_MIPI_4LANE (1 << 8) +#define SOCAM_MIPI (SOCAM_MIPI_1LANE | SOCAM_MIPI_2LANE | \ + SOCAM_MIPI_3LANE | SOCAM_MIPI_4LANE) struct i2c_board_info; struct regulator_bulk_data; @@ -273,6 +279,7 @@ static inline unsigned long soc_camera_bus_param_compatible( unsigned long camera_flags, unsigned long bus_flags) { unsigned long common_flags, hsync, vsync, pclk, data, buswidth, mode; + unsigned long mipi; common_flags = camera_flags & bus_flags; @@ -282,8 +289,9 @@ static inline unsigned long soc_camera_bus_param_compatible( data = common_flags & (SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_LOW); mode = common_flags & (SOCAM_MASTER | SOCAM_SLAVE); buswidth = common_flags & SOCAM_DATAWIDTH_MASK; + mipi = common_flags & SOCAM_MIPI; - return (!hsync || !vsync || !pclk || !data || !mode || !buswidth) ? 0 : + return ((!hsync || !vsync || !pclk || !data || !mode || !buswidth) && !mipi) ? 0 : common_flags; }