diff options
| author | Andrei Andreyanau <a.andreyanau@sam-solutions.net> | 2013-06-13 09:57:12 +0300 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2013-11-07 12:19:32 -0500 |
| commit | 68b64b9f25a2248d57a2d744933c85d11a69ee01 (patch) | |
| tree | 32f4f3c47b7b911da99e35e47260081ac9e5eca2 | |
| parent | 12a2156a40319c49f73ea92f84145ccbcd9dcb5a (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>
| -rw-r--r-- | drivers/media/video/mxc_camera.c | 17 | ||||
| -rw-r--r-- | include/media/soc_camera.h | 15 |
2 files changed, 9 insertions, 23 deletions
diff --git a/drivers/media/video/mxc_camera.c b/drivers/media/video/mxc_camera.c index 3b323f2a743c..ef7538b8ad2b 100644 --- a/drivers/media/video/mxc_camera.c +++ b/drivers/media/video/mxc_camera.c @@ -1,4 +1,4 @@ -#define DEBUG + #include <linux/init.h> #include <linux/module.h> #include <linux/version.h> @@ -694,13 +694,9 @@ static int test_platform_param(struct mxc_camera_dev *mxc_cam, * If requested data width is supported by the platform, use it or any * possible lower value - i.MXC1 is smart enough to schift bits */ - if (mxc_cam->platform_flags & MXC_CAMERA_DATAWIDTH_15) *flags |= SOCAM_DATAWIDTH_15 | SOCAM_DATAWIDTH_10 | SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_4; - else if (mxc_cam->platform_flags & MXC_CAMERA_DATAWIDTH_12) - *flags |= SOCAM_DATAWIDTH_12 | SOCAM_DATAWIDTH_10 | - SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_4; else if (mxc_cam->platform_flags & MXC_CAMERA_DATAWIDTH_10) *flags |= SOCAM_DATAWIDTH_10 | SOCAM_DATAWIDTH_8 | SOCAM_DATAWIDTH_4; @@ -714,11 +710,6 @@ static int test_platform_param(struct mxc_camera_dev *mxc_cam, if (!(*flags & SOCAM_DATAWIDTH_15)) return -EINVAL; break; - case 12: - if (!(*flags & SOCAM_DATAWIDTH_12)) { - return -EINVAL; - } - break; case 10: if (!(*flags & SOCAM_DATAWIDTH_10)) return -EINVAL; @@ -1009,13 +1000,9 @@ static int mxc_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt) * Make the camera work in widest common mode, we'll take care of * the rest */ - if (common_flags & SOCAM_DATAWIDTH_15) common_flags = (common_flags & ~SOCAM_DATAWIDTH_MASK) | SOCAM_DATAWIDTH_15; - else if (common_flags & SOCAM_DATAWIDTH_12) - common_flags = (common_flags & ~SOCAM_DATAWIDTH_MASK) | - SOCAM_DATAWIDTH_12; else if (common_flags & SOCAM_DATAWIDTH_10) common_flags = (common_flags & ~SOCAM_DATAWIDTH_MASK) | SOCAM_DATAWIDTH_10; @@ -1140,7 +1127,7 @@ static int __devinit mxc_camera_probe(struct platform_device *pdev) /* TODO: add other data widths */ if (!(mxc_cam->platform_flags & (MXC_CAMERA_DATAWIDTH_4 | MXC_CAMERA_DATAWIDTH_8 | MXC_CAMERA_DATAWIDTH_10 | - MXC_CAMERA_DATAWIDTH_12 | MXC_CAMERA_DATAWIDTH_15))) { + MXC_CAMERA_DATAWIDTH_15))) { /* * Platform hasn't set available data widths. This is bad. * Warn and use a default. 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) |