From d968e50b5c26642754492dea23cbd3592bde62d8 Mon Sep 17 00:00:00 2001 From: Detlev Casanova Date: Mon, 23 Jun 2025 12:07:22 -0400 Subject: [PATCH] media: rkvdec: Unstage the driver The TODO list for unstaging being empty, the driver can now be moved to the main media folder. Also add myself as maintainer. Signed-off-by: Detlev Casanova Reviewed-by: Nicolas Dufresne Signed-off-by: Nicolas Dufresne Signed-off-by: Hans Verkuil --- MAINTAINERS | 8 ++++++++ drivers/media/platform/rockchip/Kconfig | 1 + drivers/media/platform/rockchip/Makefile | 1 + .../media => media/platform/rockchip}/rkvdec/Kconfig | 0 .../media => media/platform/rockchip}/rkvdec/Makefile | 0 .../platform/rockchip}/rkvdec/rkvdec-h264.c | 0 .../platform/rockchip}/rkvdec/rkvdec-regs.h | 0 .../media => media/platform/rockchip}/rkvdec/rkvdec-vp9.c | 0 .../media => media/platform/rockchip}/rkvdec/rkvdec.c | 0 .../media => media/platform/rockchip}/rkvdec/rkvdec.h | 0 drivers/staging/media/Kconfig | 2 -- drivers/staging/media/Makefile | 1 - 12 files changed, 10 insertions(+), 3 deletions(-) rename drivers/{staging/media => media/platform/rockchip}/rkvdec/Kconfig (100%) rename drivers/{staging/media => media/platform/rockchip}/rkvdec/Makefile (100%) rename drivers/{staging/media => media/platform/rockchip}/rkvdec/rkvdec-h264.c (100%) rename drivers/{staging/media => media/platform/rockchip}/rkvdec/rkvdec-regs.h (100%) rename drivers/{staging/media => media/platform/rockchip}/rkvdec/rkvdec-vp9.c (100%) rename drivers/{staging/media => media/platform/rockchip}/rkvdec/rkvdec.c (100%) rename drivers/{staging/media => media/platform/rockchip}/rkvdec/rkvdec.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 5f69c82d53ee8..24c557ee091d7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21487,6 +21487,14 @@ S: Maintained F: Documentation/devicetree/bindings/media/rockchip-rga.yaml F: drivers/media/platform/rockchip/rga/ +ROCKCHIP RKVDEC VIDEO DECODER DRIVER +M: Detlev Casanova +L: linux-media@vger.kernel.org +L: linux-rockchip@lists.infradead.org +S: Maintained +F: Documentation/devicetree/bindings/media/rockchip,vdec.yaml +F: drivers/media/platform/rockchip/rkvdec/ + ROCKCHIP RK3308 INTERNAL AUDIO CODEC M: Luca Ceresoli S: Maintained diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig index b41d3960c1b41..9bbeec4996aa2 100644 --- a/drivers/media/platform/rockchip/Kconfig +++ b/drivers/media/platform/rockchip/Kconfig @@ -4,3 +4,4 @@ comment "Rockchip media platform drivers" source "drivers/media/platform/rockchip/rga/Kconfig" source "drivers/media/platform/rockchip/rkisp1/Kconfig" +source "drivers/media/platform/rockchip/rkvdec/Kconfig" diff --git a/drivers/media/platform/rockchip/Makefile b/drivers/media/platform/rockchip/Makefile index 4f782b876ac9b..286dc5c53f7e1 100644 --- a/drivers/media/platform/rockchip/Makefile +++ b/drivers/media/platform/rockchip/Makefile @@ -1,3 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y += rga/ obj-y += rkisp1/ +obj-y += rkvdec/ diff --git a/drivers/staging/media/rkvdec/Kconfig b/drivers/media/platform/rockchip/rkvdec/Kconfig similarity index 100% rename from drivers/staging/media/rkvdec/Kconfig rename to drivers/media/platform/rockchip/rkvdec/Kconfig diff --git a/drivers/staging/media/rkvdec/Makefile b/drivers/media/platform/rockchip/rkvdec/Makefile similarity index 100% rename from drivers/staging/media/rkvdec/Makefile rename to drivers/media/platform/rockchip/rkvdec/Makefile diff --git a/drivers/staging/media/rkvdec/rkvdec-h264.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c similarity index 100% rename from drivers/staging/media/rkvdec/rkvdec-h264.c rename to drivers/media/platform/rockchip/rkvdec/rkvdec-h264.c diff --git a/drivers/staging/media/rkvdec/rkvdec-regs.h b/drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h similarity index 100% rename from drivers/staging/media/rkvdec/rkvdec-regs.h rename to drivers/media/platform/rockchip/rkvdec/rkvdec-regs.h diff --git a/drivers/staging/media/rkvdec/rkvdec-vp9.c b/drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c similarity index 100% rename from drivers/staging/media/rkvdec/rkvdec-vp9.c rename to drivers/media/platform/rockchip/rkvdec/rkvdec-vp9.c diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/media/platform/rockchip/rkvdec/rkvdec.c similarity index 100% rename from drivers/staging/media/rkvdec/rkvdec.c rename to drivers/media/platform/rockchip/rkvdec/rkvdec.c diff --git a/drivers/staging/media/rkvdec/rkvdec.h b/drivers/media/platform/rockchip/rkvdec/rkvdec.h similarity index 100% rename from drivers/staging/media/rkvdec/rkvdec.h rename to drivers/media/platform/rockchip/rkvdec/rkvdec.h diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index 043ffbc472fbf..ab250c89cd4d4 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -34,8 +34,6 @@ source "drivers/staging/media/max96712/Kconfig" source "drivers/staging/media/meson/vdec/Kconfig" -source "drivers/staging/media/rkvdec/Kconfig" - source "drivers/staging/media/starfive/Kconfig" source "drivers/staging/media/sunxi/Kconfig" diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index 177dfe95289b7..4a073938b2b2d 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -4,7 +4,6 @@ obj-$(CONFIG_INTEL_ATOMISP) += atomisp/ obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/ obj-$(CONFIG_VIDEO_MAX96712) += max96712/ obj-$(CONFIG_VIDEO_MESON_VDEC) += meson/vdec/ -obj-$(CONFIG_VIDEO_ROCKCHIP_VDEC) += rkvdec/ obj-$(CONFIG_VIDEO_STARFIVE_CAMSS) += starfive/ obj-$(CONFIG_VIDEO_SUNXI) += sunxi/ obj-$(CONFIG_VIDEO_TEGRA) += tegra-video/ -- 2.47.2