Commit 85fa189b authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Hans Verkuil
Browse files

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: default avatarJacopo Mondi <jacopo@jmondi.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarRui Miguel Silva <rmfrfs@gmail.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 2b891d39

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -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>
































drivers/media/platform/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -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"
































drivers/media/platform/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -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/










































drivers/media/platform/imx/Kconfig
0 → 100644



+24
−0






























Original line number
Diff line number
Diff line









# 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
























drivers/media/platform/imx/Makefile
0 → 100644



+1
−0






























Original line number
Diff line number
Diff line









obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx7-mipi-csis.o