From: Mauro Carvalho Chehab Date: Sun, 13 Mar 2022 10:18:12 +0000 (+0100) Subject: media: platform: rename marvell-ccic/ to marvell/ X-Git-Tag: v5.18-rc1~153^2~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc7bbea90075b57772e9a28043061bf71d96f06f;p=thirdparty%2Fkernel%2Flinux.git media: platform: rename marvell-ccic/ to marvell/ As the end goal is to have platform drivers split by vendor, rename marvell-ccic/ to marvell/. Signed-off-by: Mauro Carvalho Chehab --- diff --git a/MAINTAINERS b/MAINTAINERS index 84bc106acc57d..b83cf0eb99cec 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4248,7 +4248,7 @@ L: linux-media@vger.kernel.org S: Orphan T: git git://linuxtv.org/media_tree.git F: Documentation/admin-guide/media/cafe_ccic* -F: drivers/media/platform/marvell-ccic/ +F: drivers/media/platform/marvell/ CAIF NETWORK LAYER L: netdev@vger.kernel.org diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 24a43cef18de8..0a4260627a00c 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -76,7 +76,7 @@ source "drivers/media/platform/davinci/Kconfig" 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-ccic/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" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 8d6e15fad0b15..8b2deba4b62cd 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -16,7 +16,7 @@ obj-y += davinci/ obj-y += exynos-gsc/ obj-y += exynos4-is/ obj-y += intel/ -obj-y += marvell-ccic/ +obj-y += marvell/ obj-y += meson/ge2d/ obj-y += mtk-jpeg/ obj-y += mtk-mdp/ diff --git a/drivers/media/platform/marvell-ccic/Kconfig b/drivers/media/platform/marvell/Kconfig similarity index 100% rename from drivers/media/platform/marvell-ccic/Kconfig rename to drivers/media/platform/marvell/Kconfig diff --git a/drivers/media/platform/marvell-ccic/Makefile b/drivers/media/platform/marvell/Makefile similarity index 100% rename from drivers/media/platform/marvell-ccic/Makefile rename to drivers/media/platform/marvell/Makefile diff --git a/drivers/media/platform/marvell-ccic/cafe-driver.c b/drivers/media/platform/marvell/cafe-driver.c similarity index 100% rename from drivers/media/platform/marvell-ccic/cafe-driver.c rename to drivers/media/platform/marvell/cafe-driver.c diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell/mcam-core.c similarity index 100% rename from drivers/media/platform/marvell-ccic/mcam-core.c rename to drivers/media/platform/marvell/mcam-core.c diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell/mcam-core.h similarity index 100% rename from drivers/media/platform/marvell-ccic/mcam-core.h rename to drivers/media/platform/marvell/mcam-core.h diff --git a/drivers/media/platform/marvell-ccic/mmp-driver.c b/drivers/media/platform/marvell/mmp-driver.c similarity index 100% rename from drivers/media/platform/marvell-ccic/mmp-driver.c rename to drivers/media/platform/marvell/mmp-driver.c