media: imx: De-stage imx7-mipi-csis

The imx7-mipi-csis driver is in a good state and can be destaged.

Move the imx7-mipi-csis.c driver to the newly created
drivers/media/platform/imx directory and plumb the related
options in Kconfig and in Makefile.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Rui Miguel Silva <rmfrfs@gmail.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/MAINTAINERS b/MAINTAINERS
index 83d27b57016f81eff902b0944d1ec991fbfded17..5bdb8c881b0b02e9f276e5296aa80c08151134e7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11891,8 +11891,8 @@ T:      git git://linuxtv.org/media_tree.git
 F:     Documentation/admin-guide/media/imx7.rst
 F:     Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
 F:     Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml
+F:     drivers/media/platform/imx/imx7-mipi-csis.c
 F:     drivers/staging/media/imx/imx7-media-csi.c
-F:     drivers/staging/media/imx/imx7-mipi-csis.c
 
 MEDIA DRIVERS FOR HELENE
 M:     Abylay Ospan <aospan@netup.ru>

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 9fbdba0fd1e7c7260c620702ae87e9486321017c..d9eeccffea69a1a82aad2583ecfb83b7fa5da0b9 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -171,6 +171,7 @@ source "drivers/media/platform/xilinx/Kconfig"
 source "drivers/media/platform/rcar-vin/Kconfig"
 source "drivers/media/platform/atmel/Kconfig"
 source "drivers/media/platform/sunxi/Kconfig"
+source "drivers/media/platform/imx/Kconfig"
 
 config VIDEO_TI_CAL
        tristate "TI CAL (Camera Adaptation Layer) driver"

diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 28eb4aadbf45ffdaf0384d6af62c73079dd01478..a9466c8546108f164bbd53914e30aba53db15737 100644 (file)
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -20,6 +20,7 @@ obj-y += ti-vpe/
 obj-$(CONFIG_VIDEO_MX2_EMMAPRP)                += mx2_emmaprp.o
 obj-$(CONFIG_VIDEO_CODA)               += coda/
 
+obj-$(CONFIG_VIDEO_IMX)                        += imx/
 obj-$(CONFIG_VIDEO_IMX_PXP)            += imx-pxp.o
 obj-$(CONFIG_VIDEO_IMX8_JPEG)          += imx-jpeg/
 

diff --git a/drivers/media/platform/imx/Kconfig b/drivers/media/platform/imx/Kconfig
new file mode 100644 (file)
index 0000000..6838635
--- /dev/null
+++ b/drivers/media/platform/imx/Kconfig
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+menuconfig VIDEO_IMX
+       bool "V4L2 capture drivers for NXP i.MX devices"
+       depends on ARCH_MXC || COMPILE_TEST
+       depends on VIDEO_DEV && VIDEO_V4L2
+       help
+         Say yes here to enable support for capture drivers on i.MX SoCs.
+         Support for the single SoC features are selectable in the sub-menu
+         options.
+
+if VIDEO_IMX
+
+config VIDEO_IMX_MIPI_CSIS
+       tristate "MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models"
+       select MEDIA_CONTROLLER
+       select V4L2_FWNODE
+       select VIDEO_V4L2_SUBDEV_API
+       default n
+       help
+         Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver
+         v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs.
+
+endif # VIDEO_IMX

diff --git a/drivers/media/platform/imx/Makefile b/drivers/media/platform/imx/Makefile
new file mode 100644 (file)
index 0000000..ee27223
--- /dev/null
+++ b/drivers/media/platform/imx/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx7-mipi-csis.o

diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/media/platform/imx/imx7-mipi-csis.c
similarity index 100%
rename from drivers/staging/media/imx/imx7-mipi-csis.c
rename to drivers/media/platform/imx/imx7-mipi-csis.c

diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile
index 19c2fc54d42430a98f4030c24768e69874fb70fc..d82be898145be7b35c25521263c5768c7341a7b9 100644 (file)
--- a/drivers/staging/media/imx/Makefile
+++ b/drivers/staging/media/imx/Makefile
@@ -15,5 +15,4 @@ obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media-csi.o
 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_VIDEO_IMX7_CSI) += imx8mq-mipi-csi2.o