Merge remote-tracking branch 'origin/capture/csi2-samsung' into capture/next

* origin/capture/csi2-samsung:
  staging: media: imx: add V4L2 subdev driver for MIPI CSI2 of Samsung
  media: mipi csi: accommodate the driver to framework's change
  media: mipi csi: add samsung's mipi csi support

drivers/staging/media/imx/Kconfig

@@ -55,5 +55,13 @@ config IMX8_MIPI_CSI2
 	  Enable support for video4linux camera sensor interface driver for
 	  i.MX8QM/QXP platform.
 
+config IMX8_MIPI_CSI2_SAM
+	tristate "IMX8 MIPI CSI2 SAMSUNG Controller"
+	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
+	default y
+	help
+	  Enable support for video4linux MIPI CSI2 Samsung driver for
+	  i.MX8MN platform.
+
 endmenu
 endif  #VIDEO_IMX_CAPTURE

drivers/staging/media/imx/Makefile

@@ -17,3 +17,4 @@ obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-mipi-csi2.o
 obj-$(CONFIG_VIDEO_IMX7_CSI) += imx7-media-csi.o
 obj-$(CONFIG_VIDEO_IMX7_CSI) += imx7-mipi-csis.o
 obj-$(CONFIG_IMX8_MIPI_CSI2) 	  += imx8-mipi-csi2.o
+obj-$(CONFIG_IMX8_MIPI_CSI2_SAM)  += imx8-mipi-csi2-sam.o