summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2008-12-19 14:07:49 +0100
committerGuennadi Liakhovetski <g.liakhovetski@gmx.de>2008-12-19 14:07:49 +0100
commit17cd7738553914ce1e1299fbe8e3ce375ed7f02b (patch)
tree92230a208e16d21329d78c2334b98488d0b1b72e /linux/include
parent20108169e5e7867849b55fe31f273430cf57d3f7 (diff)
downloadmediapointer-dvb-s2-17cd7738553914ce1e1299fbe8e3ce375ed7f02b.tar.gz
mediapointer-dvb-s2-17cd7738553914ce1e1299fbe8e3ce375ed7f02b.tar.bz2
soc-camera: add new bus width and signal polarity flags
From: Guennadi Liakhovetski <lg@denx.de> In preparation for i.MX31 camera host driver add flags for 4 and 15 bit bus widths and for data lines polarity inversion. Signed-off-by: Guennadi Liakhovetski <lg@denx.de> --- include/media/soc_camera.h | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-)
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/media/soc_camera.h23
1 files changed, 14 insertions, 9 deletions
diff --git a/linux/include/media/soc_camera.h b/linux/include/media/soc_camera.h
index 50f444756..425b6a98c 100644
--- a/linux/include/media/soc_camera.h
+++ b/linux/include/media/soc_camera.h
@@ -221,15 +221,20 @@ static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
#define SOCAM_HSYNC_ACTIVE_LOW (1 << 3)
#define SOCAM_VSYNC_ACTIVE_HIGH (1 << 4)
#define SOCAM_VSYNC_ACTIVE_LOW (1 << 5)
-#define SOCAM_DATAWIDTH_8 (1 << 6)
-#define SOCAM_DATAWIDTH_9 (1 << 7)
-#define SOCAM_DATAWIDTH_10 (1 << 8)
-#define SOCAM_DATAWIDTH_16 (1 << 9)
-#define SOCAM_PCLK_SAMPLE_RISING (1 << 10)
-#define SOCAM_PCLK_SAMPLE_FALLING (1 << 11)
-
-#define SOCAM_DATAWIDTH_MASK (SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_9 | \
- SOCAM_DATAWIDTH_10 | SOCAM_DATAWIDTH_16)
+#define SOCAM_DATAWIDTH_4 (1 << 6)
+#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_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_DATAWIDTH_MASK (SOCAM_DATAWIDTH_4 | SOCAM_DATAWIDTH_8 | \
+ SOCAM_DATAWIDTH_9 | SOCAM_DATAWIDTH_10 | \
+ SOCAM_DATAWIDTH_15 | SOCAM_DATAWIDTH_16)
static inline unsigned long soc_camera_bus_param_compatible(
unsigned long camera_flags, unsigned long bus_flags)