Merge commit 'd4dcc9b2c5a73b73ff72b248f3c91a43d24c8fd7'

* commit 'd4dcc9b2c5a73b73ff72b248f3c91a43d24c8fd7':
  media: i2c: add og01a10 driver
  media: i2c: add og02b10 driver

Change-Id: Idf1a4b4bed3cbaa005a8df090fe61a6bd2a276a7

Conflicts:
	drivers/media/i2c/Kconfig
	drivers/media/i2c/Makefile

drivers/media/i2c/Kconfig

@@ -905,6 +905,17 @@ config VIDEO_NOON010PC30
 	help
 	  This driver supports NOON010PC30 CIF camera from Siliconfile
 
+config VIDEO_OG01A10
+	tristate "OmniVision OG01A10 sensor support"
+	depends on I2C && VIDEO_DEV
+	depends on MEDIA_CAMERA_SUPPORT
+	select MEDIA_CONTROLLER
+	select VIDEO_V4L2_SUBDEV_API
+	select V4L2_FWNODE
+	help
+	  This is a Video4Linux2 sensor driver for the OmniVision
+	  OG01A10 camera.
+
 config VIDEO_OG01A1B
 	tristate "OmniVision OG01A1B sensor support"
 	depends on I2C && VIDEO_DEV
@@ -918,6 +929,17 @@ config VIDEO_OG01A1B
 	  To compile this driver as a module, choose M here: the
 	  module will be called og01a1b.
 
+config VIDEO_OG02B10
+	tristate "OmniVision OG02B10 sensor support"
+	depends on I2C && VIDEO_DEV
+	depends on MEDIA_CAMERA_SUPPORT
+	select MEDIA_CONTROLLER
+	select VIDEO_V4L2_SUBDEV_API
+	select V4L2_FWNODE
+	help
+	  This is a Video4Linux2 sensor driver for the OmniVision
+	  OG02B10 camera.
+
 config VIDEO_OS02G10
 	tristate "OmniVision OS02G10 sensor support"
 	depends on I2C && VIDEO_DEV

drivers/media/i2c/Makefile

@@ -138,7 +138,9 @@ obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o
 obj-$(CONFIG_VIDEO_NVP6158) += nvp6158_drv/
 obj-$(CONFIG_VIDEO_NVP6188) += nvp6188.o
 obj-$(CONFIG_VIDEO_NVP6324) += jaguar1_drv/
+obj-$(CONFIG_VIDEO_OG01A10) += og01a10.o
 obj-$(CONFIG_VIDEO_OG01A1B) += og01a1b.o
+obj-$(CONFIG_VIDEO_OG02B10) += og02b10.o
 obj-$(CONFIG_VIDEO_OS02G10) += os02g10.o
 obj-$(CONFIG_VIDEO_OS02K10) += os02k10.o
 obj-$(CONFIG_VIDEO_OS03B10) += os03b10.o