diff --git a/MAINTAINERS b/MAINTAINERS
index 84bc106acc57d156e51bb7b01bcd4db005a74841..b83cf0eb99cec901eaab232f7a72418ceb541641 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 24a43cef18de8d67cd68a15c84ce0120be99f8dc..0a4260627a00ca4844a8531cfad7b1df359e5a91 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 8d6e15fad0b15b9a47c091dc0d1e72de7e52a1bc..8b2deba4b62cd13932c7e4b373a9eeeee3530e27 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