media: staging: media: imx: Kconfig: support VIDEO_IMX7_CSI for imx8m

As described in NXPs' linux tree, the imx8m SoC includes the same
CSI bridge hardware that is part of imx7d. We should be able to
use the "fsl,imx7-csi" driver for imx8m directly.

Since ipuv3 is not relevant for imx8m, move that dependency to
VIDEO_IMX_CSI. That makes VIDEO_IMX7_CSI available to support imx8m
too.

Signed-off-by: Martin Kepplinger <martin.kepplinger@puri.sm>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/imx/Kconfig b/drivers/staging/media/imx/Kconfig
index f555aac8a9d5257e31075208677808f829c27836..15322dc3124a0c92987f2487d9a236b7fbf7f14b 100644 (file)
--- a/drivers/staging/media/imx/Kconfig
+++ b/drivers/staging/media/imx/Kconfig
@@ -2,7 +2,7 @@
 config VIDEO_IMX_MEDIA
        tristate "i.MX5/6 V4L2 media core driver"
        depends on ARCH_MXC || COMPILE_TEST
-       depends on VIDEO_V4L2 && IMX_IPUV3_CORE
+       depends on VIDEO_V4L2
        select MEDIA_CONTROLLER
        select VIDEO_V4L2_SUBDEV_API
        depends on HAS_DMA
@@ -14,21 +14,22 @@ config VIDEO_IMX_MEDIA
          driver for the i.MX5/6 SOC.
 
 if VIDEO_IMX_MEDIA
-menu "i.MX5/6/7 Media Sub devices"
+menu "i.MX5/6/7/8 Media Sub devices"
 
 config VIDEO_IMX_CSI
        tristate "i.MX5/6 Camera Sensor Interface driver"
        depends on VIDEO_IMX_MEDIA && VIDEO_DEV && I2C
+       depends on IMX_IPUV3_CORE
        default y
        help
          A video4linux camera sensor interface driver for i.MX5/6.
 
 config VIDEO_IMX7_CSI
-       tristate "i.MX6UL/L / i.MX7 Camera Sensor Interface driver"
+       tristate "i.MX6UL/L / i.MX7 / i.MX8M Camera Sensor Interface driver"
        depends on VIDEO_IMX_MEDIA && VIDEO_DEV && I2C
        default y
        help
          Enable support for video4linux camera sensor interface driver for
-         i.MX6UL/L or i.MX7.
+         i.MX6UL/L, i.MX7 or i.MX8M.
 endmenu
 endif

diff --git a/drivers/staging/media/imx/Makefile b/drivers/staging/media/imx/Makefile
index 9bd9e873ba7c80bf8b6f7c200330bfba6e4461d5..69cc5da04a2edeb069d9e45b7efc1295ec916c8d 100644 (file)
--- a/drivers/staging/media/imx/Makefile
+++ b/drivers/staging/media/imx/Makefile
@@ -8,9 +8,9 @@ imx-media-common-objs := imx-media-capture.o imx-media-dev-common.o \
 
 imx6-media-csi-objs := imx-media-csi.o imx-media-fim.o
 
-obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media.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