From c1f3caff2450048ab6c053e5b23698b58f286159 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 13 Mar 2022 11:18:12 +0100 Subject: [PATCH] media: platform: rename meson/ge2d/ to amlogic/meson-ge2d/ As the end goal is to have platform drivers split by vendor, rename meson/ge2d/ to amlogic/meson-ge2d/. Acked-by: Neil Armstrong Signed-off-by: Mauro Carvalho Chehab --- MAINTAINERS | 2 +- drivers/media/platform/Kconfig | 2 +- drivers/media/platform/Makefile | 2 +- .../media/platform/{meson/ge2d => amlogic/meson-ge2d}/Kconfig | 0 .../media/platform/{meson/ge2d => amlogic/meson-ge2d}/Makefile | 0 .../platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d-regs.h | 0 .../media/platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d.c | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/Kconfig (100%) rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/Makefile (100%) rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d-regs.h (100%) rename drivers/media/platform/{meson/ge2d => amlogic/meson-ge2d}/ge2d.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index b83cf0eb99ce..09b0e60da4e9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12523,7 +12523,7 @@ L: linux-amlogic@lists.infradead.org S: Supported T: git git://linuxtv.org/media_tree.git F: Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml -F: drivers/media/platform/meson/ge2d/ +F: drivers/media/platform/amlogic/meson-ge2d/ MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS M: Liang Yang diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 0a4260627a00..b4faee0a1b63 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -67,6 +67,7 @@ config VIDEO_MUX source "drivers/media/platform/allegro-dvt/Kconfig" source "drivers/media/platform/am437x/Kconfig" +source "drivers/media/platform/amlogic/meson-ge2d/Kconfig" source "drivers/media/platform/amphion/Kconfig" source "drivers/media/platform/aspeed/Kconfig" source "drivers/media/platform/atmel/Kconfig" @@ -77,7 +78,6 @@ source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/exynos4-is/Kconfig" source "drivers/media/platform/intel/Kconfig" source "drivers/media/platform/marvell/Kconfig" -source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" source "drivers/media/platform/mtk-vcodec/Kconfig" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 8b2deba4b62c..48531f93d92f 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -7,6 +7,7 @@ # (e. g. LC_ALL=C sort Makefile) obj-y += allegro-dvt/ obj-y += am437x/ +obj-y += amlogic/meson-ge2d/ obj-y += amphion/ obj-y += aspeed/ obj-y += atmel/ @@ -17,7 +18,6 @@ obj-y += exynos-gsc/ obj-y += exynos4-is/ obj-y += intel/ obj-y += marvell/ -obj-y += meson/ge2d/ obj-y += mtk-jpeg/ obj-y += mtk-mdp/ obj-y += mtk-vcodec/ diff --git a/drivers/media/platform/meson/ge2d/Kconfig b/drivers/media/platform/amlogic/meson-ge2d/Kconfig similarity index 100% rename from drivers/media/platform/meson/ge2d/Kconfig rename to drivers/media/platform/amlogic/meson-ge2d/Kconfig diff --git a/drivers/media/platform/meson/ge2d/Makefile b/drivers/media/platform/amlogic/meson-ge2d/Makefile similarity index 100% rename from drivers/media/platform/meson/ge2d/Makefile rename to drivers/media/platform/amlogic/meson-ge2d/Makefile diff --git a/drivers/media/platform/meson/ge2d/ge2d-regs.h b/drivers/media/platform/amlogic/meson-ge2d/ge2d-regs.h similarity index 100% rename from drivers/media/platform/meson/ge2d/ge2d-regs.h rename to drivers/media/platform/amlogic/meson-ge2d/ge2d-regs.h diff --git a/drivers/media/platform/meson/ge2d/ge2d.c b/drivers/media/platform/amlogic/meson-ge2d/ge2d.c similarity index 100% rename from drivers/media/platform/meson/ge2d/ge2d.c rename to drivers/media/platform/amlogic/meson-ge2d/ge2d.c