From 6687f43d3413758cce4249299da84b322e6bb32e Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Tue, 26 Jul 2011 12:01:01 -0300
Subject: [PATCH] --- yaml --- r: 273627 b: refs/heads/master c:
 93ac81dcbec35455b9a8181bf3ddd2a225588434 h: refs/heads/master i:   273625:
 365c5a7210b82ac221afbe5b44a97643821a37c4   273623:
 22e69d1fce12da62b0bb21c3570429a58069e530 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/media/video/ov5642.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index eac4f397eb1b..7f0d9e659ed5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d463003b56776576b071c4fcfdf391f4bb32d21c
+refs/heads/master: 93ac81dcbec35455b9a8181bf3ddd2a225588434
diff --git a/trunk/drivers/media/video/ov5642.c b/trunk/drivers/media/video/ov5642.c
index 349a4ad3ccc1..7eaeb25d5627 100644
--- a/trunk/drivers/media/video/ov5642.c
+++ b/trunk/drivers/media/video/ov5642.c
@@ -855,6 +855,17 @@ static int ov5642_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
 	return 0;
 }
 
+static int ov5642_g_mbus_config(struct v4l2_subdev *sd,
+				struct v4l2_mbus_config *cfg)
+{
+	cfg->type = V4L2_MBUS_CSI2;
+	cfg->flags = V4L2_MBUS_CSI2_2_LANE |
+		V4L2_MBUS_CSI2_CHANNEL_0 |
+		V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
+
+	return 0;
+}
+
 static struct v4l2_subdev_video_ops ov5642_subdev_video_ops = {
 	.s_mbus_fmt	= ov5642_s_fmt,
 	.g_mbus_fmt	= ov5642_g_fmt,
@@ -862,6 +873,7 @@ static struct v4l2_subdev_video_ops ov5642_subdev_video_ops = {
 	.enum_mbus_fmt	= ov5642_enum_fmt,
 	.g_crop		= ov5642_g_crop,
 	.cropcap	= ov5642_cropcap,
+	.g_mbus_config	= ov5642_g_mbus_config,
 };
 
 static struct v4l2_subdev_core_ops ov5642_subdev_core_ops = {