From a7f3b2d32dabd8e59854ec39ba257050b5e4949e Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@kernel.org>
Date: Sun, 13 Mar 2022 11:18:17 +0100
Subject: [PATCH] media: platform: rename s5p-g2d/ to samsung/s5p-g2d/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
As the end goal is to have platform drivers split by vendor,
rename s5p-g2d/ to samsung/s5p-g2d/.
Acked-by: Åukasz Stelmach <l.stelmach@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => samsung}/s5p-g2d/Kconfig | 0
drivers/media/platform/{ => samsung}/s5p-g2d/Makefile | 0
drivers/media/platform/{ => samsung}/s5p-g2d/g2d-hw.c | 0
drivers/media/platform/{ => samsung}/s5p-g2d/g2d-regs.h | 0
drivers/media/platform/{ => samsung}/s5p-g2d/g2d.c | 0
drivers/media/platform/{ => samsung}/s5p-g2d/g2d.h | 0
9 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/media/platform/{ => samsung}/s5p-g2d/Kconfig (100%)
rename drivers/media/platform/{ => samsung}/s5p-g2d/Makefile (100%)
rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d-hw.c (100%)
rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d-regs.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d.c (100%)
rename drivers/media/platform/{ => samsung}/s5p-g2d/g2d.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 0eb2970e4170c..23101a7367a57 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2616,7 +2616,7 @@ M: Åukasz Stelmach <l.stelmach@samsung.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: linux-media@vger.kernel.org
S: Maintained
-F: drivers/media/platform/s5p-g2d/
+F: drivers/media/platform/samsung/s5p-g2d/
ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT
M: Marek Szyprowski <m.szyprowski@samsung.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 3a95bb5b0badb..6ab986c96cf22 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -87,12 +87,12 @@ source "drivers/media/platform/omap3isp/Kconfig"
source "drivers/media/platform/qcom/Kconfig"
source "drivers/media/platform/renesas/Kconfig"
source "drivers/media/platform/rockchip/Kconfig"
-source "drivers/media/platform/s5p-g2d/Kconfig"
source "drivers/media/platform/s5p-jpeg/Kconfig"
source "drivers/media/platform/s5p-mfc/Kconfig"
source "drivers/media/platform/samsung/exynos-gsc/Kconfig"
source "drivers/media/platform/samsung/exynos4-is/Kconfig"
source "drivers/media/platform/samsung/s3c-camif/Kconfig"
+source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
source "drivers/media/platform/sti/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
source "drivers/media/platform/sunxi/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 0f98d8641af9a..4b3e4209eaf93 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -29,12 +29,12 @@ obj-y += qcom/venus/
obj-y += renesas/
obj-y += rockchip/rga/
obj-y += rockchip/rkisp1/
-obj-y += s5p-g2d/
obj-y += s5p-jpeg/
obj-y += s5p-mfc/
obj-y += samsung/exynos-gsc/
obj-y += samsung/exynos4-is/
obj-y += samsung/s3c-camif/
+obj-y += samsung/s5p-g2d/
obj-y += sti/bdisp/
obj-y += sti/c8sectpfe/
obj-y += sti/delta/
diff --git a/drivers/media/platform/s5p-g2d/Kconfig b/drivers/media/platform/samsung/s5p-g2d/Kconfig
similarity index 100%
rename from drivers/media/platform/s5p-g2d/Kconfig
rename to drivers/media/platform/samsung/s5p-g2d/Kconfig
diff --git a/drivers/media/platform/s5p-g2d/Makefile b/drivers/media/platform/samsung/s5p-g2d/Makefile
similarity index 100%
rename from drivers/media/platform/s5p-g2d/Makefile
rename to drivers/media/platform/samsung/s5p-g2d/Makefile
diff --git a/drivers/media/platform/s5p-g2d/g2d-hw.c b/drivers/media/platform/samsung/s5p-g2d/g2d-hw.c
similarity index 100%
rename from drivers/media/platform/s5p-g2d/g2d-hw.c
rename to drivers/media/platform/samsung/s5p-g2d/g2d-hw.c
diff --git a/drivers/media/platform/s5p-g2d/g2d-regs.h b/drivers/media/platform/samsung/s5p-g2d/g2d-regs.h
similarity index 100%
rename from drivers/media/platform/s5p-g2d/g2d-regs.h
rename to drivers/media/platform/samsung/s5p-g2d/g2d-regs.h
diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/samsung/s5p-g2d/g2d.c
similarity index 100%
rename from drivers/media/platform/s5p-g2d/g2d.c
rename to drivers/media/platform/samsung/s5p-g2d/g2d.c
diff --git a/drivers/media/platform/s5p-g2d/g2d.h b/drivers/media/platform/samsung/s5p-g2d/g2d.h
similarity index 100%
rename from drivers/media/platform/s5p-g2d/g2d.h
rename to drivers/media/platform/samsung/s5p-g2d/g2d.h
--
GitLab