From 2b8ebc7099be33f18d4327eac9530f358c8dc3d4 Mon Sep 17 00:00:00 2001
From: Zefa Chen <zefa.chen@rock-chips.com>
Date: Wed, 8 Sep 2021 17:14:12 +0800
Subject: [PATCH] media: i2c: imx334 fix compile error

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia1ec948b69b12181030ff8f41665482c0c45c1fe
---
 drivers/media/i2c/Kconfig  | 11 +++++++++++
 drivers/media/i2c/Makefile |  1 +
 drivers/media/i2c/imx334.c |  6 +++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 54039efb0574..95557614c037 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -967,6 +967,17 @@ config VIDEO_IMX327
 	  To compile this driver as a module, choose M here: the
 	  module will be called imx327.
 
+config VIDEO_IMX334
+	tristate "Sony IMX334 sensor support"
+	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+	depends on MEDIA_CAMERA_SUPPORT
+	help
+	  This is a Video4Linux2 sensor driver for the Sony
+	  IMX334 camera.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called imx334.
+
 config VIDEO_IMX355
 	tristate "Sony IMX355 sensor support"
 	depends on I2C && VIDEO_V4L2
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index 1e7b67f3c6ed..39257046e7bb 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -132,6 +132,7 @@ obj-$(CONFIG_VIDEO_IMX317)	+= imx317.o
 obj-$(CONFIG_VIDEO_IMX319)	+= imx319.o
 obj-$(CONFIG_VIDEO_IMX323)	+= imx323.o
 obj-$(CONFIG_VIDEO_IMX327)	+= imx327.o
+obj-$(CONFIG_VIDEO_IMX334)	+= imx334.o
 obj-$(CONFIG_VIDEO_IMX355)	+= imx355.o
 obj-$(CONFIG_VIDEO_MAX9286)	+= max9286.o
 rdacm20-camera_module-objs	:= rdacm20.o max9271.o
diff --git a/drivers/media/i2c/imx334.c b/drivers/media/i2c/imx334.c
index 664c619e26f2..e2b157ff1089 100644
--- a/drivers/media/i2c/imx334.c
+++ b/drivers/media/i2c/imx334.c
@@ -858,7 +858,7 @@ static int imx334_g_frame_interval(struct v4l2_subdev *sd,
 	return 0;
 }
 
-static int imx334_g_mbus_config(struct v4l2_subdev *sd,
+static int imx334_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
 				struct v4l2_mbus_config *config)
 {
 	struct imx334 *imx334 = to_imx334(sd);
@@ -870,7 +870,7 @@ static int imx334_g_mbus_config(struct v4l2_subdev *sd,
 	      V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
 
 	config->flags = (mode->hdr_mode == NO_HDR) ? val : (val | V4L2_MBUS_CSI2_CHANNEL_1);
-	config->type = V4L2_MBUS_CSI2;
+	config->type = V4L2_MBUS_CSI2_DPHY;
 	return 0;
 }
 
@@ -1474,7 +1474,6 @@ static const struct v4l2_subdev_core_ops imx334_core_ops = {
 static const struct v4l2_subdev_video_ops imx334_video_ops = {
 	.s_stream = imx334_s_stream,
 	.g_frame_interval = imx334_g_frame_interval,
-	.g_mbus_config = imx334_g_mbus_config,
 };
 
 static const struct v4l2_subdev_pad_ops imx334_pad_ops = {
@@ -1484,6 +1483,7 @@ static const struct v4l2_subdev_pad_ops imx334_pad_ops = {
 	.get_fmt = imx334_get_fmt,
 	.set_fmt = imx334_set_fmt,
 	.get_selection = imx334_get_selection,
+	.get_mbus_config = imx334_g_mbus_config,
 };
 
 static const struct v4l2_subdev_ops imx334_subdev_ops = {