summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuennadi Liakhovetski2011-07-26 17:25:07 +0200
committerMauro Carvalho Chehab2011-11-03 21:27:24 +0100
commit00cf08f5dcef58878633746a3b10389cb6ce5e4e (patch)
tree82337cfc04d43864ee38bb353cb9cf5a00361fa7
parent[media] V4L: ov772x: rename macros to not pollute the global namespace (diff)
downloadkernel-qcow2-linux-00cf08f5dcef58878633746a3b10389cb6ce5e4e.tar.gz
kernel-qcow2-linux-00cf08f5dcef58878633746a3b10389cb6ce5e4e.tar.xz
kernel-qcow2-linux-00cf08f5dcef58878633746a3b10389cb6ce5e4e.zip
[media] V4L: ov772x: support the new mbus-config subdev ops
Extend the driver to also support [gs]_mbus_config() subdevice video operations. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/ov772x.c24
1 files changed, 21 insertions, 3 deletions
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c
index 458265b51e3c..b70ffba58494 100644
--- a/drivers/media/video/ov772x.c
+++ b/drivers/media/video/ov772x.c
@@ -21,11 +21,12 @@
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/videodev2.h>
-#include <media/v4l2-chip-ident.h>
-#include <media/v4l2-subdev.h>
+
+#include <media/ov772x.h>
#include <media/soc_camera.h>
#include <media/soc_mediabus.h>
-#include <media/ov772x.h>
+#include <media/v4l2-chip-ident.h>
+#include <media/v4l2-subdev.h>
/*
* register offset
@@ -1095,6 +1096,22 @@ static int ov772x_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
return 0;
}
+static int ov772x_g_mbus_config(struct v4l2_subdev *sd,
+ struct v4l2_mbus_config *cfg)
+{
+ struct i2c_client *client = v4l2_get_subdevdata(sd);
+ struct soc_camera_device *icd = client->dev.platform_data;
+ struct soc_camera_link *icl = to_soc_camera_link(icd);
+
+ cfg->flags = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
+ V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
+ V4L2_MBUS_DATA_ACTIVE_HIGH;
+ cfg->type = V4L2_MBUS_PARALLEL;
+ cfg->flags = soc_camera_apply_board_flags(icl, cfg);
+
+ return 0;
+}
+
static struct v4l2_subdev_video_ops ov772x_subdev_video_ops = {
.s_stream = ov772x_s_stream,
.g_mbus_fmt = ov772x_g_fmt,
@@ -1103,6 +1120,7 @@ static struct v4l2_subdev_video_ops ov772x_subdev_video_ops = {
.cropcap = ov772x_cropcap,
.g_crop = ov772x_g_crop,
.enum_mbus_fmt = ov772x_enum_fmt,
+ .g_mbus_config = ov772x_g_mbus_config,
};
static struct v4l2_subdev_ops ov772x_subdev_ops = {