From f3053daf2e3f7c2d169b7ca9e4cec2af509b9c66 Mon Sep 17 00:00:00 2001
From: Zefa Chen <zefa.chen@rock-chips.com>
Date: Wed, 8 Sep 2021 18:05:24 +0800
Subject: [PATCH] media: i2c: os05a20 fix compile error

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

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 8544d4264f32..faba5dd515db 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -1053,6 +1053,15 @@ config VIDEO_OS04A10
 	  This is a Video4Linux2 sensor driver for the OmniVision
 	  OS04A10 camera.
 
+config VIDEO_OS05A20
+	tristate "OmniVision OS05A20 sensor support"
+	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+	depends on MEDIA_CAMERA_SUPPORT
+	select V4L2_FWNODE
+	help
+	  This is a Video4Linux2 sensor driver for the OmniVision
+	  OS05A20 camera.
+
 config VIDEO_OV2640
 	tristate "OmniVision OV2640 sensor support"
 	depends on VIDEO_V4L2 && I2C
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index 304ecb9f11ec..38d5532b025a 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -66,6 +66,7 @@ obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o
 obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
 obj-$(CONFIG_VIDEO_OS02G10) += os02g10.o
 obj-$(CONFIG_VIDEO_OS04A10) += os04a10.o
+obj-$(CONFIG_VIDEO_OS05A20) += os05a20.o
 obj-$(CONFIG_VIDEO_OV2640) += ov2640.o
 obj-$(CONFIG_VIDEO_OV2680) += ov2680.o
 obj-$(CONFIG_VIDEO_OV2685) += ov2685.o
diff --git a/drivers/media/i2c/os05a20.c b/drivers/media/i2c/os05a20.c
index b8addf711c15..a8d63b6d53a7 100644
--- a/drivers/media/i2c/os05a20.c
+++ b/drivers/media/i2c/os05a20.c
@@ -935,7 +935,7 @@ static int os05a20_g_frame_interval(struct v4l2_subdev *sd,
 	return 0;
 }
 
-static int os05a20_g_mbus_config(struct v4l2_subdev *sd,
+static int os05a20_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
 				struct v4l2_mbus_config *config)
 {
 	struct os05a20 *os05a20 = to_os05a20(sd);
@@ -952,7 +952,7 @@ static int os05a20_g_mbus_config(struct v4l2_subdev *sd,
 		V4L2_MBUS_CSI2_CONTINUOUS_CLOCK |
 		V4L2_MBUS_CSI2_CHANNEL_1;
 
-	config->type = V4L2_MBUS_CSI2;
+	config->type = V4L2_MBUS_CSI2_DPHY;
 	config->flags = val;
 
 	return 0;
@@ -1526,7 +1526,6 @@ static const struct v4l2_subdev_core_ops os05a20_core_ops = {
 static const struct v4l2_subdev_video_ops os05a20_video_ops = {
 	.s_stream = os05a20_s_stream,
 	.g_frame_interval = os05a20_g_frame_interval,
-	.g_mbus_config = os05a20_g_mbus_config,
 };
 
 static const struct v4l2_subdev_pad_ops os05a20_pad_ops = {
@@ -1535,6 +1534,7 @@ static const struct v4l2_subdev_pad_ops os05a20_pad_ops = {
 	.enum_frame_interval = os05a20_enum_frame_interval,
 	.get_fmt = os05a20_get_fmt,
 	.set_fmt = os05a20_set_fmt,
+	.get_mbus_config = os05a20_g_mbus_config,
 };
 
 static const struct v4l2_subdev_ops os05a20_subdev_ops = {