summaryrefslogtreecommitdiffstats
path: root/include/media/soc_camera.h
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2011-07-27 10:10:43 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 18:27:36 -0200
commit9d3baeb4628fbd608282559758a75215ac865f4d (patch)
tree0f2c6529bda6a2fe79dbea34e415ac545eab130b /include/media/soc_camera.h
parent84c760a5dec0edab857cc02c29ef334722520310 (diff)
downloadlinux-9d3baeb4628fbd608282559758a75215ac865f4d.tar.gz
linux-9d3baeb4628fbd608282559758a75215ac865f4d.tar.bz2
linux-9d3baeb4628fbd608282559758a75215ac865f4d.zip
[media] V4L: soc-camera: compatible bus-width flags
With the new subdevice media-bus configuration methods bus-width is not configured along with other bus parameters, instead, it is derived from the data format. With those methods it is convenient to specify supported bus-widths in the platform data as (1 << (width - 1)). We redefine SOCAM_DATAWIDTH_* flags to use the same convention to make platform data seemlessly reusable. 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.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 936a504f0bac..73337cff85a3 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -241,19 +241,19 @@ static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
#define SOCAM_MASTER (1 << 0)
#define SOCAM_SLAVE (1 << 1)
#define SOCAM_HSYNC_ACTIVE_HIGH (1 << 2)
-#define SOCAM_HSYNC_ACTIVE_LOW (1 << 3)
+#define SOCAM_HSYNC_ACTIVE_LOW (1 << 6)
#define SOCAM_VSYNC_ACTIVE_HIGH (1 << 4)
#define SOCAM_VSYNC_ACTIVE_LOW (1 << 5)
-#define SOCAM_DATAWIDTH_4 (1 << 6)
+#define SOCAM_DATAWIDTH_4 (1 << 3)
#define SOCAM_DATAWIDTH_8 (1 << 7)
#define SOCAM_DATAWIDTH_9 (1 << 8)
#define SOCAM_DATAWIDTH_10 (1 << 9)
-#define SOCAM_DATAWIDTH_15 (1 << 10)
-#define SOCAM_DATAWIDTH_16 (1 << 11)
+#define SOCAM_DATAWIDTH_15 (1 << 14)
+#define SOCAM_DATAWIDTH_16 (1 << 15)
#define SOCAM_PCLK_SAMPLE_RISING (1 << 12)
#define SOCAM_PCLK_SAMPLE_FALLING (1 << 13)
-#define SOCAM_DATA_ACTIVE_HIGH (1 << 14)
-#define SOCAM_DATA_ACTIVE_LOW (1 << 15)
+#define SOCAM_DATA_ACTIVE_HIGH (1 << 10)
+#define SOCAM_DATA_ACTIVE_LOW (1 << 11)
#define SOCAM_MIPI_1LANE (1 << 16)
#define SOCAM_MIPI_2LANE (1 << 17)
#define SOCAM_MIPI_3LANE (1 << 18)