iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: media: imx: Merge VIDEO_IMX_CSI into VIDEO_IMX_MEDIA

Browse Source 
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>
This commit is contained in:
Laurent Pinchart 2023-04-24 12:48:32 +03:00 committed by Mauro Carvalho Chehab
parent 093d69ad55
commit 483fe86248
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/staging/media/imx/Kconfig
View File

@ -1,10 +1,11 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
config VIDEO_IMX_MEDIA 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 ARCH_MXC || COMPILE_TEST
depends on HAS_DMA depends on HAS_DMA
depends on VIDEO_DEV depends on VIDEO_DEV
depends on VIDEO_DEV depends on VIDEO_DEV
depends on IMX_IPUV3_CORE
select MEDIA_CONTROLLER select MEDIA_CONTROLLER
select V4L2_FWNODE select V4L2_FWNODE
select V4L2_MEM2MEM_DEV select V4L2_MEM2MEM_DEV
@ -12,16 +13,4 @@ config VIDEO_IMX_MEDIA
select VIDEO_V4L2_SUBDEV_API select VIDEO_V4L2_SUBDEV_API
help help
Say yes here to enable support for video4linux media controller Say yes here to enable support for video4linux media controller
driver for the i.MX5/6 SOC. drivers 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

7
drivers/staging/media/imx/Makefile
View File

@ -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 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_MEDIA) += imx-media-common.o
obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media.o
obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media.o obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-media-csi.o
obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-media-csi.o obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx6-mipi-csi2.o
obj-$(CONFIG_VIDEO_IMX_CSI) += imx6-mipi-csi2.o