aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2011-07-28 17:42:57 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 16:28:18 -0400
commitd839fe17a13562897e52e29c13d09ac0435dee85 (patch)
tree43160915e5a31e06b0d2ae6161cc423ba496285a /drivers/media
parent5476ea8d67b9e2b258c1c9ce6620e69bf13ecf0f (diff)
[media] V4L: soc-camera: remove soc-camera client bus-param operations and supporting code
soc-camera has been completely ported over to V4L2 subdevice mbus-config operations, soc-camera client bus-param operations and supporting code can now be removed. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/soc_camera.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index e05d1c7fee8..ac23916552d 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -141,40 +141,6 @@ unsigned long soc_camera_apply_board_flags(struct soc_camera_link *icl,
141} 141}
142EXPORT_SYMBOL(soc_camera_apply_board_flags); 142EXPORT_SYMBOL(soc_camera_apply_board_flags);
143 143
144/**
145 * soc_camera_apply_sensor_flags() - apply platform SOCAM_SENSOR_INVERT_* flags
146 * @icl: camera platform parameters
147 * @flags: flags to be inverted according to platform configuration
148 * @return: resulting flags
149 */
150unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl,
151 unsigned long flags)
152{
153 unsigned long f;
154
155 /* If only one of the two polarities is supported, switch to the opposite */
156 if (icl->flags & SOCAM_SENSOR_INVERT_HSYNC) {
157 f = flags & (SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW);
158 if (f == SOCAM_HSYNC_ACTIVE_HIGH || f == SOCAM_HSYNC_ACTIVE_LOW)
159 flags ^= SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW;
160 }
161
162 if (icl->flags & SOCAM_SENSOR_INVERT_VSYNC) {
163 f = flags & (SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW);
164 if (f == SOCAM_VSYNC_ACTIVE_HIGH || f == SOCAM_VSYNC_ACTIVE_LOW)
165 flags ^= SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW;
166 }
167
168 if (icl->flags & SOCAM_SENSOR_INVERT_PCLK) {
169 f = flags & (SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING);
170 if (f == SOCAM_PCLK_SAMPLE_RISING || f == SOCAM_PCLK_SAMPLE_FALLING)
171 flags ^= SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING;
172 }
173
174 return flags;
175}
176EXPORT_SYMBOL(soc_camera_apply_sensor_flags);
177
178#define pixfmtstr(x) (x) & 0xff, ((x) >> 8) & 0xff, ((x) >> 16) & 0xff, \ 144#define pixfmtstr(x) (x) & 0xff, ((x) >> 8) & 0xff, ((x) >> 16) & 0xff, \
179 ((x) >> 24) & 0xff 145 ((x) >> 24) & 0xff
180 146