Merge commit '10f1fb342152a988414a08332fb2b12c0c369d60'

* commit '10f1fb342152a988414a08332fb2b12c0c369d60':
  media: i2c: Add max92756 driver

Change-Id: I3688dff8daabc111d209a1444a92b3070c5d028c

Conflicts:
	drivers/media/i2c/Makefile

drivers/media/i2c/Kconfig

@@ -2502,6 +2502,19 @@ config VIDEO_MAX96722
 	  To compile this driver as a module, choose M here: the
 	  module will be called max96722.
 
+config VIDEO_MAX96756
+	tristate "Maxim MAX96756 GMSL1/2 CSI display deserializer support"
+	depends on I2C && VIDEO_DEV
+	depends on MEDIA_CAMERA_SUPPORT
+	select MEDIA_CONTROLLER
+	select VIDEO_V4L2_SUBDEV_API
+	select V4L2_FWNODE
+	help
+	  This driver supports the Maxim MAX96756 GMSL1/2 CSI display deserializer.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called max96756.
+
 config VIDEO_ML86V7667
 	tristate "OKI ML86V7667 video decoder"
 	depends on VIDEO_DEV && I2C

drivers/media/i2c/Makefile

@@ -118,6 +118,7 @@ obj-$(CONFIG_VIDEO_MAX9286) += max9286.o
 obj-$(CONFIG_VIDEO_MAX96712) += max96712.o
 obj-$(CONFIG_VIDEO_MAX96714) += max96714.o
 obj-$(CONFIG_VIDEO_MAX96722) += max96722.o
+obj-$(CONFIG_VIDEO_MAX96756) += max96756.o
 obj-$(CONFIG_VIDEO_ML86V7667) += ml86v7667.o
 obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o
 obj-$(CONFIG_VIDEO_MT9M001) += mt9m001.o

drivers/media/i2c/max96756.h

@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * max96756 driver
+ *
+ */
+#ifndef _MAX96756_H_
+#define _MAX96756_H_
+
+int max96756_sensor_mod_init(void);
+
+#endif