summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrei Andreyanau <a.andreyanau@sam-solutions.net>2013-06-13 09:57:12 +0300
committerJustin Waters <justin.waters@timesys.com>2013-11-07 12:19:32 -0500
commit68b64b9f25a2248d57a2d744933c85d11a69ee01 (patch)
tree32f4f3c47b7b911da99e35e47260081ac9e5eca2 /include
parent12a2156a40319c49f73ea92f84145ccbcd9dcb5a (diff)
Removed 12 bit support from host camera driver
modified: drivers/media/video/mxc_camera.c modified: include/media/soc_camera.h Signed-off-by: Uladzimir Bely <u.bely@sam-solutions.net> Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Diffstat (limited to 'include')
-rw-r--r--include/media/soc_camera.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index cdc8022d2169..636806166090 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -266,17 +266,16 @@ static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
#define SOCAM_DATAWIDTH_8 (1 << 7)
#define SOCAM_DATAWIDTH_9 (1 << 8)
#define SOCAM_DATAWIDTH_10 (1 << 9)
-#define SOCAM_DATAWIDTH_12 (1 << 10)
-#define SOCAM_DATAWIDTH_15 (1 << 11)
-#define SOCAM_DATAWIDTH_16 (1 << 12)
-#define SOCAM_PCLK_SAMPLE_RISING (1 << 13)
-#define SOCAM_PCLK_SAMPLE_FALLING (1 << 14)
-#define SOCAM_DATA_ACTIVE_HIGH (1 << 15)
-#define SOCAM_DATA_ACTIVE_LOW (1 << 16)
+#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_12 | SOCAM_DATAWIDTH_15 | SOCAM_DATAWIDTH_16)
+ SOCAM_DATAWIDTH_15 | SOCAM_DATAWIDTH_16)
static inline unsigned long soc_camera_bus_param_compatible(
unsigned long camera_flags, unsigned long bus_flags)