diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-06-04 16:24:22 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:53:22 -0400 |
commit | b7ccdba02aaa5100eec85d41c56c37c78d3ab407 (patch) | |
tree | 03e625bcbfb438786a15def91d1703ecbea813b9 /include/media/soc_camera.h | |
parent | 4df4ada936dad1cd8bcf3ee7c97841da189ecfc1 (diff) |
[media] V4L: soc-camera: MIPI flags are not sensor flags
SOCAM_MIPI_[1234]LANE flags are not board-specific sensor flags, they
are bus configuration flags.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/soc_camera.h')
-rw-r--r-- | include/media/soc_camera.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 238bd334fd83..e34b5e615f2a 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h | |||
@@ -109,12 +109,6 @@ struct soc_camera_host_ops { | |||
109 | #define SOCAM_SENSOR_INVERT_HSYNC (1 << 2) | 109 | #define SOCAM_SENSOR_INVERT_HSYNC (1 << 2) |
110 | #define SOCAM_SENSOR_INVERT_VSYNC (1 << 3) | 110 | #define SOCAM_SENSOR_INVERT_VSYNC (1 << 3) |
111 | #define SOCAM_SENSOR_INVERT_DATA (1 << 4) | 111 | #define SOCAM_SENSOR_INVERT_DATA (1 << 4) |
112 | #define SOCAM_MIPI_1LANE (1 << 5) | ||
113 | #define SOCAM_MIPI_2LANE (1 << 6) | ||
114 | #define SOCAM_MIPI_3LANE (1 << 7) | ||
115 | #define SOCAM_MIPI_4LANE (1 << 8) | ||
116 | #define SOCAM_MIPI (SOCAM_MIPI_1LANE | SOCAM_MIPI_2LANE | \ | ||
117 | SOCAM_MIPI_3LANE | SOCAM_MIPI_4LANE) | ||
118 | 112 | ||
119 | struct i2c_board_info; | 113 | struct i2c_board_info; |
120 | struct regulator_bulk_data; | 114 | struct regulator_bulk_data; |
@@ -270,6 +264,12 @@ static inline struct v4l2_queryctrl const *soc_camera_find_qctrl( | |||
270 | #define SOCAM_PCLK_SAMPLE_FALLING (1 << 13) | 264 | #define SOCAM_PCLK_SAMPLE_FALLING (1 << 13) |
271 | #define SOCAM_DATA_ACTIVE_HIGH (1 << 14) | 265 | #define SOCAM_DATA_ACTIVE_HIGH (1 << 14) |
272 | #define SOCAM_DATA_ACTIVE_LOW (1 << 15) | 266 | #define SOCAM_DATA_ACTIVE_LOW (1 << 15) |
267 | #define SOCAM_MIPI_1LANE (1 << 16) | ||
268 | #define SOCAM_MIPI_2LANE (1 << 17) | ||
269 | #define SOCAM_MIPI_3LANE (1 << 18) | ||
270 | #define SOCAM_MIPI_4LANE (1 << 19) | ||
271 | #define SOCAM_MIPI (SOCAM_MIPI_1LANE | SOCAM_MIPI_2LANE | \ | ||
272 | SOCAM_MIPI_3LANE | SOCAM_MIPI_4LANE) | ||
273 | 273 | ||
274 | #define SOCAM_DATAWIDTH_MASK (SOCAM_DATAWIDTH_4 | SOCAM_DATAWIDTH_8 | \ | 274 | #define SOCAM_DATAWIDTH_MASK (SOCAM_DATAWIDTH_4 | SOCAM_DATAWIDTH_8 | \ |
275 | SOCAM_DATAWIDTH_9 | SOCAM_DATAWIDTH_10 | \ | 275 | SOCAM_DATAWIDTH_9 | SOCAM_DATAWIDTH_10 | \ |