From 3b57a9bc5f479e6a44ecdab93713abb95d4495ce Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Wed, 27 Jul 2011 10:06:09 -0300
Subject: [PATCH] --- yaml --- r: 273639 b: refs/heads/master c:
 84c760a5dec0edab857cc02c29ef334722520310 h: refs/heads/master i:   273637:
 ec73128bda44ad62a29333123c800103c768f086   273635:
 34efac62af26ed3cc187813362196e97e62ee739   273631:
 d1b82fd503be141e9e2364ab269b3c8f30a8e5a1 v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/media/video/soc_camera_platform.c | 12 ++++++++++++
 trunk/include/media/soc_camera_platform.h       |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 77b06803e39f..875abe0d750c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d3263f9ad74d60cdcc2beaa365913be85769696
+refs/heads/master: 84c760a5dec0edab857cc02c29ef334722520310
diff --git a/trunk/drivers/media/video/soc_camera_platform.c b/trunk/drivers/media/video/soc_camera_platform.c
index 8069cd6bc5e8..7045e458a66e 100644
--- a/trunk/drivers/media/video/soc_camera_platform.c
+++ b/trunk/drivers/media/video/soc_camera_platform.c
@@ -115,6 +115,17 @@ static int soc_camera_platform_cropcap(struct v4l2_subdev *sd,
 	return 0;
 }
 
+static int soc_camera_platform_g_mbus_config(struct v4l2_subdev *sd,
+					     struct v4l2_mbus_config *cfg)
+{
+	struct soc_camera_platform_info *p = v4l2_get_subdevdata(sd);
+
+	cfg->flags = p->mbus_param;
+	cfg->type = p->mbus_type;
+
+	return 0;
+}
+
 static struct v4l2_subdev_video_ops platform_subdev_video_ops = {
 	.s_stream	= soc_camera_platform_s_stream,
 	.enum_mbus_fmt	= soc_camera_platform_enum_fmt,
@@ -123,6 +134,7 @@ static struct v4l2_subdev_video_ops platform_subdev_video_ops = {
 	.try_mbus_fmt	= soc_camera_platform_fill_fmt,
 	.g_mbus_fmt	= soc_camera_platform_fill_fmt,
 	.s_mbus_fmt	= soc_camera_platform_fill_fmt,
+	.g_mbus_config	= soc_camera_platform_g_mbus_config,
 };
 
 static struct v4l2_subdev_ops platform_subdev_ops = {
diff --git a/trunk/include/media/soc_camera_platform.h b/trunk/include/media/soc_camera_platform.h
index 74f0fa15ca47..a15f92be8aba 100644
--- a/trunk/include/media/soc_camera_platform.h
+++ b/trunk/include/media/soc_camera_platform.h
@@ -13,6 +13,7 @@
 
 #include <linux/videodev2.h>
 #include <media/soc_camera.h>
+#include <media/v4l2-mediabus.h>
 
 struct device;
 
@@ -21,6 +22,8 @@ struct soc_camera_platform_info {
 	unsigned long format_depth;
 	struct v4l2_mbus_framefmt format;
 	unsigned long bus_param;
+	unsigned long mbus_param;
+	enum v4l2_mbus_type mbus_type;
 	struct soc_camera_device *icd;
 	int (*set_capture)(struct soc_camera_platform_info *info, int enable);
 };