media: platform: place NXP drivers on a separate dir (46fb9995) · Commits · jan.koester / Linux

MAINTAINERS

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -11841,7 +11841,7 @@ M: Philipp Zabel <p.zabel@pengutronix.de>
	L: linux-media@vger.kernel.org		L: linux-media@vger.kernel.org
	S: Maintained		S: Maintained
	T: git git://linuxtv.org/media_tree.git		T: git git://linuxtv.org/media_tree.git
	F: drivers/media/platform/imx-pxp.[ch]		F: drivers/media/platform/nxp/imx-pxp.[ch]

	MEDIA DRIVERS FOR ASCOT2E		MEDIA DRIVERS FOR ASCOT2E
	M: Sergey Kozlov <serjk@netup.ru>		M: Sergey Kozlov <serjk@netup.ru>

drivers/media/platform/Kconfig

+2 −38

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,8 @@ config V4L_MEM2MEM_DRIVERS
	to capture and output drivers, which use memory buffers for just		to capture and output drivers, which use memory buffers for just
	one of those.		one of those.

			source "drivers/media/platform/nxp/Kconfig"

	# V4L platform drivers		# V4L platform drivers

	source "drivers/media/platform/marvell-ccic/Kconfig"		source "drivers/media/platform/marvell-ccic/Kconfig"
	@@ -61,19 +63,6 @@ config VIDEO_SH_VOU
	help		help
	Support for the Video Output Unit (VOU) on SuperH SoCs.		Support for the Video Output Unit (VOU) on SuperH SoCs.

	config VIDEO_VIU
	tristate "Freescale VIU Video Driver"
	depends on V4L_PLATFORM_DRIVERS
	depends on VIDEO_V4L2 && (PPC_MPC512x \|\| COMPILE_TEST) && I2C
	select VIDEOBUF_DMA_CONTIG
	default y
	help
	Support for Freescale VIU video driver. This device captures
	video data, or overlays video on DIU frame buffer.

	Say Y here if you want to enable VIU device on MPC5121e Rev2+.
	In doubt, say N.

	config VIDEO_MUX		config VIDEO_MUX
	tristate "Video Multiplexer"		tristate "Video Multiplexer"
	depends on V4L_PLATFORM_DRIVERS		depends on V4L_PLATFORM_DRIVERS
	@@ -193,7 +182,6 @@ source "drivers/media/platform/xilinx/Kconfig"
	source "drivers/media/platform/rcar-vin/Kconfig"		source "drivers/media/platform/rcar-vin/Kconfig"
	source "drivers/media/platform/atmel/Kconfig"		source "drivers/media/platform/atmel/Kconfig"
	source "drivers/media/platform/sunxi/Kconfig"		source "drivers/media/platform/sunxi/Kconfig"
	source "drivers/media/platform/imx/Kconfig"

	config VIDEO_TI_CAL		config VIDEO_TI_CAL
	tristate "TI CAL (Camera Adaptation Layer) driver"		tristate "TI CAL (Camera Adaptation Layer) driver"
	@@ -273,18 +261,6 @@ config VIDEO_CODA
	config VIDEO_IMX_VDOA		config VIDEO_IMX_VDOA
	def_tristate VIDEO_CODA if SOC_IMX6Q \|\| COMPILE_TEST		def_tristate VIDEO_CODA if SOC_IMX6Q \|\| COMPILE_TEST

	config VIDEO_IMX_PXP
	tristate "i.MX Pixel Pipeline (PXP)"
	depends on V4L_MEM2MEM_DRIVERS
	depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC \|\| COMPILE_TEST)
	select VIDEOBUF2_DMA_CONTIG
	select V4L2_MEM2MEM_DEV
	help
	The i.MX Pixel Pipeline is a memory-to-memory engine for scaling,
	color space conversion, and rotation.

	source "drivers/media/platform/imx-jpeg/Kconfig"

	config VIDEO_MEDIATEK_JPEG		config VIDEO_MEDIATEK_JPEG
	tristate "Mediatek JPEG Codec driver"		tristate "Mediatek JPEG Codec driver"
	depends on V4L_MEM2MEM_DRIVERS		depends on V4L_MEM2MEM_DRIVERS
	@@ -423,18 +399,6 @@ config VIDEO_SAMSUNG_S5P_MFC
	help		help
	MFC 5.1 and 6.x driver for V4L2		MFC 5.1 and 6.x driver for V4L2

	config VIDEO_MX2_EMMAPRP
	tristate "MX2 eMMa-PrP support"
	depends on V4L_MEM2MEM_DRIVERS
	depends on VIDEO_DEV && VIDEO_V4L2
	depends on SOC_IMX27 \|\| COMPILE_TEST
	select VIDEOBUF2_DMA_CONTIG
	select V4L2_MEM2MEM_DEV
	help
	MX2X chips have a PrP that can be used to process buffers from
	memory to memory. Operations include resizing and format
	conversion.

	config VIDEO_SAMSUNG_EXYNOS_GSC		config VIDEO_SAMSUNG_EXYNOS_GSC
	tristate "Samsung Exynos G-Scaler driver"		tristate "Samsung Exynos G-Scaler driver"
	depends on V4L_MEM2MEM_DRIVERS		depends on V4L_MEM2MEM_DRIVERS

drivers/media/platform/Makefile

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -15,14 +15,13 @@ obj-y += coda/
	obj-y += davinci/		obj-y += davinci/
	obj-y += exynos-gsc/		obj-y += exynos-gsc/
	obj-y += exynos4-is/		obj-y += exynos4-is/
	obj-y += imx/
	obj-y += imx-jpeg/
	obj-y += marvell-ccic/		obj-y += marvell-ccic/
	obj-y += meson/ge2d/		obj-y += meson/ge2d/
	obj-y += mtk-jpeg/		obj-y += mtk-jpeg/
	obj-y += mtk-mdp/		obj-y += mtk-mdp/
	obj-y += mtk-vcodec/		obj-y += mtk-vcodec/
	obj-y += mtk-vpu/		obj-y += mtk-vpu/
			obj-y += nxp/
	obj-y += omap/		obj-y += omap/
	obj-y += omap3isp/		obj-y += omap3isp/
	obj-y += qcom/camss/		obj-y += qcom/camss/
	@@ -48,10 +47,8 @@ obj-y += xilinx/
	# Please place here only ancillary drivers that aren't SoC-specific		# Please place here only ancillary drivers that aren't SoC-specific
	# Please keep it alphabetically sorted by Kconfig name		# Please keep it alphabetically sorted by Kconfig name
	# (e. g. LC_ALL=C sort Makefile)		# (e. g. LC_ALL=C sort Makefile)
	obj-$(CONFIG_VIDEO_IMX_PXP) += imx-pxp.o
	obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o		obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o
	obj-$(CONFIG_VIDEO_MUX) += video-mux.o		obj-$(CONFIG_VIDEO_MUX) += video-mux.o
	obj-$(CONFIG_VIDEO_MX2_EMMAPRP) += mx2_emmaprp.o
	obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o		obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o
	obj-$(CONFIG_VIDEO_RCAR_DRIF) += rcar_drif.o		obj-$(CONFIG_VIDEO_RCAR_DRIF) += rcar_drif.o
	obj-$(CONFIG_VIDEO_RCAR_ISP) += rcar-isp.o		obj-$(CONFIG_VIDEO_RCAR_ISP) += rcar-isp.o
	@@ -61,4 +58,3 @@ obj-$(CONFIG_VIDEO_RENESAS_FDP1) += rcar_fdp1.o
	obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o		obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o
	obj-$(CONFIG_VIDEO_SH_VOU) += sh_vou.o		obj-$(CONFIG_VIDEO_SH_VOU) += sh_vou.o
	obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o		obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
	obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o

drivers/media/platform/imx/Makefile

deleted100644 → 0

+0 −1

Original line number	Original line	Diff line number	Diff line
	obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o

drivers/media/platform/imx/Kconfig→drivers/media/platform/nxp/Kconfig

+66 −0

Original line number	Original line	Diff line number	Diff line
	# SPDX-License-Identifier: GPL-2.0-only		# SPDX-License-Identifier: GPL-2.0-only

			# V4L drivers

	menuconfig VIDEO_IMX		menuconfig VIDEO_IMX
	bool "V4L2 capture drivers for NXP i.MX devices"		bool "V4L2 capture drivers for NXP i.MX devices"
	depends on V4L_PLATFORM_DRIVERS		depends on V4L_PLATFORM_DRIVERS
	@@ -23,3 +25,42 @@ config VIDEO_IMX_MIPI_CSIS
	v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs.		v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs.

	endif # VIDEO_IMX		endif # VIDEO_IMX

			config VIDEO_VIU
			tristate "Freescale/NXP VIU Video Driver"
			depends on V4L_PLATFORM_DRIVERS
			depends on VIDEO_V4L2 && (PPC_MPC512x \|\| COMPILE_TEST) && I2C
			select VIDEOBUF_DMA_CONTIG
			default y
			help
			Support for Freescale VIU video driver. This device captures
			video data, or overlays video on DIU frame buffer.

			Say Y here if you want to enable VIU device on MPC5121e Rev2+.
			In doubt, say N.

			# mem2mem drivers

			config VIDEO_IMX_PXP
			tristate "i.MX Pixel Pipeline (PXP)"
			depends on V4L_MEM2MEM_DRIVERS
			depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC \|\| COMPILE_TEST)
			select VIDEOBUF2_DMA_CONTIG
			select V4L2_MEM2MEM_DEV
			help
			The i.MX Pixel Pipeline is a memory-to-memory engine for scaling,
			color space conversion, and rotation.

			config VIDEO_MX2_EMMAPRP
			tristate "Freescale/NXP MX2 eMMa-PrP support"
			depends on V4L_MEM2MEM_DRIVERS
			depends on VIDEO_DEV && VIDEO_V4L2
			depends on SOC_IMX27 \|\| COMPILE_TEST
			select VIDEOBUF2_DMA_CONTIG
			select V4L2_MEM2MEM_DEV
			help
			MX2X chips have a PrP that can be used to process buffers from
			memory to memory. Operations include resizing and format
			conversion.

			source "drivers/media/platform/nxp/imx-jpeg/Kconfig"