Skip to content

Commit

Permalink
[media] V4L: soc-camera: MIPI flags are not sensor flags
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Guennadi Liakhovetski authored and Mauro Carvalho Chehab committed Jul 27, 2011
1 parent 4df4ada commit b7ccdba
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions include/media/soc_camera.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,6 @@ 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;
Expand Down Expand Up @@ -270,6 +264,12 @@ static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
#define SOCAM_PCLK_SAMPLE_FALLING (1 << 13)
#define SOCAM_DATA_ACTIVE_HIGH (1 << 14)
#define SOCAM_DATA_ACTIVE_LOW (1 << 15)
#define SOCAM_MIPI_1LANE (1 << 16)
#define SOCAM_MIPI_2LANE (1 << 17)
#define SOCAM_MIPI_3LANE (1 << 18)
#define SOCAM_MIPI_4LANE (1 << 19)
#define SOCAM_MIPI (SOCAM_MIPI_1LANE | SOCAM_MIPI_2LANE | \
SOCAM_MIPI_3LANE | SOCAM_MIPI_4LANE)

#define SOCAM_DATAWIDTH_MASK (SOCAM_DATAWIDTH_4 | SOCAM_DATAWIDTH_8 | \
SOCAM_DATAWIDTH_9 | SOCAM_DATAWIDTH_10 | \
Expand Down

0 comments on commit b7ccdba

Please sign in to comment.