diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 4eaa4e15c40a..d577f1f07d88 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -725,6 +725,17 @@ config VIDEO_APTINA_PLL
 config VIDEO_SMIAPP_PLL
 	tristate
 
+config VIDEO_AR0230
+	tristate "Aptina AR0230 sensor support"
+	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+	depends on MEDIA_CAMERA_SUPPORT
+	select V4L2_FWNODE
+	help
+	  Support for the Aptina AR0230 sensor.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called ar0230.
+
 config VIDEO_GC02M2
 	tristate "GalaxyCore GC02M2 sensor support"
 	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index f9205110c885..e78a183911ce 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -111,6 +111,7 @@ obj-$(CONFIG_VIDEO_I2C)		+= video-i2c.o
 obj-$(CONFIG_VIDEO_ML86V7667)	+= ml86v7667.o
 obj-$(CONFIG_VIDEO_OV2659)	+= ov2659.o
 obj-$(CONFIG_VIDEO_TC358743)	+= tc358743.o
+obj-$(CONFIG_VIDEO_AR0230)	+= ar0230.o
 obj-$(CONFIG_VIDEO_GC02M2)	+= gc02m2.o
 obj-$(CONFIG_VIDEO_GC2053)	+= gc2053.o
 obj-$(CONFIG_VIDEO_GC2093)	+= gc2093.o
diff --git a/drivers/media/i2c/ar0230.c b/drivers/media/i2c/ar0230.c
index 654ca7cbd52c..613ab85bab99 100644
--- a/drivers/media/i2c/ar0230.c
+++ b/drivers/media/i2c/ar0230.c
@@ -1292,7 +1292,7 @@ static int ar0230_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 }
 #endif
 
-static int ar0230_g_mbus_config(struct v4l2_subdev *sd,
+static int ar0230_g_mbus_config(struct v4l2_subdev *sd, unsigned int pad_id,
 				struct v4l2_mbus_config *config)
 {
 	config->type = V4L2_MBUS_PARALLEL;
@@ -1339,7 +1339,6 @@ static const struct v4l2_subdev_core_ops ar0230_core_ops = {
 
 static const struct v4l2_subdev_video_ops ar0230_video_ops = {
 	.s_stream = ar0230_s_stream,
-	.g_mbus_config = ar0230_g_mbus_config,
 	.g_frame_interval = ar0230_g_frame_interval,
 };
 
@@ -1349,6 +1348,7 @@ static const struct v4l2_subdev_pad_ops ar0230_pad_ops = {
 	.enum_frame_interval = ar0230_enum_frame_interval,
 	.get_fmt = ar0230_get_fmt,
 	.set_fmt = ar0230_set_fmt,
+	.get_mbus_config = ar0230_g_mbus_config,
 };
 
 static const struct v4l2_subdev_ops ar0230_subdev_ops = {