aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ov9640.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2011-07-28 13:42:26 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 16:28:06 -0400
commit88e816a2d5d53b791d0ecc314bf2369d826be1d2 (patch)
tree0d1ef5eb3897f515a7f3b11f3388c3d97f468e08 /drivers/media/video/ov9640.c
parent3e1b6b72b9a33a12efbe29f046335098c53dbb58 (diff)
[media] V4L: ov9640: remove superfluous soc-camera client operations
Now that all soc-camera hosts have been ported to use V4L2 subdevice mediabus-config operations and soc-camera client bus-parameter operations have been made optional, they can 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/video/ov9640.c')
-rw-r--r--drivers/media/video/ov9640.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/drivers/media/video/ov9640.c b/drivers/media/video/ov9640.c
index 4156c9f6375b..352a8fb68b84 100644
--- a/drivers/media/video/ov9640.c
+++ b/drivers/media/video/ov9640.c
@@ -286,29 +286,6 @@ static int ov9640_s_stream(struct v4l2_subdev *sd, int enable)
286 return 0; 286 return 0;
287} 287}
288 288
289/* Alter bus settings on camera side */
290static int ov9640_set_bus_param(struct soc_camera_device *icd,
291 unsigned long flags)
292{
293 return 0;
294}
295
296/* Request bus settings on camera side */
297static unsigned long ov9640_query_bus_param(struct soc_camera_device *icd)
298{
299 struct soc_camera_link *icl = to_soc_camera_link(icd);
300
301 /*
302 * REVISIT: the camera probably can do 10 bit transfers, but I don't
303 * have those pins connected on my hardware.
304 */
305 unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
306 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
307 SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8;
308
309 return soc_camera_apply_sensor_flags(icl, flags);
310}
311
312/* Get status of additional camera capabilities */ 289/* Get status of additional camera capabilities */
313static int ov9640_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 290static int ov9640_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
314{ 291{
@@ -648,8 +625,6 @@ static int ov9640_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
648 return 0; 625 return 0;
649} 626}
650 627
651
652
653static int ov9640_video_probe(struct soc_camera_device *icd, 628static int ov9640_video_probe(struct soc_camera_device *icd,
654 struct i2c_client *client) 629 struct i2c_client *client)
655{ 630{
@@ -707,8 +682,6 @@ err:
707} 682}
708 683
709static struct soc_camera_ops ov9640_ops = { 684static struct soc_camera_ops ov9640_ops = {
710 .set_bus_param = ov9640_set_bus_param,
711 .query_bus_param = ov9640_query_bus_param,
712 .controls = ov9640_controls, 685 .controls = ov9640_controls,
713 .num_controls = ARRAY_SIZE(ov9640_controls), 686 .num_controls = ARRAY_SIZE(ov9640_controls),
714}; 687};
@@ -724,6 +697,7 @@ static struct v4l2_subdev_core_ops ov9640_core_ops = {
724 697
725}; 698};
726 699
700/* Request bus settings on camera side */
727static int ov9640_g_mbus_config(struct v4l2_subdev *sd, 701static int ov9640_g_mbus_config(struct v4l2_subdev *sd,
728 struct v4l2_mbus_config *cfg) 702 struct v4l2_mbus_config *cfg)
729{ 703{