From 68b64b9f25a2248d57a2d744933c85d11a69ee01 Mon Sep 17 00:00:00 2001 From: Andrei Andreyanau Date: Thu, 13 Jun 2013 09:57:12 +0300 Subject: 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 Signed-off-by: Christian Hemp --- include/media/soc_camera.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'include') 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) -- cgit v1.2.3