staging: media: imx: Merge VIDEO_IMX_CSI into VIDEO_IMX_MEDIA

The VIDEO_IMX_MEDIA Kconfig symbol used to select helpers shared between
independent drivers for different i.MX SoCs, and VIDEO_IMX_MEDIA then
selects drivers specific to the i.MX5 and i.MX6. Now that i.MX7 and
i.MX8 support has moved to drivers/media/ and doesn't depend on
VIDEO_IMX_CSI, there's no need to have separate Kconfig options. Merge
VIDEO_IMX_CSI into VIDEO_IMX_MEDIA.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/staging/media/imx/Kconfig b/drivers/staging/media/imx/Kconfig
index b42af427b88b31b562731c32a0df77dbc75483ba..426310e1ea5b57d3e7d1b28078be1b2270dbc921 100644 (file)
--- a/drivers/staging/media/imx/Kconfig
+++ b/drivers/staging/media/imx/Kconfig
@@ -1,10 +1,11 @@
 # SPDX-License-Identifier: GPL-2.0
 config VIDEO_IMX_MEDIA
-       tristate "i.MX5/6 V4L2 media core driver"
+       tristate "i.MX5/6 V4L2 media drivers"
        depends on ARCH_MXC || COMPILE_TEST
        depends on HAS_DMA
        depends on VIDEO_DEV
        depends on VIDEO_DEV
+       depends on IMX_IPUV3_CORE
        select MEDIA_CONTROLLER
        select V4L2_FWNODE
        select V4L2_MEM2MEM_DEV
@@ -12,16 +13,4 @@ config VIDEO_IMX_MEDIA
        select VIDEO_V4L2_SUBDEV_API
        help
          Say yes here to enable support for video4linux media controller
-         driver for the i.MX5/6 SOC.
-
-if VIDEO_IMX_MEDIA
-menu "i.MX5/6/7/8 Media Sub devices"
-
-config VIDEO_IMX_CSI
-       tristate "i.MX5/6 Camera Sensor Interface driver"
-       depends on IMX_IPUV3_CORE
-       default y
-       help
-         A video4linux camera sensor interface driver for i.MX5/6.
-endmenu
-endif
+         drivers for the i.MX5/6 SOC.

diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile
index b69951deff9ab72c78fc5e87e0da38139742471d..330e0825f506bd98d6a8093a58d3b7d06a94a626 100644 (file)
--- a/drivers/staging/media/imx/Makefile
+++ b/drivers/staging/media/imx/Makefile
@@ -9,7 +9,6 @@ imx6-media-objs := imx-media-dev.o imx-media-internal-sd.o \
 imx6-media-csi-objs := imx-media-csi.o imx-media-fim.o
 
 obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx-media-common.o
-
-obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media.o
-obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media-csi.o
-obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-mipi-csi2.o
+obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media.o
+obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media-csi.o
+obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-mipi-csi2.o