media: allegro: move driver out of staging

The stateful encoder API was finalized. Nothing is blocking the driver
from being moved out of staging.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 546aa66..a40345e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -699,7 +699,7 @@ M:  Michael Tretter <m.tretter@pengutronix.de>
 R:     Pengutronix Kernel Team <kernel@pengutronix.de>
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     drivers/staging/media/allegro-dvt/
+F:     drivers/media/platform/allegro-dvt/
 
 ALLWINNER A10 CSI DRIVER
 M:     Maxime Ripard <mripard@kernel.org>

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 35a18d3..e419b18 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -199,6 +199,21 @@ menuconfig V4L_MEM2MEM_DRIVERS
 
 if V4L_MEM2MEM_DRIVERS
 
+config VIDEO_ALLEGRO_DVT
+       tristate "Allegro DVT Video IP Core"
+       depends on VIDEO_DEV && VIDEO_V4L2
+       depends on ARCH_ZYNQMP || COMPILE_TEST
+       select V4L2_MEM2MEM_DEV
+       select VIDEOBUF2_DMA_CONTIG
+       select REGMAP_MMIO
+       help
+         Support for the encoder video IP core by Allegro DVT. This core is
+         found for example on the Xilinx ZynqMP SoC in the EV family and is
+         called VCU in the reference manual.
+
+         To compile this driver as a module, choose M here: the module
+         will be called allegro.
+
 config VIDEO_CODA
        tristate "Chips&Media Coda multi-standard codec IP"
        depends on VIDEO_DEV && VIDEO_V4L2 && OF && (ARCH_MXC || COMPILE_TEST)

diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 1d63aa9..9d4d637 100644 (file)
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -3,6 +3,7 @@
 # Makefile for the video capture/playback device drivers.
 #
 
+obj-$(CONFIG_VIDEO_ALLEGRO_DVT)                += allegro-dvt/
 obj-$(CONFIG_VIDEO_ASPEED)             += aspeed-video.o
 obj-$(CONFIG_VIDEO_CADENCE)            += cadence/
 obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o

diff --git a/drivers/staging/media/allegro-dvt/Makefile b/drivers/media/platform/allegro-dvt/Makefile
similarity index 100%
rename from drivers/staging/media/allegro-dvt/Makefile
rename to drivers/media/platform/allegro-dvt/Makefile

diff --git a/drivers/staging/media/allegro-dvt/allegro-core.c b/drivers/media/platform/allegro-dvt/allegro-core.c
similarity index 100%
rename from drivers/staging/media/allegro-dvt/allegro-core.c
rename to drivers/media/platform/allegro-dvt/allegro-core.c

diff --git a/drivers/staging/media/allegro-dvt/allegro-mail.c b/drivers/media/platform/allegro-dvt/allegro-mail.c
similarity index 100%
rename from drivers/staging/media/allegro-dvt/allegro-mail.c
rename to drivers/media/platform/allegro-dvt/allegro-mail.c

diff --git a/drivers/staging/media/allegro-dvt/allegro-mail.h b/drivers/media/platform/allegro-dvt/allegro-mail.h
similarity index 100%
rename from drivers/staging/media/allegro-dvt/allegro-mail.h
rename to drivers/media/platform/allegro-dvt/allegro-mail.h

diff --git a/drivers/staging/media/allegro-dvt/nal-h264.c b/drivers/media/platform/allegro-dvt/nal-h264.c
similarity index 100%
rename from drivers/staging/media/allegro-dvt/nal-h264.c
rename to drivers/media/platform/allegro-dvt/nal-h264.c

diff --git a/drivers/staging/media/allegro-dvt/nal-h264.h b/drivers/media/platform/allegro-dvt/nal-h264.h
similarity index 100%
rename from drivers/staging/media/allegro-dvt/nal-h264.h
rename to drivers/media/platform/allegro-dvt/nal-h264.h

diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
index e8996b1..ca59986 100644 (file)
--- a/drivers/staging/media/Kconfig
+++ b/drivers/staging/media/Kconfig
@@ -20,8 +20,6 @@ menuconfig STAGING_MEDIA
 if STAGING_MEDIA && MEDIA_SUPPORT
 
 # Please keep them in alphabetic order
-source "drivers/staging/media/allegro-dvt/Kconfig"
-
 source "drivers/staging/media/atomisp/Kconfig"
 
 source "drivers/staging/media/hantro/Kconfig"

diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
index 24b5873..716929a 100644 (file)
--- a/drivers/staging/media/Makefile
+++ b/drivers/staging/media/Makefile
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_VIDEO_ALLEGRO_DVT)        += allegro-dvt/
 obj-$(CONFIG_INTEL_ATOMISP)     += atomisp/
 obj-$(CONFIG_VIDEO_IMX_MEDIA)  += imx/
 obj-$(CONFIG_VIDEO_MESON_VDEC) += meson/vdec/

diff --git a/drivers/staging/media/allegro-dvt/Kconfig b/drivers/staging/media/allegro-dvt/Kconfig
deleted file mode 100644 (file)
index 6b7107d..0000000
--- a/drivers/staging/media/allegro-dvt/Kconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-config VIDEO_ALLEGRO_DVT
-       tristate "Allegro DVT Video IP Core"
-       depends on VIDEO_DEV && VIDEO_V4L2
-       depends on ARCH_ZYNQMP || COMPILE_TEST
-       select V4L2_MEM2MEM_DEV
-       select VIDEOBUF2_DMA_CONTIG
-       select REGMAP
-       select REGMAP_MMIO
-       help
-         Support for the encoder video IP core by Allegro DVT. This core is
-         found for example on the Xilinx ZynqMP SoC in the EV family and is
-         called VCU in the reference manual.
-
-         To compile this driver as a module, choose M here: the module
-         will be called allegro.

diff --git a/drivers/staging/media/allegro-dvt/TODO b/drivers/staging/media/allegro-dvt/TODO
deleted file mode 100644 (file)
index 99e19be..0000000
--- a/drivers/staging/media/allegro-dvt/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-TODO:
-
-- This driver is waiting for the stateful encoder spec and corresponding
-  v4l2-compliance tests to be finalized.