[PATCH 6/7][SRU][OEM-5.10] UBUNTU: SAUCE: integrate IPU6 builds

[You-Sheng Yang]

From: Wang Yating <yating.wang at intel.com>

BugLink: https://bugs.launchpad.net/bugs/1921345

Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
 drivers/media/i2c/Kconfig  | 33 +++++++++++++++++++++++++++++++++
 drivers/media/i2c/Makefile |  4 ++++
 drivers/usb/Kconfig        |  2 ++
 drivers/usb/Makefile       |  2 ++
 4 files changed, 41 insertions(+)

diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
index 878f66ef2719..c8388c55a572 100644
--- a/drivers/media/i2c/Kconfig
+++ b/drivers/media/i2c/Kconfig
@@ -1245,6 +1245,39 @@ config VIDEO_S5C73M3
 	  This is a V4L2 sensor driver for Samsung S5C73M3
 	  8 Mpixel camera.
 
+config PMIC_DSC1
+	tristate "PMIC-CRDG DSC1 gpio control"
+	help
+	  This is a PMIC-CRDG DSC1 driver for power control. This driver
+	  is used to control power for sensor conneted to GPIO, such
+	  as HM11B1, OV01A1S.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called pmic_dsc1.
+
+config VIDEO_OV01A1S
+	tristate "OmniVision OV01A1S sensor support"
+	depends on VIDEO_V4L2 && I2C
+	help
+	  This is a Video4Linux2 sensor driver for the OmniVision
+	  OV01A1S camera.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called ov01a1s.
+
+config VIDEO_HM11B1
+       tristate "Himax HM11B1 sensor support"
+       depends on VIDEO_V4L2 && I2C
+       select MEDIA_CONTROLLER
+       select VIDEO_V4L2_SUBDEV_API
+       select V4L2_FWNODE
+       help
+         This is a Video4Linux2 sensor driver for the Himax
+         HM11B1 camera.
+
+         To compile this driver as a module, choose M here: the
+         module will be called hm11b1.
+
 endmenu
 
 menu "Lens drivers"
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index f0a77473979d..24be91749691 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -125,3 +125,7 @@ obj-$(CONFIG_VIDEO_RDACM20)	+= rdacm20-camera_module.o
 obj-$(CONFIG_VIDEO_ST_MIPID02) += st-mipid02.o
 
 obj-$(CONFIG_SDR_MAX2175) += max2175.o
+
+obj-$(CONFIG_VIDEO_OV01A1S) += ov01a1s.o
+obj-$(CONFIG_VIDEO_HM11B1)  += hm11b1.o
+obj-$(CONFIG_PMIC_DSC1)     += pmic_dsc1.o
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 26475b409b53..b20e92952ed2 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -174,4 +174,6 @@ source "drivers/usb/typec/Kconfig"
 
 source "drivers/usb/roles/Kconfig"
 
+source "drivers/usb/intel_ulpss/Kconfig"
+
 endif # USB_SUPPORT
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 1c1c1d659394..733a1e9973b1 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -66,3 +66,5 @@ obj-$(CONFIG_USBIP_CORE)	+= usbip/
 obj-$(CONFIG_TYPEC)		+= typec/
 
 obj-$(CONFIG_USB_ROLE_SWITCH)	+= roles/
+
+obj-$(CONFIG_INTEL_LPSS_USB)	+= intel_ulpss/
-- 
2.30.2