Commit cd063027 authored by Martin Kepplinger's avatar Martin Kepplinger Committed by Hans Verkuil
Browse files

media: imx: Unstage the imx8mq-mipi-csi2 driver



The imx8mq-mipi-csi2 MIPI CSI-2 receiver driver is used and maintained.
There is no reason to keep it in staging. The accompanying CSI bridge
driver that uses it is in drivers/media/platform/nxp as well.

One TODO is to get rid of csi_state's "state" and "lock" variables.
Especially make sure suspend/resume is working without them. That can
very well be worked on from the new location.

Also add a MAINTAINERS section for the imx8mq-mipi-csi2 mipi receiver
driver.

Signed-off-by: default avatarMartin Kepplinger <martin.kepplinger@puri.sm>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 3180449e
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -13004,17 +13004,21 @@ F: drivers/staging/media/imx/
F:	include/linux/imx-media.h
F:	include/media/imx.h
MEDIA DRIVERS FOR FREESCALE IMX7
MEDIA DRIVERS FOR FREESCALE IMX7/8
M:	Rui Miguel Silva <rmfrfs@gmail.com>
M:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
M:	Martin Kepplinger <martin.kepplinger@puri.sm>
R:	Purism Kernel Team <kernel@puri.sm>
L:	linux-media@vger.kernel.org
S:	Maintained
T:	git git://linuxtv.org/media_tree.git
F:	Documentation/admin-guide/media/imx7.rst
F:	Documentation/devicetree/bindings/media/nxp,imx-mipi-csi2.yaml
F:	Documentation/devicetree/bindings/media/nxp,imx7-csi.yaml
F:	Documentation/devicetree/bindings/media/nxp,imx8mq-mipi-csi2.yaml
F:	drivers/media/platform/nxp/imx-mipi-csis.c
F:	drivers/media/platform/nxp/imx7-media-csi.c
F:	drivers/media/platform/nxp/imx8mq-mipi-csi.c
MEDIA DRIVERS FOR HELENE
M:	Abylay Ospan <aospan@netup.ru>
+11 −0
Original line number Diff line number Diff line
@@ -17,6 +17,17 @@ config VIDEO_IMX7_CSI
	  Driver for the NXP Camera Sensor Interface (CSI) Bridge. This device
	  is found in the i.MX6UL/L, i.MX7 and i.MX8M[MQ] SoCs.

config VIDEO_IMX8MQ_MIPI_CSI2
	tristate "NXP i.MX8MQ MIPI CSI-2 receiver"
	depends on ARCH_MXC || COMPILE_TEST
	depends on VIDEO_DEV
	select MEDIA_CONTROLLER
	select V4L2_FWNODE
	select VIDEO_V4L2_SUBDEV_API
	help
	  Video4Linux2 driver for the MIPI CSI-2 receiver found on the i.MX8MQ
	  SoC.

config VIDEO_IMX_MIPI_CSIS
	tristate "NXP MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models"
	depends on ARCH_MXC || COMPILE_TEST
+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ obj-y += imx-jpeg/
obj-y += imx8-isi/

obj-$(CONFIG_VIDEO_IMX7_CSI) += imx7-media-csi.o
obj-$(CONFIG_VIDEO_IMX8MQ_MIPI_CSI2) += imx8mq-mipi-csi2.o
obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o
obj-$(CONFIG_VIDEO_IMX_PXP) += imx-pxp.o
obj-$(CONFIG_VIDEO_MX2_EMMAPRP) += mx2_emmaprp.o
+0 −10
Original line number Diff line number Diff line
@@ -25,13 +25,3 @@ config VIDEO_IMX_CSI
	  A video4linux camera sensor interface driver for i.MX5/6.
endmenu
endif

config VIDEO_IMX8MQ_MIPI_CSI2
	tristate "NXP i.MX8MQ MIPI CSI-2 receiver"
	depends on ARCH_MXC || COMPILE_TEST
	depends on VIDEO_DEV
	select MEDIA_CONTROLLER
	select V4L2_FWNODE
	select VIDEO_V4L2_SUBDEV_API
	help
	  V4L2 driver for the MIPI CSI-2 receiver found in the i.MX8MQ SoC.
Loading