* [PATCH 01/24] media: platform: rename coda/ to chips-media/
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
@ 2022-03-13 10:51 ` Mauro Carvalho Chehab
2022-03-13 10:51 ` [PATCH 03/24] media: platform: rename meson/ge2d/ to amlogic/meson-ge2d/ Mauro Carvalho Chehab
` (15 subsequent siblings)
16 siblings, 0 replies; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:51 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Cai Huoqing,
Dmitry Osipenko, Eugen Hristev, Fabio Estevam, Hans Verkuil,
Jacopo Mondi, Jernej Skrabec, Jiasheng Jiang, Lad Prabhakar,
Laurent Pinchart, Marco Felsch, Martin Weber, Miaoqian Lin,
Ming Qian, NXP Linux Team, Pengutronix Kernel Team,
Philipp Zabel, Sakari Ailus, Sascha Hauer, Shawn Guo,
Wolfram Sang, linux-arm-kernel, linux-kernel, linux-media
As the end goal is to have platform drivers split by vendor,
rename coda/ to chips-media/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 4 ++--
drivers/media/platform/{coda => chips-media}/Kconfig | 0
drivers/media/platform/{coda => chips-media}/Makefile | 0
drivers/media/platform/{coda => chips-media}/coda-bit.c | 0
drivers/media/platform/{coda => chips-media}/coda-common.c | 0
drivers/media/platform/{coda => chips-media}/coda-gdi.c | 0
drivers/media/platform/{coda => chips-media}/coda-h264.c | 0
drivers/media/platform/{coda => chips-media}/coda-jpeg.c | 0
drivers/media/platform/{coda => chips-media}/coda-mpeg2.c | 0
drivers/media/platform/{coda => chips-media}/coda-mpeg4.c | 0
drivers/media/platform/{coda => chips-media}/coda.h | 0
drivers/media/platform/{coda => chips-media}/coda_regs.h | 2 +-
drivers/media/platform/{coda => chips-media}/imx-vdoa.c | 0
drivers/media/platform/{coda => chips-media}/imx-vdoa.h | 0
drivers/media/platform/{coda => chips-media}/trace.h | 2 +-
17 files changed, 6 insertions(+), 6 deletions(-)
rename drivers/media/platform/{coda => chips-media}/Kconfig (100%)
rename drivers/media/platform/{coda => chips-media}/Makefile (100%)
rename drivers/media/platform/{coda => chips-media}/coda-bit.c (100%)
rename drivers/media/platform/{coda => chips-media}/coda-common.c (100%)
rename drivers/media/platform/{coda => chips-media}/coda-gdi.c (100%)
rename drivers/media/platform/{coda => chips-media}/coda-h264.c (100%)
rename drivers/media/platform/{coda => chips-media}/coda-jpeg.c (100%)
rename drivers/media/platform/{coda => chips-media}/coda-mpeg2.c (100%)
rename drivers/media/platform/{coda => chips-media}/coda-mpeg4.c (100%)
rename drivers/media/platform/{coda => chips-media}/coda.h (100%)
rename drivers/media/platform/{coda => chips-media}/coda_regs.h (99%)
rename drivers/media/platform/{coda => chips-media}/imx-vdoa.c (100%)
rename drivers/media/platform/{coda => chips-media}/imx-vdoa.h (100%)
rename drivers/media/platform/{coda => chips-media}/trace.h (98%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 848640546398..84bc106acc57 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4771,7 +4771,7 @@ M: Philipp Zabel <p.zabel@pengutronix.de>
L: linux-media@vger.kernel.org
S: Maintained
F: Documentation/devicetree/bindings/media/coda.yaml
-F: drivers/media/platform/coda/
+F: drivers/media/platform/chips-media/
CODE OF CONDUCT
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index f15ab9739823..615736ac117c 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -71,7 +71,7 @@ source "drivers/media/platform/amphion/Kconfig"
source "drivers/media/platform/aspeed/Kconfig"
source "drivers/media/platform/atmel/Kconfig"
source "drivers/media/platform/cadence/Kconfig"
-source "drivers/media/platform/coda/Kconfig"
+source "drivers/media/platform/chips-media/Kconfig"
source "drivers/media/platform/davinci/Kconfig"
source "drivers/media/platform/exynos-gsc/Kconfig"
source "drivers/media/platform/exynos4-is/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 20b07ae3ebf1..8d6e15fad0b1 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -6,12 +6,12 @@
# Place here, alphabetically sorted by directory
# (e. g. LC_ALL=C sort Makefile)
obj-y += allegro-dvt/
-obj-y += aspeed/
obj-y += am437x/
obj-y += amphion/
+obj-y += aspeed/
obj-y += atmel/
obj-y += cadence/
-obj-y += coda/
+obj-y += chips-media/
obj-y += davinci/
obj-y += exynos-gsc/
obj-y += exynos4-is/
diff --git a/drivers/media/platform/coda/Kconfig b/drivers/media/platform/chips-media/Kconfig
similarity index 100%
rename from drivers/media/platform/coda/Kconfig
rename to drivers/media/platform/chips-media/Kconfig
diff --git a/drivers/media/platform/coda/Makefile b/drivers/media/platform/chips-media/Makefile
similarity index 100%
rename from drivers/media/platform/coda/Makefile
rename to drivers/media/platform/chips-media/Makefile
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/chips-media/coda-bit.c
similarity index 100%
rename from drivers/media/platform/coda/coda-bit.c
rename to drivers/media/platform/chips-media/coda-bit.c
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/chips-media/coda-common.c
similarity index 100%
rename from drivers/media/platform/coda/coda-common.c
rename to drivers/media/platform/chips-media/coda-common.c
diff --git a/drivers/media/platform/coda/coda-gdi.c b/drivers/media/platform/chips-media/coda-gdi.c
similarity index 100%
rename from drivers/media/platform/coda/coda-gdi.c
rename to drivers/media/platform/chips-media/coda-gdi.c
diff --git a/drivers/media/platform/coda/coda-h264.c b/drivers/media/platform/chips-media/coda-h264.c
similarity index 100%
rename from drivers/media/platform/coda/coda-h264.c
rename to drivers/media/platform/chips-media/coda-h264.c
diff --git a/drivers/media/platform/coda/coda-jpeg.c b/drivers/media/platform/chips-media/coda-jpeg.c
similarity index 100%
rename from drivers/media/platform/coda/coda-jpeg.c
rename to drivers/media/platform/chips-media/coda-jpeg.c
diff --git a/drivers/media/platform/coda/coda-mpeg2.c b/drivers/media/platform/chips-media/coda-mpeg2.c
similarity index 100%
rename from drivers/media/platform/coda/coda-mpeg2.c
rename to drivers/media/platform/chips-media/coda-mpeg2.c
diff --git a/drivers/media/platform/coda/coda-mpeg4.c b/drivers/media/platform/chips-media/coda-mpeg4.c
similarity index 100%
rename from drivers/media/platform/coda/coda-mpeg4.c
rename to drivers/media/platform/chips-media/coda-mpeg4.c
diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/chips-media/coda.h
similarity index 100%
rename from drivers/media/platform/coda/coda.h
rename to drivers/media/platform/chips-media/coda.h
diff --git a/drivers/media/platform/coda/coda_regs.h b/drivers/media/platform/chips-media/coda_regs.h
similarity index 99%
rename from drivers/media/platform/coda/coda_regs.h
rename to drivers/media/platform/chips-media/coda_regs.h
index da5bb3212528..db81a904cf3f 100644
--- a/drivers/media/platform/coda/coda_regs.h
+++ b/drivers/media/platform/chips-media/coda_regs.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/coda/coda_regs.h
+ * linux/drivers/media/platform/chips-media/coda_regs.h
*
* Copyright (C) 2012 Vista Silicon SL
* Javier Martin <javier.martin@vista-silicon.com>
diff --git a/drivers/media/platform/coda/imx-vdoa.c b/drivers/media/platform/chips-media/imx-vdoa.c
similarity index 100%
rename from drivers/media/platform/coda/imx-vdoa.c
rename to drivers/media/platform/chips-media/imx-vdoa.c
diff --git a/drivers/media/platform/coda/imx-vdoa.h b/drivers/media/platform/chips-media/imx-vdoa.h
similarity index 100%
rename from drivers/media/platform/coda/imx-vdoa.h
rename to drivers/media/platform/chips-media/imx-vdoa.h
diff --git a/drivers/media/platform/coda/trace.h b/drivers/media/platform/chips-media/trace.h
similarity index 98%
rename from drivers/media/platform/coda/trace.h
rename to drivers/media/platform/chips-media/trace.h
index c0791c847f7c..19f98e6dafb9 100644
--- a/drivers/media/platform/coda/trace.h
+++ b/drivers/media/platform/chips-media/trace.h
@@ -167,7 +167,7 @@ DEFINE_EVENT(coda_buf_class, coda_jpeg_done,
#endif /* __CODA_TRACE_H__ */
#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../../drivers/media/platform/coda
+#define TRACE_INCLUDE_PATH ../../drivers/media/platform/chips-media
#undef TRACE_INCLUDE_FILE
#define TRACE_INCLUDE_FILE trace
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 03/24] media: platform: rename meson/ge2d/ to amlogic/meson-ge2d/
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
2022-03-13 10:51 ` [PATCH 01/24] media: platform: rename coda/ to chips-media/ Mauro Carvalho Chehab
@ 2022-03-13 10:51 ` Mauro Carvalho Chehab
2022-03-13 10:51 ` [PATCH 04/24] media: platform: rename mtk-jpeg/ to mediatek/mtk-jpeg/ Mauro Carvalho Chehab
` (14 subsequent siblings)
16 siblings, 0 replies; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:51 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Cai Huoqing,
Christophe JAILLET, Dmitry Osipenko, Eugen Hristev, Hans Verkuil,
Jacopo Mondi, Jernej Skrabec, Jerome Brunet, Kevin Hilman,
Laurent Pinchart, Martin Blumenstingl, Ming Qian, Neil Armstrong,
Sakari Ailus, linux-amlogic, linux-arm-kernel, linux-kernel,
linux-media
As the end goal is to have platform drivers split by vendor,
rename meson/ge2d/ to amlogic/meson-ge2d/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
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 <liang.yang@amlogic.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 5e7cb24038fe..d8436923aebe 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
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 04/24] media: platform: rename mtk-jpeg/ to mediatek/mtk-jpeg/
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
2022-03-13 10:51 ` [PATCH 01/24] media: platform: rename coda/ to chips-media/ Mauro Carvalho Chehab
2022-03-13 10:51 ` [PATCH 03/24] media: platform: rename meson/ge2d/ to amlogic/meson-ge2d/ Mauro Carvalho Chehab
@ 2022-03-13 10:51 ` Mauro Carvalho Chehab
2022-03-13 10:51 ` [PATCH 05/24] media: platform: rename mtk-mdp/ to mediatek/mtk-mdp/ Mauro Carvalho Chehab
` (13 subsequent siblings)
16 siblings, 0 replies; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:51 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund,
AngeloGioacchino Del Regno, Bin Liu, Cai Huoqing, Colin Ian King,
Dafna Hirschfeld, Dmitry Osipenko, Eugen Hristev, Evan Green,
Hans Verkuil, Jacopo Mondi, Jernej Skrabec, Laurent Pinchart,
Matthias Brugger, Ming Qian, Rick Chang, Sakari Ailus, Xu Wang,
Yong Wu, linux-arm-kernel, linux-kernel, linux-media,
linux-mediatek
As the end goal is to have platform drivers split by vendor,
rename mtk-jpeg/ to mediatek/mtk-jpeg/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => mediatek}/mtk-jpeg/Kconfig | 0
drivers/media/platform/{ => mediatek}/mtk-jpeg/Makefile | 0
drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.c | 0
drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.h | 0
.../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.c | 0
.../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.h | 0
.../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.c | 0
.../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.h | 0
.../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_reg.h | 0
.../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.c | 0
.../media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.h | 0
14 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/Kconfig (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/Makefile (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_core.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_parse.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_reg.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 09b0e60da4e9..fa0a3de3865f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12130,7 +12130,7 @@ M: Rick Chang <rick.chang@mediatek.com>
M: Bin Liu <bin.liu@mediatek.com>
S: Supported
F: Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt
-F: drivers/media/platform/mtk-jpeg/
+F: drivers/media/platform/mediatek/mtk-jpeg/
MEDIATEK MDP DRIVER
M: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index d8436923aebe..fdb4e1a8aa81 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -78,7 +78,7 @@ 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/mtk-jpeg/Kconfig"
+source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
source "drivers/media/platform/mtk-mdp/Kconfig"
source "drivers/media/platform/mtk-vcodec/Kconfig"
source "drivers/media/platform/mtk-vpu/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 48531f93d92f..c792f6216918 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -18,7 +18,7 @@ obj-y += exynos-gsc/
obj-y += exynos4-is/
obj-y += intel/
obj-y += marvell/
-obj-y += mtk-jpeg/
+obj-y += mediatek/mtk-jpeg/
obj-y += mtk-mdp/
obj-y += mtk-vcodec/
obj-y += mtk-vpu/
diff --git a/drivers/media/platform/mtk-jpeg/Kconfig b/drivers/media/platform/mediatek/mtk-jpeg/Kconfig
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/Kconfig
rename to drivers/media/platform/mediatek/mtk-jpeg/Kconfig
diff --git a/drivers/media/platform/mtk-jpeg/Makefile b/drivers/media/platform/mediatek/mtk-jpeg/Makefile
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/Makefile
rename to drivers/media/platform/mediatek/mtk-jpeg/Makefile
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.c
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h b/drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h
similarity index 100%
rename from drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h
rename to drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 05/24] media: platform: rename mtk-mdp/ to mediatek/mtk-mdp/
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
` (2 preceding siblings ...)
2022-03-13 10:51 ` [PATCH 04/24] media: platform: rename mtk-jpeg/ to mediatek/mtk-jpeg/ Mauro Carvalho Chehab
@ 2022-03-13 10:51 ` Mauro Carvalho Chehab
2022-03-13 10:51 ` [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/ Mauro Carvalho Chehab
` (12 subsequent siblings)
16 siblings, 0 replies; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:51 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Andrew-CT Chen,
AngeloGioacchino Del Regno, Dafna Hirschfeld, Dmitry Osipenko,
Eugen Hristev, Evan Green, Hans Verkuil, Houlong Wei,
Jacopo Mondi, Jernej Skrabec, Jonathan Cameron, Laurent Pinchart,
Matthias Brugger, Ming Qian, Minghsiu Tsai, Sakari Ailus,
Xu Wang, Yong Wu, linux-arm-kernel, linux-kernel, linux-media,
linux-mediatek
As the end goal is to have platform drivers split by vendor,
rename mtk-mdp/ to mediatek/mtk-mdp/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => mediatek}/mtk-mdp/Kconfig | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/Makefile | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.c | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.h | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.c | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.h | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_ipi.h | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.c | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.h | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.c | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.h | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.c | 0
drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.h | 0
16 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/Kconfig (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/Makefile (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_comp.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_core.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_ipi.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_m2m.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_regs.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-mdp/mtk_mdp_vpu.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index fa0a3de3865f..2203d98bbcf1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12138,7 +12138,7 @@ M: Houlong Wei <houlong.wei@mediatek.com>
M: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
S: Supported
F: Documentation/devicetree/bindings/media/mediatek-mdp.txt
-F: drivers/media/platform/mtk-mdp/
+F: drivers/media/platform/mediatek/mtk-mdp/
F: drivers/media/platform/mtk-vpu/
MEDIATEK MEDIA DRIVER
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index fdb4e1a8aa81..a45fd3fe103e 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -79,7 +79,7 @@ source "drivers/media/platform/exynos4-is/Kconfig"
source "drivers/media/platform/intel/Kconfig"
source "drivers/media/platform/marvell/Kconfig"
source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
-source "drivers/media/platform/mtk-mdp/Kconfig"
+source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
source "drivers/media/platform/mtk-vcodec/Kconfig"
source "drivers/media/platform/mtk-vpu/Kconfig"
source "drivers/media/platform/nxp/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index c792f6216918..6f5d09cd8f9b 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -19,7 +19,7 @@ obj-y += exynos4-is/
obj-y += intel/
obj-y += marvell/
obj-y += mediatek/mtk-jpeg/
-obj-y += mtk-mdp/
+obj-y += mediatek/mtk-mdp/
obj-y += mtk-vcodec/
obj-y += mtk-vpu/
obj-y += nxp/
diff --git a/drivers/media/platform/mtk-mdp/Kconfig b/drivers/media/platform/mediatek/mtk-mdp/Kconfig
similarity index 100%
rename from drivers/media/platform/mtk-mdp/Kconfig
rename to drivers/media/platform/mediatek/mtk-mdp/Kconfig
diff --git a/drivers/media/platform/mtk-mdp/Makefile b/drivers/media/platform/mediatek/mtk-mdp/Makefile
similarity index 100%
rename from drivers/media/platform/mtk-mdp/Makefile
rename to drivers/media/platform/mediatek/mtk-mdp/Makefile
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_core.c
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_core.h
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_regs.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_regs.c
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_regs.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_regs.h
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h b/drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h
similarity index 100%
rename from drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h
rename to drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
` (3 preceding siblings ...)
2022-03-13 10:51 ` [PATCH 05/24] media: platform: rename mtk-mdp/ to mediatek/mtk-mdp/ Mauro Carvalho Chehab
@ 2022-03-13 10:51 ` Mauro Carvalho Chehab
2022-03-14 13:09 ` Nicolas Dufresne
2022-03-13 10:51 ` [PATCH 07/24] media: platform: rename mtk-vpu/ to mediatek/mtk-vpu/ Mauro Carvalho Chehab
` (11 subsequent siblings)
16 siblings, 1 reply; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:51 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Alexandre Courbot,
Andrew-CT Chen, AngeloGioacchino Del Regno, Benjamin Gaignard,
Christophe JAILLET, Dafna Hirschfeld, Dmitry Osipenko,
Eugen Hristev, Hans Verkuil, Hirokazu Honda, Hsin-Yi Wang,
Irui Wang, Jacopo Mondi, Jernej Skrabec, Jiasheng Jiang,
Jonathan Cameron, Laurent Pinchart, Matthias Brugger, Ming Qian,
Nicolas Dufresne, Sakari Ailus, Steve Cho, Tiffany Lin,
Tzung-Bi Shih, Yong Wu, Yunfei Dong, linux-arm-kernel,
linux-kernel, linux-media, linux-mediatek
As the end goal is to have platform drivers split by vendor,
rename mtk-vcodec/ to mediatek/mtk-vcodec/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h | 0
.../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c | 0
.../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c | 0
.../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h | 0
.../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c | 0
.../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h | 0
.../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h | 0
.../platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c | 0
.../media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c | 0
drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h | 0
49 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 2203d98bbcf1..bfe014870a77 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12147,7 +12147,7 @@ M: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
S: Supported
F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt
F: Documentation/devicetree/bindings/media/mediatek-vpu.txt
-F: drivers/media/platform/mtk-vcodec/
+F: drivers/media/platform/mediatek/mtk-vcodec/
F: drivers/media/platform/mtk-vpu/
MEDIATEK MMC/SD/SDIO DRIVER
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index a45fd3fe103e..8ba10b657164 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -80,7 +80,7 @@ source "drivers/media/platform/intel/Kconfig"
source "drivers/media/platform/marvell/Kconfig"
source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
-source "drivers/media/platform/mtk-vcodec/Kconfig"
+source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
source "drivers/media/platform/mtk-vpu/Kconfig"
source "drivers/media/platform/nxp/Kconfig"
source "drivers/media/platform/omap/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 6f5d09cd8f9b..637a3a7ac036 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -20,7 +20,7 @@ obj-y += intel/
obj-y += marvell/
obj-y += mediatek/mtk-jpeg/
obj-y += mediatek/mtk-mdp/
-obj-y += mtk-vcodec/
+obj-y += mediatek/mtk-vcodec/
obj-y += mtk-vpu/
obj-y += nxp/
obj-y += omap/
diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/platform/mediatek/mtk-vcodec/Kconfig
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Kconfig
rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig
diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mediatek/mtk-vcodec/Makefile
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Makefile
rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_drv_base.h
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.h
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
diff --git a/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h
rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc_drv_base.h
rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc_drv_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc_drv_if.h
rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
diff --git a/drivers/media/platform/mtk-vcodec/venc_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
rename to drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.c
rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.h
rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* Re: [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/
2022-03-13 10:51 ` [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/ Mauro Carvalho Chehab
@ 2022-03-14 13:09 ` Nicolas Dufresne
2022-03-14 14:37 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 31+ messages in thread
From: Nicolas Dufresne @ 2022-03-14 13:09 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Niklas Söderlund, Alexandre Courbot, Andrew-CT Chen,
AngeloGioacchino Del Regno, Benjamin Gaignard,
Christophe JAILLET, Dmitry Osipenko, Eugen Hristev, Hans Verkuil,
Hirokazu Honda, Hsin-Yi Wang, Irui Wang, Jacopo Mondi,
Jernej Skrabec, Jiasheng Jiang, Jonathan Cameron,
Laurent Pinchart, Matthias Brugger, Ming Qian, Sakari Ailus,
Steve Cho, Tiffany Lin, Tzung-Bi Shih, Yong Wu, Yunfei Dong,
linux-arm-kernel, linux-kernel, linux-media, linux-mediatek
Le dimanche 13 mars 2022 à 11:51 +0100, Mauro Carvalho Chehab a écrit :
> As the end goal is to have platform drivers split by vendor,
> rename mtk-vcodec/ to mediatek/mtk-vcodec/.
Was thinking all these mtk-* directory didn't fit with the platform/ semantic. I
totally support this change. I suppose jpeg/mdp/vpu also needs to be moved. And
mdp3 and various vcodec patches will need a new submission.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Acked-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> ---
>
> To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
> See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
>
> MAINTAINERS | 2 +-
> drivers/media/platform/Kconfig | 2 +-
> drivers/media/platform/Makefile | 2 +-
> drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig | 0
> drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h | 0
> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c | 0
> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c | 0
> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h | 0
> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c | 0
> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h | 0
> .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c | 0
> .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h | 0
> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c | 0
> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c | 0
> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h | 0
> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h | 0
> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c | 0
> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h | 0
> .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c | 0
> .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h | 0
> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c | 0
> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h | 0
> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h | 0
> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c | 0
> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h | 0
> .../platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c | 0
> .../media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h | 0
> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c | 0
> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h | 0
> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h | 0
> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c | 0
> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h | 0
> 49 files changed, 3 insertions(+), 3 deletions(-)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c (100%)
> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 2203d98bbcf1..bfe014870a77 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -12147,7 +12147,7 @@ M: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
> S: Supported
> F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> F: Documentation/devicetree/bindings/media/mediatek-vpu.txt
> -F: drivers/media/platform/mtk-vcodec/
> +F: drivers/media/platform/mediatek/mtk-vcodec/
> F: drivers/media/platform/mtk-vpu/
>
> MEDIATEK MMC/SD/SDIO DRIVER
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index a45fd3fe103e..8ba10b657164 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -80,7 +80,7 @@ source "drivers/media/platform/intel/Kconfig"
> source "drivers/media/platform/marvell/Kconfig"
> source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
> source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
> -source "drivers/media/platform/mtk-vcodec/Kconfig"
> +source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
> source "drivers/media/platform/mtk-vpu/Kconfig"
> source "drivers/media/platform/nxp/Kconfig"
> source "drivers/media/platform/omap/Kconfig"
> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
> index 6f5d09cd8f9b..637a3a7ac036 100644
> --- a/drivers/media/platform/Makefile
> +++ b/drivers/media/platform/Makefile
> @@ -20,7 +20,7 @@ obj-y += intel/
> obj-y += marvell/
> obj-y += mediatek/mtk-jpeg/
> obj-y += mediatek/mtk-mdp/
> -obj-y += mtk-vcodec/
> +obj-y += mediatek/mtk-vcodec/
> obj-y += mtk-vpu/
> obj-y += nxp/
> obj-y += omap/
> diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/platform/mediatek/mtk-vcodec/Kconfig
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/Kconfig
> rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig
> diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mediatek/mtk-vcodec/Makefile
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/Makefile
> rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
> diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/vdec_drv_base.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
> diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
> diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
> diff --git a/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
> diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
> diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
> diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
> diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
> diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
> diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
> diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/venc_drv_base.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
> diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/venc_drv_if.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
> diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/venc_drv_if.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
> diff --git a/drivers/media/platform/mtk-vcodec/venc_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
> diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.c
> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
> diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
> similarity index 100%
> rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.h
> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/
2022-03-14 13:09 ` Nicolas Dufresne
@ 2022-03-14 14:37 ` Mauro Carvalho Chehab
2022-03-14 15:02 ` AngeloGioacchino Del Regno
0 siblings, 1 reply; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 14:37 UTC (permalink / raw)
To: Nicolas Dufresne
Cc: Niklas Söderlund, Alexandre Courbot, Andrew-CT Chen,
AngeloGioacchino Del Regno, Benjamin Gaignard,
Christophe JAILLET, Dmitry Osipenko, Eugen Hristev, Hans Verkuil,
Hirokazu Honda, Hsin-Yi Wang, Irui Wang, Jacopo Mondi,
Jernej Skrabec, Jiasheng Jiang, Jonathan Cameron,
Laurent Pinchart, Matthias Brugger, Ming Qian, Sakari Ailus,
Steve Cho, Tiffany Lin, Tzung-Bi Shih, Yong Wu, Yunfei Dong,
linux-arm-kernel, linux-kernel, linux-media, linux-mediatek
Em Mon, 14 Mar 2022 09:09:45 -0400
Nicolas Dufresne <nicolas.dufresne@collabora.com> escreveu:
> Le dimanche 13 mars 2022 à 11:51 +0100, Mauro Carvalho Chehab a écrit :
> > As the end goal is to have platform drivers split by vendor,
> > rename mtk-vcodec/ to mediatek/mtk-vcodec/.
>
> Was thinking all these mtk-* directory didn't fit with the platform/ semantic. I
> totally support this change. I suppose jpeg/mdp/vpu also needs to be moved. And
> mdp3 and various vcodec patches will need a new submission.
They were all moved too, each one on a separate patch in this series:
$ LANG=C tree -d drivers/media/platform/
drivers/media/platform/
|-- allegro-dvt
|-- allwinner
| |-- sun4i-csi
| |-- sun6i-csi
| |-- sun8i-di
| `-- sun8i-rotate
|-- amlogic
| `-- meson-ge2d
|-- amphion
|-- aspeed
|-- atmel
|-- cadence
|-- chips-media
|-- intel
|-- marvell
|-- mediatek
| |-- mtk-jpeg
| |-- mtk-mdp
| |-- mtk-vcodec
| | |-- vdec
| | `-- venc
| `-- mtk-vpu
|-- nvidia
| `-- tegra-vde
|-- nxp
| `-- imx-jpeg
|-- qcom
| |-- camss
| `-- venus
|-- renesas
| |-- rcar-vin
| `-- vsp1
|-- rockchip
| |-- rga
| `-- rkisp1
|-- samsung
| |-- exynos-gsc
| |-- exynos4-is
| |-- s3c-camif
| |-- s5p-g2d
| |-- s5p-jpeg
| `-- s5p-mfc
|-- stm
| |-- sti
| | |-- bdisp
| | |-- c8sectpfe
| | |-- delta
| | `-- hva
| `-- stm32
| `-- dma2d
|-- ti
| |-- am437x
| |-- cal
| |-- davinci
| |-- omap
| |-- omap3isp
| `-- vpe
|-- ti-vpe
|-- via
`-- xilinx
>
> >
> > Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
>
> Acked-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
>
> > ---
> >
> > To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
> > See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
> >
> > MAINTAINERS | 2 +-
> > drivers/media/platform/Kconfig | 2 +-
> > drivers/media/platform/Makefile | 2 +-
> > drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig | 0
> > drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h | 0
> > .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c | 0
> > .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c | 0
> > .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h | 0
> > .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c | 0
> > .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h | 0
> > .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c | 0
> > .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h | 0
> > .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c | 0
> > .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c | 0
> > .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h | 0
> > .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h | 0
> > .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c | 0
> > .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h | 0
> > .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c | 0
> > .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h | 0
> > drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c | 0
> > drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h | 0
> > drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h | 0
> > drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c | 0
> > drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h | 0
> > .../platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c | 0
> > .../media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h | 0
> > drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c | 0
> > drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h | 0
> > drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h | 0
> > drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c | 0
> > drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h | 0
> > 49 files changed, 3 insertions(+), 3 deletions(-)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c (100%)
> > rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h (100%)
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 2203d98bbcf1..bfe014870a77 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -12147,7 +12147,7 @@ M: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
> > S: Supported
> > F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> > F: Documentation/devicetree/bindings/media/mediatek-vpu.txt
> > -F: drivers/media/platform/mtk-vcodec/
> > +F: drivers/media/platform/mediatek/mtk-vcodec/
> > F: drivers/media/platform/mtk-vpu/
> >
> > MEDIATEK MMC/SD/SDIO DRIVER
> > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> > index a45fd3fe103e..8ba10b657164 100644
> > --- a/drivers/media/platform/Kconfig
> > +++ b/drivers/media/platform/Kconfig
> > @@ -80,7 +80,7 @@ source "drivers/media/platform/intel/Kconfig"
> > source "drivers/media/platform/marvell/Kconfig"
> > source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
> > source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
> > -source "drivers/media/platform/mtk-vcodec/Kconfig"
> > +source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
> > source "drivers/media/platform/mtk-vpu/Kconfig"
> > source "drivers/media/platform/nxp/Kconfig"
> > source "drivers/media/platform/omap/Kconfig"
> > diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
> > index 6f5d09cd8f9b..637a3a7ac036 100644
> > --- a/drivers/media/platform/Makefile
> > +++ b/drivers/media/platform/Makefile
> > @@ -20,7 +20,7 @@ obj-y += intel/
> > obj-y += marvell/
> > obj-y += mediatek/mtk-jpeg/
> > obj-y += mediatek/mtk-mdp/
> > -obj-y += mtk-vcodec/
> > +obj-y += mediatek/mtk-vcodec/
> > obj-y += mtk-vpu/
> > obj-y += nxp/
> > obj-y += omap/
> > diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/platform/mediatek/mtk-vcodec/Kconfig
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/Kconfig
> > rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig
> > diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mediatek/mtk-vcodec/Makefile
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/Makefile
> > rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
> > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
> > diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
> > diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
> > diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
> > diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
> > diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/vdec_drv_base.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
> > diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
> > diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
> > diff --git a/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
> > diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
> > diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
> > diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
> > diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
> > diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
> > diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
> > diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/venc_drv_base.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
> > diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/venc_drv_if.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
> > diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/venc_drv_if.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
> > diff --git a/drivers/media/platform/mtk-vcodec/venc_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
> > diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.c
> > rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
> > diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
> > similarity index 100%
> > rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.h
> > rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
>
Thanks,
Mauro
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/
2022-03-14 14:37 ` Mauro Carvalho Chehab
@ 2022-03-14 15:02 ` AngeloGioacchino Del Regno
2022-03-14 15:42 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 31+ messages in thread
From: AngeloGioacchino Del Regno @ 2022-03-14 15:02 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Nicolas Dufresne
Cc: Niklas Söderlund, Alexandre Courbot, Andrew-CT Chen,
Benjamin Gaignard, Christophe JAILLET, Dmitry Osipenko,
Eugen Hristev, Hans Verkuil, Hirokazu Honda, Hsin-Yi Wang,
Irui Wang, Jacopo Mondi, Jernej Skrabec, Jiasheng Jiang,
Jonathan Cameron, Laurent Pinchart, Matthias Brugger, Ming Qian,
Sakari Ailus, Steve Cho, Tiffany Lin, Tzung-Bi Shih, Yong Wu,
Yunfei Dong, linux-arm-kernel, linux-kernel, linux-media,
linux-mediatek
Il 14/03/22 15:37, Mauro Carvalho Chehab ha scritto:
> Em Mon, 14 Mar 2022 09:09:45 -0400
> Nicolas Dufresne <nicolas.dufresne@collabora.com> escreveu:
>
>> Le dimanche 13 mars 2022 à 11:51 +0100, Mauro Carvalho Chehab a écrit :
>>> As the end goal is to have platform drivers split by vendor,
>>> rename mtk-vcodec/ to mediatek/mtk-vcodec/.
>>
>> Was thinking all these mtk-* directory didn't fit with the platform/ semantic. I
>> totally support this change. I suppose jpeg/mdp/vpu also needs to be moved. And
>> mdp3 and various vcodec patches will need a new submission.
>
> They were all moved too, each one on a separate patch in this series:
>
Hello Mauro, Nicolas
I was wondering if we could also drop the 'mtk-' prefix from the folder names,
as 'mtk' effectively stands for 'mediatek'... so we would have them as:
mediatek/jpeg
mediatek/mdp
mediatek/mdp3
mediatek/vcodec
mediatek/vpu
mediatek/mtk-... looks a bit repetitive :)
Cheers,
Angelo
> $ LANG=C tree -d drivers/media/platform/
> drivers/media/platform/
> |-- allegro-dvt
> |-- allwinner
> | |-- sun4i-csi
> | |-- sun6i-csi
> | |-- sun8i-di
> | `-- sun8i-rotate
> |-- amlogic
> | `-- meson-ge2d
> |-- amphion
> |-- aspeed
> |-- atmel
> |-- cadence
> |-- chips-media
> |-- intel
> |-- marvell
> |-- mediatek
> | |-- mtk-jpeg
> | |-- mtk-mdp
> | |-- mtk-vcodec
> | | |-- vdec
> | | `-- venc
> | `-- mtk-vpu
> |-- nvidia
> | `-- tegra-vde
> |-- nxp
> | `-- imx-jpeg
> |-- qcom
> | |-- camss
> | `-- venus
> |-- renesas
> | |-- rcar-vin
> | `-- vsp1
> |-- rockchip
> | |-- rga
> | `-- rkisp1
> |-- samsung
> | |-- exynos-gsc
> | |-- exynos4-is
> | |-- s3c-camif
> | |-- s5p-g2d
> | |-- s5p-jpeg
> | `-- s5p-mfc
> |-- stm
> | |-- sti
> | | |-- bdisp
> | | |-- c8sectpfe
> | | |-- delta
> | | `-- hva
> | `-- stm32
> | `-- dma2d
> |-- ti
> | |-- am437x
> | |-- cal
> | |-- davinci
> | |-- omap
> | |-- omap3isp
> | `-- vpe
> |-- ti-vpe
> |-- via
> `-- xilinx
>
>>
>>>
>>> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
>>
>> Acked-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
>>
>>> ---
>>>
>>> To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
>>> See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
>>>
>>> MAINTAINERS | 2 +-
>>> drivers/media/platform/Kconfig | 2 +-
>>> drivers/media/platform/Makefile | 2 +-
>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig | 0
>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h | 0
>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c | 0
>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c | 0
>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h | 0
>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c | 0
>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h | 0
>>> .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c | 0
>>> .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h | 0
>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c | 0
>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c | 0
>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h | 0
>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h | 0
>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c | 0
>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h | 0
>>> .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c | 0
>>> .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h | 0
>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c | 0
>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h | 0
>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h | 0
>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c | 0
>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h | 0
>>> .../platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c | 0
>>> .../media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h | 0
>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c | 0
>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h | 0
>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h | 0
>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c | 0
>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h | 0
>>> 49 files changed, 3 insertions(+), 3 deletions(-)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c (100%)
>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h (100%)
>>>
>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>> index 2203d98bbcf1..bfe014870a77 100644
>>> --- a/MAINTAINERS
>>> +++ b/MAINTAINERS
>>> @@ -12147,7 +12147,7 @@ M: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
>>> S: Supported
>>> F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt
>>> F: Documentation/devicetree/bindings/media/mediatek-vpu.txt
>>> -F: drivers/media/platform/mtk-vcodec/
>>> +F: drivers/media/platform/mediatek/mtk-vcodec/
>>> F: drivers/media/platform/mtk-vpu/
>>>
>>> MEDIATEK MMC/SD/SDIO DRIVER
>>> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
>>> index a45fd3fe103e..8ba10b657164 100644
>>> --- a/drivers/media/platform/Kconfig
>>> +++ b/drivers/media/platform/Kconfig
>>> @@ -80,7 +80,7 @@ source "drivers/media/platform/intel/Kconfig"
>>> source "drivers/media/platform/marvell/Kconfig"
>>> source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
>>> source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
>>> -source "drivers/media/platform/mtk-vcodec/Kconfig"
>>> +source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
>>> source "drivers/media/platform/mtk-vpu/Kconfig"
>>> source "drivers/media/platform/nxp/Kconfig"
>>> source "drivers/media/platform/omap/Kconfig"
>>> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
>>> index 6f5d09cd8f9b..637a3a7ac036 100644
>>> --- a/drivers/media/platform/Makefile
>>> +++ b/drivers/media/platform/Makefile
>>> @@ -20,7 +20,7 @@ obj-y += intel/
>>> obj-y += marvell/
>>> obj-y += mediatek/mtk-jpeg/
>>> obj-y += mediatek/mtk-mdp/
>>> -obj-y += mtk-vcodec/
>>> +obj-y += mediatek/mtk-vcodec/
>>> obj-y += mtk-vpu/
>>> obj-y += nxp/
>>> obj-y += omap/
>>> diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/platform/mediatek/mtk-vcodec/Kconfig
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/Kconfig
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig
>>> diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mediatek/mtk-vcodec/Makefile
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/Makefile
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/vdec_drv_base.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/venc_drv_base.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/venc_drv_if.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/venc_drv_if.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/venc_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
>>> diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.c
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
>>> diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
>>> similarity index 100%
>>> rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.h
>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
>>
>
>
>
> Thanks,
> Mauro
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/
2022-03-14 15:02 ` AngeloGioacchino Del Regno
@ 2022-03-14 15:42 ` Mauro Carvalho Chehab
2022-03-14 15:43 ` AngeloGioacchino Del Regno
0 siblings, 1 reply; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 15:42 UTC (permalink / raw)
To: AngeloGioacchino Del Regno
Cc: Nicolas Dufresne, Niklas Söderlund, Alexandre Courbot,
Andrew-CT Chen, Benjamin Gaignard, Christophe JAILLET,
Dmitry Osipenko, Eugen Hristev, Hans Verkuil, Hirokazu Honda,
Hsin-Yi Wang, Irui Wang, Jacopo Mondi, Jernej Skrabec,
Jiasheng Jiang, Jonathan Cameron, Laurent Pinchart,
Matthias Brugger, Ming Qian, Sakari Ailus, Steve Cho,
Tiffany Lin, Tzung-Bi Shih, Yong Wu, Yunfei Dong,
linux-arm-kernel, linux-kernel, linux-media, linux-mediatek
Em Mon, 14 Mar 2022 16:02:43 +0100
AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> escreveu:
> Il 14/03/22 15:37, Mauro Carvalho Chehab ha scritto:
> > Em Mon, 14 Mar 2022 09:09:45 -0400
> > Nicolas Dufresne <nicolas.dufresne@collabora.com> escreveu:
> >
> >> Le dimanche 13 mars 2022 à 11:51 +0100, Mauro Carvalho Chehab a écrit :
> >>> As the end goal is to have platform drivers split by vendor,
> >>> rename mtk-vcodec/ to mediatek/mtk-vcodec/.
> >>
> >> Was thinking all these mtk-* directory didn't fit with the platform/ semantic. I
> >> totally support this change. I suppose jpeg/mdp/vpu also needs to be moved. And
> >> mdp3 and various vcodec patches will need a new submission.
> >
> > They were all moved too, each one on a separate patch in this series:
> >
>
> Hello Mauro, Nicolas
>
> I was wondering if we could also drop the 'mtk-' prefix from the folder names,
> as 'mtk' effectively stands for 'mediatek'... so we would have them as:
>
> mediatek/jpeg
> mediatek/mdp
> mediatek/mdp3
Hmm... I guess this one didn't reach upstream yet.
> mediatek/vcodec
> mediatek/vpu
>
> mediatek/mtk-... looks a bit repetitive :)
Ok, but I'll likely place this on a separate patch at the end of this
series. Rebasing such series has been no fun ;-)
>
> Cheers,
> Angelo
>
> > $ LANG=C tree -d drivers/media/platform/
> > drivers/media/platform/
> > |-- allegro-dvt
> > |-- allwinner
> > | |-- sun4i-csi
> > | |-- sun6i-csi
> > | |-- sun8i-di
> > | `-- sun8i-rotate
> > |-- amlogic
> > | `-- meson-ge2d
> > |-- amphion
> > |-- aspeed
> > |-- atmel
> > |-- cadence
> > |-- chips-media
> > |-- intel
> > |-- marvell
> > |-- mediatek
> > | |-- mtk-jpeg
> > | |-- mtk-mdp
> > | |-- mtk-vcodec
> > | | |-- vdec
> > | | `-- venc
> > | `-- mtk-vpu
> > |-- nvidia
> > | `-- tegra-vde
> > |-- nxp
> > | `-- imx-jpeg
> > |-- qcom
> > | |-- camss
> > | `-- venus
> > |-- renesas
> > | |-- rcar-vin
> > | `-- vsp1
> > |-- rockchip
> > | |-- rga
> > | `-- rkisp1
> > |-- samsung
> > | |-- exynos-gsc
> > | |-- exynos4-is
> > | |-- s3c-camif
> > | |-- s5p-g2d
> > | |-- s5p-jpeg
> > | `-- s5p-mfc
> > |-- stm
> > | |-- sti
> > | | |-- bdisp
> > | | |-- c8sectpfe
> > | | |-- delta
> > | | `-- hva
> > | `-- stm32
> > | `-- dma2d
> > |-- ti
> > | |-- am437x
> > | |-- cal
> > | |-- davinci
> > | |-- omap
> > | |-- omap3isp
> > | `-- vpe
> > |-- ti-vpe
> > |-- via
> > `-- xilinx
> >
> >>
> >>>
> >>> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> >>
> >> Acked-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
> >>
> >>> ---
> >>>
> >>> To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
> >>> See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
> >>>
> >>> MAINTAINERS | 2 +-
> >>> drivers/media/platform/Kconfig | 2 +-
> >>> drivers/media/platform/Makefile | 2 +-
> >>> drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig | 0
> >>> drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h | 0
> >>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c | 0
> >>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c | 0
> >>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h | 0
> >>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c | 0
> >>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h | 0
> >>> .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c | 0
> >>> .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h | 0
> >>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c | 0
> >>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c | 0
> >>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h | 0
> >>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h | 0
> >>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c | 0
> >>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h | 0
> >>> .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c | 0
> >>> .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h | 0
> >>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c | 0
> >>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h | 0
> >>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h | 0
> >>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c | 0
> >>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h | 0
> >>> .../platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c | 0
> >>> .../media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h | 0
> >>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c | 0
> >>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h | 0
> >>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h | 0
> >>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c | 0
> >>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h | 0
> >>> 49 files changed, 3 insertions(+), 3 deletions(-)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c (100%)
> >>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h (100%)
> >>>
> >>> diff --git a/MAINTAINERS b/MAINTAINERS
> >>> index 2203d98bbcf1..bfe014870a77 100644
> >>> --- a/MAINTAINERS
> >>> +++ b/MAINTAINERS
> >>> @@ -12147,7 +12147,7 @@ M: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
> >>> S: Supported
> >>> F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt
> >>> F: Documentation/devicetree/bindings/media/mediatek-vpu.txt
> >>> -F: drivers/media/platform/mtk-vcodec/
> >>> +F: drivers/media/platform/mediatek/mtk-vcodec/
> >>> F: drivers/media/platform/mtk-vpu/
> >>>
> >>> MEDIATEK MMC/SD/SDIO DRIVER
> >>> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> >>> index a45fd3fe103e..8ba10b657164 100644
> >>> --- a/drivers/media/platform/Kconfig
> >>> +++ b/drivers/media/platform/Kconfig
> >>> @@ -80,7 +80,7 @@ source "drivers/media/platform/intel/Kconfig"
> >>> source "drivers/media/platform/marvell/Kconfig"
> >>> source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
> >>> source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
> >>> -source "drivers/media/platform/mtk-vcodec/Kconfig"
> >>> +source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
> >>> source "drivers/media/platform/mtk-vpu/Kconfig"
> >>> source "drivers/media/platform/nxp/Kconfig"
> >>> source "drivers/media/platform/omap/Kconfig"
> >>> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
> >>> index 6f5d09cd8f9b..637a3a7ac036 100644
> >>> --- a/drivers/media/platform/Makefile
> >>> +++ b/drivers/media/platform/Makefile
> >>> @@ -20,7 +20,7 @@ obj-y += intel/
> >>> obj-y += marvell/
> >>> obj-y += mediatek/mtk-jpeg/
> >>> obj-y += mediatek/mtk-mdp/
> >>> -obj-y += mtk-vcodec/
> >>> +obj-y += mediatek/mtk-vcodec/
> >>> obj-y += mtk-vpu/
> >>> obj-y += nxp/
> >>> obj-y += omap/
> >>> diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/platform/mediatek/mtk-vcodec/Kconfig
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/Kconfig
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig
> >>> diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mediatek/mtk-vcodec/Makefile
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/Makefile
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/vdec_drv_base.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/venc_drv_base.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/venc_drv_if.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/venc_drv_if.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/venc_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
> >>> diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.c
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
> >>> diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
> >>> similarity index 100%
> >>> rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.h
> >>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
> >>
> >
> >
> >
> > Thanks,
> > Mauro
>
>
Thanks,
Mauro
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/
2022-03-14 15:42 ` Mauro Carvalho Chehab
@ 2022-03-14 15:43 ` AngeloGioacchino Del Regno
0 siblings, 0 replies; 31+ messages in thread
From: AngeloGioacchino Del Regno @ 2022-03-14 15:43 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Nicolas Dufresne, Niklas Söderlund, Alexandre Courbot,
Andrew-CT Chen, Benjamin Gaignard, Christophe JAILLET,
Dmitry Osipenko, Eugen Hristev, Hans Verkuil, Hirokazu Honda,
Hsin-Yi Wang, Irui Wang, Jacopo Mondi, Jernej Skrabec,
Jiasheng Jiang, Jonathan Cameron, Laurent Pinchart,
Matthias Brugger, Ming Qian, Sakari Ailus, Steve Cho,
Tiffany Lin, Tzung-Bi Shih, Yong Wu, Yunfei Dong,
linux-arm-kernel, linux-kernel, linux-media, linux-mediatek
Il 14/03/22 16:42, Mauro Carvalho Chehab ha scritto:
> Em Mon, 14 Mar 2022 16:02:43 +0100
> AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> escreveu:
>
>> Il 14/03/22 15:37, Mauro Carvalho Chehab ha scritto:
>>> Em Mon, 14 Mar 2022 09:09:45 -0400
>>> Nicolas Dufresne <nicolas.dufresne@collabora.com> escreveu:
>>>
>>>> Le dimanche 13 mars 2022 à 11:51 +0100, Mauro Carvalho Chehab a écrit :
>>>>> As the end goal is to have platform drivers split by vendor,
>>>>> rename mtk-vcodec/ to mediatek/mtk-vcodec/.
>>>>
>>>> Was thinking all these mtk-* directory didn't fit with the platform/ semantic. I
>>>> totally support this change. I suppose jpeg/mdp/vpu also needs to be moved. And
>>>> mdp3 and various vcodec patches will need a new submission.
>>>
>>> They were all moved too, each one on a separate patch in this series:
>>>
>>
>> Hello Mauro, Nicolas
>>
>> I was wondering if we could also drop the 'mtk-' prefix from the folder names,
>> as 'mtk' effectively stands for 'mediatek'... so we would have them as:
>>
>> mediatek/jpeg
>> mediatek/mdp
>
>> mediatek/mdp3
>
> Hmm... I guess this one didn't reach upstream yet.
Hehehe, sorry, I tend to always think forward... sometimes too much :))
>
>> mediatek/vcodec
>> mediatek/vpu
>>
>> mediatek/mtk-... looks a bit repetitive :)
>
> Ok, but I'll likely place this on a separate patch at the end of this
> series. Rebasing such series has been no fun ;-)
>
Sure, thank you!
>>
>> Cheers,
>> Angelo
>>
>>> $ LANG=C tree -d drivers/media/platform/
>>> drivers/media/platform/
>>> |-- allegro-dvt
>>> |-- allwinner
>>> | |-- sun4i-csi
>>> | |-- sun6i-csi
>>> | |-- sun8i-di
>>> | `-- sun8i-rotate
>>> |-- amlogic
>>> | `-- meson-ge2d
>>> |-- amphion
>>> |-- aspeed
>>> |-- atmel
>>> |-- cadence
>>> |-- chips-media
>>> |-- intel
>>> |-- marvell
>>> |-- mediatek
>>> | |-- mtk-jpeg
>>> | |-- mtk-mdp
>>> | |-- mtk-vcodec
>>> | | |-- vdec
>>> | | `-- venc
>>> | `-- mtk-vpu
>>> |-- nvidia
>>> | `-- tegra-vde
>>> |-- nxp
>>> | `-- imx-jpeg
>>> |-- qcom
>>> | |-- camss
>>> | `-- venus
>>> |-- renesas
>>> | |-- rcar-vin
>>> | `-- vsp1
>>> |-- rockchip
>>> | |-- rga
>>> | `-- rkisp1
>>> |-- samsung
>>> | |-- exynos-gsc
>>> | |-- exynos4-is
>>> | |-- s3c-camif
>>> | |-- s5p-g2d
>>> | |-- s5p-jpeg
>>> | `-- s5p-mfc
>>> |-- stm
>>> | |-- sti
>>> | | |-- bdisp
>>> | | |-- c8sectpfe
>>> | | |-- delta
>>> | | `-- hva
>>> | `-- stm32
>>> | `-- dma2d
>>> |-- ti
>>> | |-- am437x
>>> | |-- cal
>>> | |-- davinci
>>> | |-- omap
>>> | |-- omap3isp
>>> | `-- vpe
>>> |-- ti-vpe
>>> |-- via
>>> `-- xilinx
>>>
>>>>
>>>>>
>>>>> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
>>>>
>>>> Acked-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
>>>>
>>>>> ---
>>>>>
>>>>> To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
>>>>> See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
>>>>>
>>>>> MAINTAINERS | 2 +-
>>>>> drivers/media/platform/Kconfig | 2 +-
>>>>> drivers/media/platform/Makefile | 2 +-
>>>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig | 0
>>>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h | 0
>>>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c | 0
>>>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c | 0
>>>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h | 0
>>>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c | 0
>>>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h | 0
>>>>> .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c | 0
>>>>> .../{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h | 0
>>>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c | 0
>>>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c | 0
>>>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h | 0
>>>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h | 0
>>>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c | 0
>>>>> .../platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h | 0
>>>>> .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c | 0
>>>>> .../platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h | 0
>>>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c | 0
>>>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h | 0
>>>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h | 0
>>>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c | 0
>>>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h | 0
>>>>> .../platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c | 0
>>>>> .../media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h | 0
>>>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c | 0
>>>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h | 0
>>>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h | 0
>>>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c | 0
>>>>> drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h | 0
>>>>> 49 files changed, 3 insertions(+), 3 deletions(-)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Kconfig (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/Makefile (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_drv.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_hw.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_pm.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateful.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_dec_stateless.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_drv.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_drv.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_enc_pm.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_priv.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_scp.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_fw_vpu.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_intr.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/mtk_vcodec_util.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_if.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_h264_req_if.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp8_if.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec/vdec_vp9_if.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_base.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_drv_if.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_msg_queue.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/vdec_vpu_if.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_h264_if.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc/venc_vp8_if.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_base.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_drv_if.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_ipi_msg.h (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.c (100%)
>>>>> rename drivers/media/platform/{ => mediatek}/mtk-vcodec/venc_vpu_if.h (100%)
>>>>>
>>>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>>>> index 2203d98bbcf1..bfe014870a77 100644
>>>>> --- a/MAINTAINERS
>>>>> +++ b/MAINTAINERS
>>>>> @@ -12147,7 +12147,7 @@ M: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
>>>>> S: Supported
>>>>> F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt
>>>>> F: Documentation/devicetree/bindings/media/mediatek-vpu.txt
>>>>> -F: drivers/media/platform/mtk-vcodec/
>>>>> +F: drivers/media/platform/mediatek/mtk-vcodec/
>>>>> F: drivers/media/platform/mtk-vpu/
>>>>>
>>>>> MEDIATEK MMC/SD/SDIO DRIVER
>>>>> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
>>>>> index a45fd3fe103e..8ba10b657164 100644
>>>>> --- a/drivers/media/platform/Kconfig
>>>>> +++ b/drivers/media/platform/Kconfig
>>>>> @@ -80,7 +80,7 @@ source "drivers/media/platform/intel/Kconfig"
>>>>> source "drivers/media/platform/marvell/Kconfig"
>>>>> source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
>>>>> source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
>>>>> -source "drivers/media/platform/mtk-vcodec/Kconfig"
>>>>> +source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
>>>>> source "drivers/media/platform/mtk-vpu/Kconfig"
>>>>> source "drivers/media/platform/nxp/Kconfig"
>>>>> source "drivers/media/platform/omap/Kconfig"
>>>>> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
>>>>> index 6f5d09cd8f9b..637a3a7ac036 100644
>>>>> --- a/drivers/media/platform/Makefile
>>>>> +++ b/drivers/media/platform/Makefile
>>>>> @@ -20,7 +20,7 @@ obj-y += intel/
>>>>> obj-y += marvell/
>>>>> obj-y += mediatek/mtk-jpeg/
>>>>> obj-y += mediatek/mtk-mdp/
>>>>> -obj-y += mtk-vcodec/
>>>>> +obj-y += mediatek/mtk-vcodec/
>>>>> obj-y += mtk-vpu/
>>>>> obj-y += nxp/
>>>>> obj-y += omap/
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/platform/mediatek/mtk-vcodec/Kconfig
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/Kconfig
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/Makefile b/drivers/media/platform/mediatek/mtk-vcodec/Makefile
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/Makefile
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h b/drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/vdec_drv_base.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/vdec_drv_if.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_msg_queue.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/vdec_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_base.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/venc_drv_base.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/venc_drv_if.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/venc_drv_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/venc_drv_if.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/venc_ipi_msg.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.c
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c
>>>>> diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
>>>>> similarity index 100%
>>>>> rename from drivers/media/platform/mtk-vcodec/venc_vpu_if.h
>>>>> rename to drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
>>>>
>>>
>>>
>>>
>>> Thanks,
>>> Mauro
>>
>>
>
>
>
> Thanks,
> Mauro
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 07/24] media: platform: rename mtk-vpu/ to mediatek/mtk-vpu/
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
` (4 preceding siblings ...)
2022-03-13 10:51 ` [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/ Mauro Carvalho Chehab
@ 2022-03-13 10:51 ` Mauro Carvalho Chehab
2022-03-13 10:51 ` [PATCH 08/24] media: platform: rename sunxi/ to allwinner/ Mauro Carvalho Chehab
` (10 subsequent siblings)
16 siblings, 0 replies; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:51 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Andrew-CT Chen,
Christophe JAILLET, Dafna Hirschfeld, Ding Senjie,
Dmitry Osipenko, Eugen Hristev, Hans Verkuil, Houlong Wei,
Jacopo Mondi, Jernej Skrabec, Lad Prabhakar, Laurent Pinchart,
Matthias Brugger, Ming Qian, Minghsiu Tsai, Sakari Ailus,
Tiffany Lin, linux-arm-kernel, linux-kernel, linux-media,
linux-mediatek
As the end goal is to have platform drivers split by vendor,
rename mtk-vpu/ to mediatek/mtk-vpu/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
MAINTAINERS | 4 ++--
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/mediatek/mtk-mdp/Makefile | 2 +-
drivers/media/platform/{ => mediatek}/mtk-vpu/Kconfig | 0
drivers/media/platform/{ => mediatek}/mtk-vpu/Makefile | 0
drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.c | 0
drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.h | 0
8 files changed, 5 insertions(+), 5 deletions(-)
rename drivers/media/platform/{ => mediatek}/mtk-vpu/Kconfig (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vpu/Makefile (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.c (100%)
rename drivers/media/platform/{ => mediatek}/mtk-vpu/mtk_vpu.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index bfe014870a77..58e0d42b1278 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12139,7 +12139,7 @@ M: Andrew-CT Chen <andrew-ct.chen@mediatek.com>
S: Supported
F: Documentation/devicetree/bindings/media/mediatek-mdp.txt
F: drivers/media/platform/mediatek/mtk-mdp/
-F: drivers/media/platform/mtk-vpu/
+F: drivers/media/platform/mediatek/mtk-vpu/
MEDIATEK MEDIA DRIVER
M: Tiffany Lin <tiffany.lin@mediatek.com>
@@ -12148,7 +12148,7 @@ S: Supported
F: Documentation/devicetree/bindings/media/mediatek-vcodec.txt
F: Documentation/devicetree/bindings/media/mediatek-vpu.txt
F: drivers/media/platform/mediatek/mtk-vcodec/
-F: drivers/media/platform/mtk-vpu/
+F: drivers/media/platform/mediatek/mtk-vpu/
MEDIATEK MMC/SD/SDIO DRIVER
M: Chaotian Jing <chaotian.jing@mediatek.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 8ba10b657164..33f8f41b2771 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -81,7 +81,7 @@ source "drivers/media/platform/marvell/Kconfig"
source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
-source "drivers/media/platform/mtk-vpu/Kconfig"
+source "drivers/media/platform/mediatek/mtk-vpu/Kconfig"
source "drivers/media/platform/nxp/Kconfig"
source "drivers/media/platform/omap/Kconfig"
source "drivers/media/platform/omap3isp/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 637a3a7ac036..954ad8f2cde1 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -21,7 +21,7 @@ obj-y += marvell/
obj-y += mediatek/mtk-jpeg/
obj-y += mediatek/mtk-mdp/
obj-y += mediatek/mtk-vcodec/
-obj-y += mtk-vpu/
+obj-y += mediatek/mtk-vpu/
obj-y += nxp/
obj-y += omap/
obj-y += omap3isp/
diff --git a/drivers/media/platform/mediatek/mtk-mdp/Makefile b/drivers/media/platform/mediatek/mtk-mdp/Makefile
index 5982d65c9971..eab6f984aeea 100644
--- a/drivers/media/platform/mediatek/mtk-mdp/Makefile
+++ b/drivers/media/platform/mediatek/mtk-mdp/Makefile
@@ -7,4 +7,4 @@ mtk-mdp-y += mtk_mdp_vpu.o
obj-$(CONFIG_VIDEO_MEDIATEK_MDP) += mtk-mdp.o
-ccflags-y += -I$(srctree)/drivers/media/platform/mtk-vpu
+ccflags-y += -I$(srctree)/drivers/media/platform/mediatek/mtk-vpu
diff --git a/drivers/media/platform/mtk-vpu/Kconfig b/drivers/media/platform/mediatek/mtk-vpu/Kconfig
similarity index 100%
rename from drivers/media/platform/mtk-vpu/Kconfig
rename to drivers/media/platform/mediatek/mtk-vpu/Kconfig
diff --git a/drivers/media/platform/mtk-vpu/Makefile b/drivers/media/platform/mediatek/mtk-vpu/Makefile
similarity index 100%
rename from drivers/media/platform/mtk-vpu/Makefile
rename to drivers/media/platform/mediatek/mtk-vpu/Makefile
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.c b/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c
similarity index 100%
rename from drivers/media/platform/mtk-vpu/mtk_vpu.c
rename to drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c
diff --git a/drivers/media/platform/mtk-vpu/mtk_vpu.h b/drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h
similarity index 100%
rename from drivers/media/platform/mtk-vpu/mtk_vpu.h
rename to drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 08/24] media: platform: rename sunxi/ to allwinner/
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
` (5 preceding siblings ...)
2022-03-13 10:51 ` [PATCH 07/24] media: platform: rename mtk-vpu/ to mediatek/mtk-vpu/ Mauro Carvalho Chehab
@ 2022-03-13 10:51 ` Mauro Carvalho Chehab
2022-03-13 10:51 ` [PATCH 10/24] media: platform: rename amphion/ to nxp/amphion/ Mauro Carvalho Chehab
` (9 subsequent siblings)
16 siblings, 0 replies; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:51 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Cai Huoqing,
Chen-Yu Tsai, Dinghao Liu, Dmitry Osipenko, Eugen Hristev,
Ezequiel Garcia, Hans Verkuil, Jacopo Mondi, Jernej Skrabec,
Jia-Ju Bai, Jonathan Cameron, Laurent Pinchart, Maxime Ripard,
Mikhail Rudenko, Ming Qian, Ondrej Jirman, Robert Foss,
Rui Miguel Silva, Sakari Ailus, Tomi Valkeinen, Yong Deng,
linux-arm-kernel, linux-kernel, linux-media, linux-sunxi
As the end goal is to have platform drivers split by vendor,
rename sunxi/ to allwinner/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
MAINTAINERS | 8 ++++----
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/allwinner/Kconfig | 6 ++++++
drivers/media/platform/{sunxi => allwinner}/Makefile | 0
.../media/platform/{sunxi => allwinner}/sun4i-csi/Kconfig | 0
.../platform/{sunxi => allwinner}/sun4i-csi/Makefile | 0
.../platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.c | 0
.../platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.h | 0
.../platform/{sunxi => allwinner}/sun4i-csi/sun4i_dma.c | 0
.../platform/{sunxi => allwinner}/sun4i-csi/sun4i_v4l2.c | 0
.../media/platform/{sunxi => allwinner}/sun6i-csi/Kconfig | 0
.../platform/{sunxi => allwinner}/sun6i-csi/Makefile | 0
.../platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.c | 0
.../platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.h | 0
.../{sunxi => allwinner}/sun6i-csi/sun6i_csi_reg.h | 0
.../platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.c | 0
.../platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.h | 0
.../media/platform/{sunxi => allwinner}/sun8i-di/Kconfig | 0
.../media/platform/{sunxi => allwinner}/sun8i-di/Makefile | 0
.../platform/{sunxi => allwinner}/sun8i-di/sun8i-di.c | 0
.../platform/{sunxi => allwinner}/sun8i-di/sun8i-di.h | 0
.../platform/{sunxi => allwinner}/sun8i-rotate/Kconfig | 0
.../platform/{sunxi => allwinner}/sun8i-rotate/Makefile | 0
.../{sunxi => allwinner}/sun8i-rotate/sun8i-formats.h | 0
.../{sunxi => allwinner}/sun8i-rotate/sun8i-rotate.h | 0
.../{sunxi => allwinner}/sun8i-rotate/sun8i_formats.c | 0
.../{sunxi => allwinner}/sun8i-rotate/sun8i_rotate.c | 0
drivers/media/platform/sunxi/Kconfig | 6 ------
29 files changed, 12 insertions(+), 12 deletions(-)
create mode 100644 drivers/media/platform/allwinner/Kconfig
rename drivers/media/platform/{sunxi => allwinner}/Makefile (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/Kconfig (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/Makefile (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.c (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_csi.h (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_dma.c (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun4i-csi/sun4i_v4l2.c (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/Kconfig (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/Makefile (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.c (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi.h (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_csi_reg.h (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.c (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun6i-csi/sun6i_video.h (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/Kconfig (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/Makefile (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/sun8i-di.c (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-di/sun8i-di.h (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/Kconfig (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/Makefile (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i-formats.h (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i-rotate.h (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i_formats.c (100%)
rename drivers/media/platform/{sunxi => allwinner}/sun8i-rotate/sun8i_rotate.c (100%)
delete mode 100644 drivers/media/platform/sunxi/Kconfig
diff --git a/MAINTAINERS b/MAINTAINERS
index 58e0d42b1278..f29195850c16 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -750,7 +750,7 @@ L: linux-media@vger.kernel.org
S: Maintained
T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml
-F: drivers/media/platform/sunxi/sun4i-csi/
+F: drivers/media/platform/allwinner/sun4i-csi/
ALLWINNER CPUFREQ DRIVER
M: Yangtao Li <tiny.windzz@gmail.com>
@@ -5114,7 +5114,7 @@ L: linux-media@vger.kernel.org
S: Maintained
T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/allwinner,sun6i-a31-csi.yaml
-F: drivers/media/platform/sunxi/sun6i-csi/
+F: drivers/media/platform/allwinner/sun6i-csi/
CW1200 WLAN driver
M: Solomon Peachy <pizza@shaftnet.org>
@@ -5391,7 +5391,7 @@ L: linux-media@vger.kernel.org
S: Maintained
T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
-F: drivers/media/platform/sunxi/sun8i-di/
+F: drivers/media/platform/allwinner/sun8i-di/
DELL LAPTOP DRIVER
M: Matthew Garrett <mjg59@srcf.ucam.org>
@@ -16746,7 +16746,7 @@ L: linux-media@vger.kernel.org
S: Maintained
T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/allwinner,sun8i-a83t-de2-rotate.yaml
-F: drivers/media/platform/sunxi/sun8i-rotate/
+F: drivers/media/platform/allwinner/sun8i-rotate/
RPMSG TTY DRIVER
M: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 33f8f41b2771..5ffbbd6c6f91 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -66,6 +66,7 @@ config VIDEO_MUX
# TODO: create per-manufacturer directories
source "drivers/media/platform/allegro-dvt/Kconfig"
+source "drivers/media/platform/allwinner/Kconfig"
source "drivers/media/platform/am437x/Kconfig"
source "drivers/media/platform/amlogic/meson-ge2d/Kconfig"
source "drivers/media/platform/amphion/Kconfig"
@@ -94,7 +95,6 @@ source "drivers/media/platform/s5p-jpeg/Kconfig"
source "drivers/media/platform/s5p-mfc/Kconfig"
source "drivers/media/platform/sti/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
-source "drivers/media/platform/sunxi/Kconfig"
source "drivers/media/platform/tegra/vde/Kconfig"
source "drivers/media/platform/ti-vpe/Kconfig"
source "drivers/media/platform/via/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 954ad8f2cde1..88519e902919 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -6,6 +6,7 @@
# Place here, alphabetically sorted by directory
# (e. g. LC_ALL=C sort Makefile)
obj-y += allegro-dvt/
+obj-y += allwinner/
obj-y += am437x/
obj-y += amlogic/meson-ge2d/
obj-y += amphion/
@@ -39,7 +40,6 @@ obj-y += sti/c8sectpfe/
obj-y += sti/delta/
obj-y += sti/hva/
obj-y += stm32/
-obj-y += sunxi/
obj-y += tegra/vde/
obj-y += ti-vpe/
obj-y += via/
diff --git a/drivers/media/platform/allwinner/Kconfig b/drivers/media/platform/allwinner/Kconfig
new file mode 100644
index 000000000000..88bffb055528
--- /dev/null
+++ b/drivers/media/platform/allwinner/Kconfig
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+
+source "drivers/media/platform/allwinner/sun4i-csi/Kconfig"
+source "drivers/media/platform/allwinner/sun6i-csi/Kconfig"
+source "drivers/media/platform/allwinner/sun8i-di/Kconfig"
+source "drivers/media/platform/allwinner/sun8i-rotate/Kconfig"
diff --git a/drivers/media/platform/sunxi/Makefile b/drivers/media/platform/allwinner/Makefile
similarity index 100%
rename from drivers/media/platform/sunxi/Makefile
rename to drivers/media/platform/allwinner/Makefile
diff --git a/drivers/media/platform/sunxi/sun4i-csi/Kconfig b/drivers/media/platform/allwinner/sun4i-csi/Kconfig
similarity index 100%
rename from drivers/media/platform/sunxi/sun4i-csi/Kconfig
rename to drivers/media/platform/allwinner/sun4i-csi/Kconfig
diff --git a/drivers/media/platform/sunxi/sun4i-csi/Makefile b/drivers/media/platform/allwinner/sun4i-csi/Makefile
similarity index 100%
rename from drivers/media/platform/sunxi/sun4i-csi/Makefile
rename to drivers/media/platform/allwinner/sun4i-csi/Makefile
diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c b/drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c
rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.c
diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h b/drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.h
similarity index 100%
rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h
rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.h
diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c b/drivers/media/platform/allwinner/sun4i-csi/sun4i_dma.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_dma.c
diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c b/drivers/media/platform/allwinner/sun4i-csi/sun4i_v4l2.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
rename to drivers/media/platform/allwinner/sun4i-csi/sun4i_v4l2.c
diff --git a/drivers/media/platform/sunxi/sun6i-csi/Kconfig b/drivers/media/platform/allwinner/sun6i-csi/Kconfig
similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/Kconfig
rename to drivers/media/platform/allwinner/sun6i-csi/Kconfig
diff --git a/drivers/media/platform/sunxi/sun6i-csi/Makefile b/drivers/media/platform/allwinner/sun6i-csi/Makefile
similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/Makefile
rename to drivers/media/platform/allwinner/sun6i-csi/Makefile
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.c
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h b/drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.h
similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.h
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h b/drivers/media/platform/allwinner/sun6i-csi/sun6i_csi_reg.h
similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h
rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_csi_reg.h
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c b/drivers/media/platform/allwinner/sun6i-csi/sun6i_video.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c
rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_video.c
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h b/drivers/media/platform/allwinner/sun6i-csi/sun6i_video.h
similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h
rename to drivers/media/platform/allwinner/sun6i-csi/sun6i_video.h
diff --git a/drivers/media/platform/sunxi/sun8i-di/Kconfig b/drivers/media/platform/allwinner/sun8i-di/Kconfig
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-di/Kconfig
rename to drivers/media/platform/allwinner/sun8i-di/Kconfig
diff --git a/drivers/media/platform/sunxi/sun8i-di/Makefile b/drivers/media/platform/allwinner/sun8i-di/Makefile
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-di/Makefile
rename to drivers/media/platform/allwinner/sun8i-di/Makefile
diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c b/drivers/media/platform/allwinner/sun8i-di/sun8i-di.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-di/sun8i-di.c
rename to drivers/media/platform/allwinner/sun8i-di/sun8i-di.c
diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.h b/drivers/media/platform/allwinner/sun8i-di/sun8i-di.h
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-di/sun8i-di.h
rename to drivers/media/platform/allwinner/sun8i-di/sun8i-di.h
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/Kconfig b/drivers/media/platform/allwinner/sun8i-rotate/Kconfig
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-rotate/Kconfig
rename to drivers/media/platform/allwinner/sun8i-rotate/Kconfig
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/Makefile b/drivers/media/platform/allwinner/sun8i-rotate/Makefile
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-rotate/Makefile
rename to drivers/media/platform/allwinner/sun8i-rotate/Makefile
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h b/drivers/media/platform/allwinner/sun8i-rotate/sun8i-formats.h
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h
rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i-formats.h
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h b/drivers/media/platform/allwinner/sun8i-rotate/sun8i-rotate.h
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h
rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i-rotate.h
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c b/drivers/media/platform/allwinner/sun8i-rotate/sun8i_formats.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c
rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i_formats.c
diff --git a/drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c b/drivers/media/platform/allwinner/sun8i-rotate/sun8i_rotate.c
similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c
rename to drivers/media/platform/allwinner/sun8i-rotate/sun8i_rotate.c
diff --git a/drivers/media/platform/sunxi/Kconfig b/drivers/media/platform/sunxi/Kconfig
deleted file mode 100644
index a10032215b08..000000000000
--- a/drivers/media/platform/sunxi/Kconfig
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-
-source "drivers/media/platform/sunxi/sun4i-csi/Kconfig"
-source "drivers/media/platform/sunxi/sun6i-csi/Kconfig"
-source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
-source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig"
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 10/24] media: platform: rename amphion/ to nxp/amphion/
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
` (6 preceding siblings ...)
2022-03-13 10:51 ` [PATCH 08/24] media: platform: rename sunxi/ to allwinner/ Mauro Carvalho Chehab
@ 2022-03-13 10:51 ` Mauro Carvalho Chehab
2022-03-15 18:26 ` Nicolas Dufresne
2022-03-13 10:51 ` [PATCH 11/24] media: platform: rename exynos4-is/ to samsung/exynos4-is/ Mauro Carvalho Chehab
` (8 subsequent siblings)
16 siblings, 1 reply; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:51 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Dmitry Osipenko,
Eugen Hristev, Fabio Estevam, Hans Verkuil, Jacopo Mondi,
Jernej Skrabec, Laurent Pinchart, Ming Qian, NXP Linux Team,
Pengutronix Kernel Team, Sakari Ailus, Sascha Hauer, Shawn Guo,
Shijie Qin, Zhou Peng, linux-arm-kernel, linux-kernel,
linux-media
As the end goal is to have platform drivers split by vendor,
rename amphion/ to nxp/amphion/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => nxp}/amphion/Kconfig | 0
drivers/media/platform/{ => nxp}/amphion/Makefile | 0
drivers/media/platform/{ => nxp}/amphion/vdec.c | 0
drivers/media/platform/{ => nxp}/amphion/venc.c | 0
drivers/media/platform/{ => nxp}/amphion/vpu.h | 0
drivers/media/platform/{ => nxp}/amphion/vpu_cmds.c | 0
drivers/media/platform/{ => nxp}/amphion/vpu_cmds.h | 0
drivers/media/platform/{ => nxp}/amphion/vpu_codec.h | 0
drivers/media/platform/{ => nxp}/amphion/vpu_color.c | 0
drivers/media/platform/{ => nxp}/amphion/vpu_core.c | 0
drivers/media/platform/{ => nxp}/amphion/vpu_core.h | 0
drivers/media/platform/{ => nxp}/amphion/vpu_dbg.c | 0
drivers/media/platform/{ => nxp}/amphion/vpu_defs.h | 0
drivers/media/platform/{ => nxp}/amphion/vpu_drv.c | 0
drivers/media/platform/{ => nxp}/amphion/vpu_helpers.c | 0
drivers/media/platform/{ => nxp}/amphion/vpu_helpers.h | 0
drivers/media/platform/{ => nxp}/amphion/vpu_imx8q.c | 0
drivers/media/platform/{ => nxp}/amphion/vpu_imx8q.h | 0
drivers/media/platform/{ => nxp}/amphion/vpu_malone.c | 0
drivers/media/platform/{ => nxp}/amphion/vpu_malone.h | 0
drivers/media/platform/{ => nxp}/amphion/vpu_mbox.c | 0
drivers/media/platform/{ => nxp}/amphion/vpu_mbox.h | 0
drivers/media/platform/{ => nxp}/amphion/vpu_msgs.c | 0
drivers/media/platform/{ => nxp}/amphion/vpu_msgs.h | 0
drivers/media/platform/{ => nxp}/amphion/vpu_rpc.c | 0
drivers/media/platform/{ => nxp}/amphion/vpu_rpc.h | 0
drivers/media/platform/{ => nxp}/amphion/vpu_v4l2.c | 0
drivers/media/platform/{ => nxp}/amphion/vpu_v4l2.h | 0
drivers/media/platform/{ => nxp}/amphion/vpu_windsor.c | 0
drivers/media/platform/{ => nxp}/amphion/vpu_windsor.h | 0
33 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/media/platform/{ => nxp}/amphion/Kconfig (100%)
rename drivers/media/platform/{ => nxp}/amphion/Makefile (100%)
rename drivers/media/platform/{ => nxp}/amphion/vdec.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/venc.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu.h (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_cmds.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_cmds.h (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_codec.h (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_color.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_core.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_core.h (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_dbg.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_defs.h (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_drv.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_helpers.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_helpers.h (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_imx8q.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_imx8q.h (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_malone.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_malone.h (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_mbox.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_mbox.h (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_msgs.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_msgs.h (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_rpc.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_rpc.h (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_v4l2.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_v4l2.h (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_windsor.c (100%)
rename drivers/media/platform/{ => nxp}/amphion/vpu_windsor.h (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index c9333d46047e..74901acf8f06 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1037,7 +1037,7 @@ M: Zhou Peng <eagle.zhou@nxp.com>
L: linux-media@vger.kernel.org
S: Maintained
F: Documentation/devicetree/bindings/media/amphion,vpu.yaml
-F: drivers/media/platform/amphion/
+F: drivers/media/platform/nxp/amphion/
AMS AS73211 DRIVER
M: Christian Eggers <ceggers@arri.de>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index f07ab9a98e3b..2e3925408aa0 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -69,7 +69,6 @@ source "drivers/media/platform/allegro-dvt/Kconfig"
source "drivers/media/platform/allwinner/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"
source "drivers/media/platform/cadence/Kconfig"
@@ -85,6 +84,7 @@ source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
source "drivers/media/platform/mediatek/mtk-vpu/Kconfig"
source "drivers/media/platform/nvidia/tegra-vde/Kconfig"
source "drivers/media/platform/nxp/Kconfig"
+source "drivers/media/platform/nxp/amphion/Kconfig"
source "drivers/media/platform/omap/Kconfig"
source "drivers/media/platform/omap3isp/Kconfig"
source "drivers/media/platform/qcom/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index ce9909534218..7a28b60dbbe6 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -9,7 +9,6 @@ obj-y += allegro-dvt/
obj-y += allwinner/
obj-y += am437x/
obj-y += amlogic/meson-ge2d/
-obj-y += amphion/
obj-y += aspeed/
obj-y += atmel/
obj-y += cadence/
@@ -25,6 +24,7 @@ obj-y += mediatek/mtk-vcodec/
obj-y += mediatek/mtk-vpu/
obj-y += nvidia/tegra-vde/
obj-y += nxp/
+obj-y += nxp/amphion/
obj-y += omap/
obj-y += omap3isp/
obj-y += qcom/camss/
diff --git a/drivers/media/platform/amphion/Kconfig b/drivers/media/platform/nxp/amphion/Kconfig
similarity index 100%
rename from drivers/media/platform/amphion/Kconfig
rename to drivers/media/platform/nxp/amphion/Kconfig
diff --git a/drivers/media/platform/amphion/Makefile b/drivers/media/platform/nxp/amphion/Makefile
similarity index 100%
rename from drivers/media/platform/amphion/Makefile
rename to drivers/media/platform/nxp/amphion/Makefile
diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform/nxp/amphion/vdec.c
similarity index 100%
rename from drivers/media/platform/amphion/vdec.c
rename to drivers/media/platform/nxp/amphion/vdec.c
diff --git a/drivers/media/platform/amphion/venc.c b/drivers/media/platform/nxp/amphion/venc.c
similarity index 100%
rename from drivers/media/platform/amphion/venc.c
rename to drivers/media/platform/nxp/amphion/venc.c
diff --git a/drivers/media/platform/amphion/vpu.h b/drivers/media/platform/nxp/amphion/vpu.h
similarity index 100%
rename from drivers/media/platform/amphion/vpu.h
rename to drivers/media/platform/nxp/amphion/vpu.h
diff --git a/drivers/media/platform/amphion/vpu_cmds.c b/drivers/media/platform/nxp/amphion/vpu_cmds.c
similarity index 100%
rename from drivers/media/platform/amphion/vpu_cmds.c
rename to drivers/media/platform/nxp/amphion/vpu_cmds.c
diff --git a/drivers/media/platform/amphion/vpu_cmds.h b/drivers/media/platform/nxp/amphion/vpu_cmds.h
similarity index 100%
rename from drivers/media/platform/amphion/vpu_cmds.h
rename to drivers/media/platform/nxp/amphion/vpu_cmds.h
diff --git a/drivers/media/platform/amphion/vpu_codec.h b/drivers/media/platform/nxp/amphion/vpu_codec.h
similarity index 100%
rename from drivers/media/platform/amphion/vpu_codec.h
rename to drivers/media/platform/nxp/amphion/vpu_codec.h
diff --git a/drivers/media/platform/amphion/vpu_color.c b/drivers/media/platform/nxp/amphion/vpu_color.c
similarity index 100%
rename from drivers/media/platform/amphion/vpu_color.c
rename to drivers/media/platform/nxp/amphion/vpu_color.c
diff --git a/drivers/media/platform/amphion/vpu_core.c b/drivers/media/platform/nxp/amphion/vpu_core.c
similarity index 100%
rename from drivers/media/platform/amphion/vpu_core.c
rename to drivers/media/platform/nxp/amphion/vpu_core.c
diff --git a/drivers/media/platform/amphion/vpu_core.h b/drivers/media/platform/nxp/amphion/vpu_core.h
similarity index 100%
rename from drivers/media/platform/amphion/vpu_core.h
rename to drivers/media/platform/nxp/amphion/vpu_core.h
diff --git a/drivers/media/platform/amphion/vpu_dbg.c b/drivers/media/platform/nxp/amphion/vpu_dbg.c
similarity index 100%
rename from drivers/media/platform/amphion/vpu_dbg.c
rename to drivers/media/platform/nxp/amphion/vpu_dbg.c
diff --git a/drivers/media/platform/amphion/vpu_defs.h b/drivers/media/platform/nxp/amphion/vpu_defs.h
similarity index 100%
rename from drivers/media/platform/amphion/vpu_defs.h
rename to drivers/media/platform/nxp/amphion/vpu_defs.h
diff --git a/drivers/media/platform/amphion/vpu_drv.c b/drivers/media/platform/nxp/amphion/vpu_drv.c
similarity index 100%
rename from drivers/media/platform/amphion/vpu_drv.c
rename to drivers/media/platform/nxp/amphion/vpu_drv.c
diff --git a/drivers/media/platform/amphion/vpu_helpers.c b/drivers/media/platform/nxp/amphion/vpu_helpers.c
similarity index 100%
rename from drivers/media/platform/amphion/vpu_helpers.c
rename to drivers/media/platform/nxp/amphion/vpu_helpers.c
diff --git a/drivers/media/platform/amphion/vpu_helpers.h b/drivers/media/platform/nxp/amphion/vpu_helpers.h
similarity index 100%
rename from drivers/media/platform/amphion/vpu_helpers.h
rename to drivers/media/platform/nxp/amphion/vpu_helpers.h
diff --git a/drivers/media/platform/amphion/vpu_imx8q.c b/drivers/media/platform/nxp/amphion/vpu_imx8q.c
similarity index 100%
rename from drivers/media/platform/amphion/vpu_imx8q.c
rename to drivers/media/platform/nxp/amphion/vpu_imx8q.c
diff --git a/drivers/media/platform/amphion/vpu_imx8q.h b/drivers/media/platform/nxp/amphion/vpu_imx8q.h
similarity index 100%
rename from drivers/media/platform/amphion/vpu_imx8q.h
rename to drivers/media/platform/nxp/amphion/vpu_imx8q.h
diff --git a/drivers/media/platform/amphion/vpu_malone.c b/drivers/media/platform/nxp/amphion/vpu_malone.c
similarity index 100%
rename from drivers/media/platform/amphion/vpu_malone.c
rename to drivers/media/platform/nxp/amphion/vpu_malone.c
diff --git a/drivers/media/platform/amphion/vpu_malone.h b/drivers/media/platform/nxp/amphion/vpu_malone.h
similarity index 100%
rename from drivers/media/platform/amphion/vpu_malone.h
rename to drivers/media/platform/nxp/amphion/vpu_malone.h
diff --git a/drivers/media/platform/amphion/vpu_mbox.c b/drivers/media/platform/nxp/amphion/vpu_mbox.c
similarity index 100%
rename from drivers/media/platform/amphion/vpu_mbox.c
rename to drivers/media/platform/nxp/amphion/vpu_mbox.c
diff --git a/drivers/media/platform/amphion/vpu_mbox.h b/drivers/media/platform/nxp/amphion/vpu_mbox.h
similarity index 100%
rename from drivers/media/platform/amphion/vpu_mbox.h
rename to drivers/media/platform/nxp/amphion/vpu_mbox.h
diff --git a/drivers/media/platform/amphion/vpu_msgs.c b/drivers/media/platform/nxp/amphion/vpu_msgs.c
similarity index 100%
rename from drivers/media/platform/amphion/vpu_msgs.c
rename to drivers/media/platform/nxp/amphion/vpu_msgs.c
diff --git a/drivers/media/platform/amphion/vpu_msgs.h b/drivers/media/platform/nxp/amphion/vpu_msgs.h
similarity index 100%
rename from drivers/media/platform/amphion/vpu_msgs.h
rename to drivers/media/platform/nxp/amphion/vpu_msgs.h
diff --git a/drivers/media/platform/amphion/vpu_rpc.c b/drivers/media/platform/nxp/amphion/vpu_rpc.c
similarity index 100%
rename from drivers/media/platform/amphion/vpu_rpc.c
rename to drivers/media/platform/nxp/amphion/vpu_rpc.c
diff --git a/drivers/media/platform/amphion/vpu_rpc.h b/drivers/media/platform/nxp/amphion/vpu_rpc.h
similarity index 100%
rename from drivers/media/platform/amphion/vpu_rpc.h
rename to drivers/media/platform/nxp/amphion/vpu_rpc.h
diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/nxp/amphion/vpu_v4l2.c
similarity index 100%
rename from drivers/media/platform/amphion/vpu_v4l2.c
rename to drivers/media/platform/nxp/amphion/vpu_v4l2.c
diff --git a/drivers/media/platform/amphion/vpu_v4l2.h b/drivers/media/platform/nxp/amphion/vpu_v4l2.h
similarity index 100%
rename from drivers/media/platform/amphion/vpu_v4l2.h
rename to drivers/media/platform/nxp/amphion/vpu_v4l2.h
diff --git a/drivers/media/platform/amphion/vpu_windsor.c b/drivers/media/platform/nxp/amphion/vpu_windsor.c
similarity index 100%
rename from drivers/media/platform/amphion/vpu_windsor.c
rename to drivers/media/platform/nxp/amphion/vpu_windsor.c
diff --git a/drivers/media/platform/amphion/vpu_windsor.h b/drivers/media/platform/nxp/amphion/vpu_windsor.h
similarity index 100%
rename from drivers/media/platform/amphion/vpu_windsor.h
rename to drivers/media/platform/nxp/amphion/vpu_windsor.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* Re: [PATCH 10/24] media: platform: rename amphion/ to nxp/amphion/
2022-03-13 10:51 ` [PATCH 10/24] media: platform: rename amphion/ to nxp/amphion/ Mauro Carvalho Chehab
@ 2022-03-15 18:26 ` Nicolas Dufresne
0 siblings, 0 replies; 31+ messages in thread
From: Nicolas Dufresne @ 2022-03-15 18:26 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Niklas Söderlund, Dmitry Osipenko, Eugen Hristev,
Fabio Estevam, Hans Verkuil, Jacopo Mondi, Jernej Skrabec,
Laurent Pinchart, Ming Qian, NXP Linux Team,
Pengutronix Kernel Team, Sakari Ailus, Sascha Hauer, Shawn Guo,
Shijie Qin, Zhou Peng, linux-arm-kernel, linux-kernel,
linux-media
Le dimanche 13 mars 2022 à 11:51 +0100, Mauro Carvalho Chehab a écrit :
> As the end goal is to have platform drivers split by vendor,
> rename amphion/ to nxp/amphion/.
Amphion Semi is a chip vendor, just like Hantro (now owned merged in
Verisilicon) and Chips&Media. Their hardware could be found on other SoC in the
future. Note this one got acquired by Allegro, and it isn't clear if they will
continue that product or not. Unlike CODA, which is a product name, the driver
implement support for both known products (Malone, the decoder and Windsor, the
encoder).
https://www.finsmes.com/2019/10/allegro-dvt-acquires-amphion-semiconductor.html
I'm not sure what to suggest here yet. allegro/amphion/ could be a workaround ?
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> ---
>
> To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
> See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
>
> MAINTAINERS | 2 +-
> drivers/media/platform/Kconfig | 2 +-
> drivers/media/platform/Makefile | 2 +-
> drivers/media/platform/{ => nxp}/amphion/Kconfig | 0
> drivers/media/platform/{ => nxp}/amphion/Makefile | 0
> drivers/media/platform/{ => nxp}/amphion/vdec.c | 0
> drivers/media/platform/{ => nxp}/amphion/venc.c | 0
> drivers/media/platform/{ => nxp}/amphion/vpu.h | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_cmds.c | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_cmds.h | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_codec.h | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_color.c | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_core.c | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_core.h | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_dbg.c | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_defs.h | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_drv.c | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_helpers.c | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_helpers.h | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_imx8q.c | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_imx8q.h | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_malone.c | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_malone.h | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_mbox.c | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_mbox.h | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_msgs.c | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_msgs.h | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_rpc.c | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_rpc.h | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_v4l2.c | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_v4l2.h | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_windsor.c | 0
> drivers/media/platform/{ => nxp}/amphion/vpu_windsor.h | 0
> 33 files changed, 3 insertions(+), 3 deletions(-)
> rename drivers/media/platform/{ => nxp}/amphion/Kconfig (100%)
> rename drivers/media/platform/{ => nxp}/amphion/Makefile (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vdec.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/venc.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu.h (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_cmds.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_cmds.h (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_codec.h (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_color.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_core.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_core.h (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_dbg.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_defs.h (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_drv.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_helpers.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_helpers.h (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_imx8q.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_imx8q.h (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_malone.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_malone.h (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_mbox.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_mbox.h (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_msgs.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_msgs.h (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_rpc.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_rpc.h (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_v4l2.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_v4l2.h (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_windsor.c (100%)
> rename drivers/media/platform/{ => nxp}/amphion/vpu_windsor.h (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index c9333d46047e..74901acf8f06 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1037,7 +1037,7 @@ M: Zhou Peng <eagle.zhou@nxp.com>
> L: linux-media@vger.kernel.org
> S: Maintained
> F: Documentation/devicetree/bindings/media/amphion,vpu.yaml
> -F: drivers/media/platform/amphion/
> +F: drivers/media/platform/nxp/amphion/
>
> AMS AS73211 DRIVER
> M: Christian Eggers <ceggers@arri.de>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index f07ab9a98e3b..2e3925408aa0 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -69,7 +69,6 @@ source "drivers/media/platform/allegro-dvt/Kconfig"
> source "drivers/media/platform/allwinner/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"
> source "drivers/media/platform/cadence/Kconfig"
> @@ -85,6 +84,7 @@ source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
> source "drivers/media/platform/mediatek/mtk-vpu/Kconfig"
> source "drivers/media/platform/nvidia/tegra-vde/Kconfig"
> source "drivers/media/platform/nxp/Kconfig"
> +source "drivers/media/platform/nxp/amphion/Kconfig"
> source "drivers/media/platform/omap/Kconfig"
> source "drivers/media/platform/omap3isp/Kconfig"
> source "drivers/media/platform/qcom/Kconfig"
> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
> index ce9909534218..7a28b60dbbe6 100644
> --- a/drivers/media/platform/Makefile
> +++ b/drivers/media/platform/Makefile
> @@ -9,7 +9,6 @@ obj-y += allegro-dvt/
> obj-y += allwinner/
> obj-y += am437x/
> obj-y += amlogic/meson-ge2d/
> -obj-y += amphion/
> obj-y += aspeed/
> obj-y += atmel/
> obj-y += cadence/
> @@ -25,6 +24,7 @@ obj-y += mediatek/mtk-vcodec/
> obj-y += mediatek/mtk-vpu/
> obj-y += nvidia/tegra-vde/
> obj-y += nxp/
> +obj-y += nxp/amphion/
> obj-y += omap/
> obj-y += omap3isp/
> obj-y += qcom/camss/
> diff --git a/drivers/media/platform/amphion/Kconfig b/drivers/media/platform/nxp/amphion/Kconfig
> similarity index 100%
> rename from drivers/media/platform/amphion/Kconfig
> rename to drivers/media/platform/nxp/amphion/Kconfig
> diff --git a/drivers/media/platform/amphion/Makefile b/drivers/media/platform/nxp/amphion/Makefile
> similarity index 100%
> rename from drivers/media/platform/amphion/Makefile
> rename to drivers/media/platform/nxp/amphion/Makefile
> diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform/nxp/amphion/vdec.c
> similarity index 100%
> rename from drivers/media/platform/amphion/vdec.c
> rename to drivers/media/platform/nxp/amphion/vdec.c
> diff --git a/drivers/media/platform/amphion/venc.c b/drivers/media/platform/nxp/amphion/venc.c
> similarity index 100%
> rename from drivers/media/platform/amphion/venc.c
> rename to drivers/media/platform/nxp/amphion/venc.c
> diff --git a/drivers/media/platform/amphion/vpu.h b/drivers/media/platform/nxp/amphion/vpu.h
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu.h
> rename to drivers/media/platform/nxp/amphion/vpu.h
> diff --git a/drivers/media/platform/amphion/vpu_cmds.c b/drivers/media/platform/nxp/amphion/vpu_cmds.c
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_cmds.c
> rename to drivers/media/platform/nxp/amphion/vpu_cmds.c
> diff --git a/drivers/media/platform/amphion/vpu_cmds.h b/drivers/media/platform/nxp/amphion/vpu_cmds.h
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_cmds.h
> rename to drivers/media/platform/nxp/amphion/vpu_cmds.h
> diff --git a/drivers/media/platform/amphion/vpu_codec.h b/drivers/media/platform/nxp/amphion/vpu_codec.h
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_codec.h
> rename to drivers/media/platform/nxp/amphion/vpu_codec.h
> diff --git a/drivers/media/platform/amphion/vpu_color.c b/drivers/media/platform/nxp/amphion/vpu_color.c
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_color.c
> rename to drivers/media/platform/nxp/amphion/vpu_color.c
> diff --git a/drivers/media/platform/amphion/vpu_core.c b/drivers/media/platform/nxp/amphion/vpu_core.c
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_core.c
> rename to drivers/media/platform/nxp/amphion/vpu_core.c
> diff --git a/drivers/media/platform/amphion/vpu_core.h b/drivers/media/platform/nxp/amphion/vpu_core.h
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_core.h
> rename to drivers/media/platform/nxp/amphion/vpu_core.h
> diff --git a/drivers/media/platform/amphion/vpu_dbg.c b/drivers/media/platform/nxp/amphion/vpu_dbg.c
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_dbg.c
> rename to drivers/media/platform/nxp/amphion/vpu_dbg.c
> diff --git a/drivers/media/platform/amphion/vpu_defs.h b/drivers/media/platform/nxp/amphion/vpu_defs.h
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_defs.h
> rename to drivers/media/platform/nxp/amphion/vpu_defs.h
> diff --git a/drivers/media/platform/amphion/vpu_drv.c b/drivers/media/platform/nxp/amphion/vpu_drv.c
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_drv.c
> rename to drivers/media/platform/nxp/amphion/vpu_drv.c
> diff --git a/drivers/media/platform/amphion/vpu_helpers.c b/drivers/media/platform/nxp/amphion/vpu_helpers.c
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_helpers.c
> rename to drivers/media/platform/nxp/amphion/vpu_helpers.c
> diff --git a/drivers/media/platform/amphion/vpu_helpers.h b/drivers/media/platform/nxp/amphion/vpu_helpers.h
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_helpers.h
> rename to drivers/media/platform/nxp/amphion/vpu_helpers.h
> diff --git a/drivers/media/platform/amphion/vpu_imx8q.c b/drivers/media/platform/nxp/amphion/vpu_imx8q.c
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_imx8q.c
> rename to drivers/media/platform/nxp/amphion/vpu_imx8q.c
> diff --git a/drivers/media/platform/amphion/vpu_imx8q.h b/drivers/media/platform/nxp/amphion/vpu_imx8q.h
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_imx8q.h
> rename to drivers/media/platform/nxp/amphion/vpu_imx8q.h
> diff --git a/drivers/media/platform/amphion/vpu_malone.c b/drivers/media/platform/nxp/amphion/vpu_malone.c
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_malone.c
> rename to drivers/media/platform/nxp/amphion/vpu_malone.c
> diff --git a/drivers/media/platform/amphion/vpu_malone.h b/drivers/media/platform/nxp/amphion/vpu_malone.h
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_malone.h
> rename to drivers/media/platform/nxp/amphion/vpu_malone.h
> diff --git a/drivers/media/platform/amphion/vpu_mbox.c b/drivers/media/platform/nxp/amphion/vpu_mbox.c
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_mbox.c
> rename to drivers/media/platform/nxp/amphion/vpu_mbox.c
> diff --git a/drivers/media/platform/amphion/vpu_mbox.h b/drivers/media/platform/nxp/amphion/vpu_mbox.h
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_mbox.h
> rename to drivers/media/platform/nxp/amphion/vpu_mbox.h
> diff --git a/drivers/media/platform/amphion/vpu_msgs.c b/drivers/media/platform/nxp/amphion/vpu_msgs.c
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_msgs.c
> rename to drivers/media/platform/nxp/amphion/vpu_msgs.c
> diff --git a/drivers/media/platform/amphion/vpu_msgs.h b/drivers/media/platform/nxp/amphion/vpu_msgs.h
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_msgs.h
> rename to drivers/media/platform/nxp/amphion/vpu_msgs.h
> diff --git a/drivers/media/platform/amphion/vpu_rpc.c b/drivers/media/platform/nxp/amphion/vpu_rpc.c
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_rpc.c
> rename to drivers/media/platform/nxp/amphion/vpu_rpc.c
> diff --git a/drivers/media/platform/amphion/vpu_rpc.h b/drivers/media/platform/nxp/amphion/vpu_rpc.h
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_rpc.h
> rename to drivers/media/platform/nxp/amphion/vpu_rpc.h
> diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/nxp/amphion/vpu_v4l2.c
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_v4l2.c
> rename to drivers/media/platform/nxp/amphion/vpu_v4l2.c
> diff --git a/drivers/media/platform/amphion/vpu_v4l2.h b/drivers/media/platform/nxp/amphion/vpu_v4l2.h
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_v4l2.h
> rename to drivers/media/platform/nxp/amphion/vpu_v4l2.h
> diff --git a/drivers/media/platform/amphion/vpu_windsor.c b/drivers/media/platform/nxp/amphion/vpu_windsor.c
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_windsor.c
> rename to drivers/media/platform/nxp/amphion/vpu_windsor.c
> diff --git a/drivers/media/platform/amphion/vpu_windsor.h b/drivers/media/platform/nxp/amphion/vpu_windsor.h
> similarity index 100%
> rename from drivers/media/platform/amphion/vpu_windsor.h
> rename to drivers/media/platform/nxp/amphion/vpu_windsor.h
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 11/24] media: platform: rename exynos4-is/ to samsung/exynos4-is/
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
` (7 preceding siblings ...)
2022-03-13 10:51 ` [PATCH 10/24] media: platform: rename amphion/ to nxp/amphion/ Mauro Carvalho Chehab
@ 2022-03-13 10:51 ` Mauro Carvalho Chehab
2022-03-13 10:51 ` [PATCH 12/24] media: platform: rename exynos-gsc/ to samsung/exynos-gsc/ Mauro Carvalho Chehab
` (7 subsequent siblings)
16 siblings, 0 replies; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:51 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Cai Huoqing,
Dmitry Osipenko, Eugen Hristev, Greg Kroah-Hartman, Hans Verkuil,
Jacopo Mondi, Jernej Skrabec, Krzysztof Kozlowski, Lad Prabhakar,
Laurent Pinchart, Lee Jones, Lv Yunlong, Ming Qian, Sakari Ailus,
Shawn Guo, Sylwester Nawrocki, Tomi Valkeinen, Yang Li, Zhen Lei,
linux-arm-kernel, linux-kernel, linux-media, linux-samsung-soc
As the end goal is to have platform drivers split by vendor,
rename exynos4-is/ to samsung/exynos4-is/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
Documentation/admin-guide/media/fimc.rst | 2 +-
.../driver-api/media/drivers/fimc-devel.rst | 14 +++++++-------
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
.../platform/{ => samsung}/exynos4-is/Kconfig | 0
.../platform/{ => samsung}/exynos4-is/Makefile | 0
.../platform/{ => samsung}/exynos4-is/common.c | 0
.../platform/{ => samsung}/exynos4-is/common.h | 0
.../{ => samsung}/exynos4-is/fimc-capture.c | 0
.../platform/{ => samsung}/exynos4-is/fimc-core.c | 0
.../platform/{ => samsung}/exynos4-is/fimc-core.h | 0
.../{ => samsung}/exynos4-is/fimc-is-command.h | 0
.../{ => samsung}/exynos4-is/fimc-is-errno.c | 0
.../{ => samsung}/exynos4-is/fimc-is-errno.h | 0
.../{ => samsung}/exynos4-is/fimc-is-i2c.c | 0
.../{ => samsung}/exynos4-is/fimc-is-i2c.h | 0
.../{ => samsung}/exynos4-is/fimc-is-param.c | 0
.../{ => samsung}/exynos4-is/fimc-is-param.h | 0
.../{ => samsung}/exynos4-is/fimc-is-regs.c | 0
.../{ => samsung}/exynos4-is/fimc-is-regs.h | 0
.../{ => samsung}/exynos4-is/fimc-is-sensor.c | 0
.../{ => samsung}/exynos4-is/fimc-is-sensor.h | 0
.../platform/{ => samsung}/exynos4-is/fimc-is.c | 0
.../platform/{ => samsung}/exynos4-is/fimc-is.h | 0
.../{ => samsung}/exynos4-is/fimc-isp-video.c | 0
.../{ => samsung}/exynos4-is/fimc-isp-video.h | 0
.../platform/{ => samsung}/exynos4-is/fimc-isp.c | 0
.../platform/{ => samsung}/exynos4-is/fimc-isp.h | 0
.../{ => samsung}/exynos4-is/fimc-lite-reg.c | 0
.../{ => samsung}/exynos4-is/fimc-lite-reg.h | 0
.../platform/{ => samsung}/exynos4-is/fimc-lite.c | 0
.../platform/{ => samsung}/exynos4-is/fimc-lite.h | 0
.../platform/{ => samsung}/exynos4-is/fimc-m2m.c | 0
.../platform/{ => samsung}/exynos4-is/fimc-reg.c | 0
.../platform/{ => samsung}/exynos4-is/fimc-reg.h | 0
.../platform/{ => samsung}/exynos4-is/media-dev.c | 0
.../platform/{ => samsung}/exynos4-is/media-dev.h | 0
.../platform/{ => samsung}/exynos4-is/mipi-csis.c | 0
.../platform/{ => samsung}/exynos4-is/mipi-csis.h | 0
40 files changed, 11 insertions(+), 11 deletions(-)
rename drivers/media/platform/{ => samsung}/exynos4-is/Kconfig (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/Makefile (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/common.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/common.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-capture.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-core.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-core.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-command.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-errno.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-errno.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-i2c.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-i2c.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-param.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-param.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-regs.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-regs.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-sensor.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is-sensor.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-is.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp-video.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp-video.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-isp.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite-reg.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite-reg.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-lite.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-m2m.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-reg.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/fimc-reg.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/media-dev.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/media-dev.h (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/mipi-csis.c (100%)
rename drivers/media/platform/{ => samsung}/exynos4-is/mipi-csis.h (100%)
diff --git a/Documentation/admin-guide/media/fimc.rst b/Documentation/admin-guide/media/fimc.rst
index 56b149d9a527..267ef52fe387 100644
--- a/Documentation/admin-guide/media/fimc.rst
+++ b/Documentation/admin-guide/media/fimc.rst
@@ -14,7 +14,7 @@ data from LCD controller (FIMD) through the SoC internal writeback data
path. There are multiple FIMC instances in the SoCs (up to 4), having
slightly different capabilities, like pixel alignment constraints, rotator
availability, LCD writeback support, etc. The driver is located at
-drivers/media/platform/exynos4-is directory.
+drivers/media/platform/samsung/exynos4-is directory.
Supported SoCs
--------------
diff --git a/Documentation/driver-api/media/drivers/fimc-devel.rst b/Documentation/driver-api/media/drivers/fimc-devel.rst
index 956e3a9901f8..4c6b7c8be19f 100644
--- a/Documentation/driver-api/media/drivers/fimc-devel.rst
+++ b/Documentation/driver-api/media/drivers/fimc-devel.rst
@@ -12,22 +12,22 @@ Files partitioning
- media device driver
- drivers/media/platform/exynos4-is/media-dev.[ch]
+ drivers/media/platform/samsung/exynos4-is/media-dev.[ch]
- camera capture video device driver
- drivers/media/platform/exynos4-is/fimc-capture.c
+ drivers/media/platform/samsung/exynos4-is/fimc-capture.c
- MIPI-CSI2 receiver subdev
- drivers/media/platform/exynos4-is/mipi-csis.[ch]
+ drivers/media/platform/samsung/exynos4-is/mipi-csis.[ch]
- video post-processor (mem-to-mem)
- drivers/media/platform/exynos4-is/fimc-core.c
+ drivers/media/platform/samsung/exynos4-is/fimc-core.c
- common files
- drivers/media/platform/exynos4-is/fimc-core.h
- drivers/media/platform/exynos4-is/fimc-reg.h
- drivers/media/platform/exynos4-is/regs-fimc.h
+ drivers/media/platform/samsung/exynos4-is/fimc-core.h
+ drivers/media/platform/samsung/exynos4-is/fimc-reg.h
+ drivers/media/platform/samsung/exynos4-is/regs-fimc.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 74901acf8f06..b1418853d56f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17103,7 +17103,7 @@ M: Sylwester Nawrocki <s.nawrocki@samsung.com>
L: linux-media@vger.kernel.org
S: Supported
Q: https://patchwork.linuxtv.org/project/linux-media/list/
-F: drivers/media/platform/exynos4-is/
+F: drivers/media/platform/samsung/exynos4-is/
SAMSUNG SOC CLOCK DRIVERS
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 2e3925408aa0..1bbada840723 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -75,7 +75,6 @@ source "drivers/media/platform/cadence/Kconfig"
source "drivers/media/platform/chips-media/Kconfig"
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/Kconfig"
source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
@@ -94,6 +93,7 @@ source "drivers/media/platform/s3c-camif/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/exynos4-is/Kconfig"
source "drivers/media/platform/sti/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
source "drivers/media/platform/ti-vpe/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 7a28b60dbbe6..613ca6a3efa7 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -15,7 +15,6 @@ obj-y += cadence/
obj-y += chips-media/
obj-y += davinci/
obj-y += exynos-gsc/
-obj-y += exynos4-is/
obj-y += intel/
obj-y += marvell/
obj-y += mediatek/mtk-jpeg/
@@ -36,6 +35,7 @@ obj-y += s3c-camif/
obj-y += s5p-g2d/
obj-y += s5p-jpeg/
obj-y += s5p-mfc/
+obj-y += samsung/exynos4-is/
obj-y += sti/bdisp/
obj-y += sti/c8sectpfe/
obj-y += sti/delta/
diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/samsung/exynos4-is/Kconfig
similarity index 100%
rename from drivers/media/platform/exynos4-is/Kconfig
rename to drivers/media/platform/samsung/exynos4-is/Kconfig
diff --git a/drivers/media/platform/exynos4-is/Makefile b/drivers/media/platform/samsung/exynos4-is/Makefile
similarity index 100%
rename from drivers/media/platform/exynos4-is/Makefile
rename to drivers/media/platform/samsung/exynos4-is/Makefile
diff --git a/drivers/media/platform/exynos4-is/common.c b/drivers/media/platform/samsung/exynos4-is/common.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/common.c
rename to drivers/media/platform/samsung/exynos4-is/common.c
diff --git a/drivers/media/platform/exynos4-is/common.h b/drivers/media/platform/samsung/exynos4-is/common.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/common.h
rename to drivers/media/platform/samsung/exynos4-is/common.h
diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/samsung/exynos4-is/fimc-capture.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-capture.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-capture.c
diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/samsung/exynos4-is/fimc-core.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-core.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-core.c
diff --git a/drivers/media/platform/exynos4-is/fimc-core.h b/drivers/media/platform/samsung/exynos4-is/fimc-core.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-core.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-core.h
diff --git a/drivers/media/platform/exynos4-is/fimc-is-command.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-command.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-command.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-command.h
diff --git a/drivers/media/platform/exynos4-is/fimc-is-errno.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-errno.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-errno.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-errno.c
diff --git a/drivers/media/platform/exynos4-is/fimc-is-errno.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-errno.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-errno.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-errno.h
diff --git a/drivers/media/platform/exynos4-is/fimc-is-i2c.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-i2c.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c
diff --git a/drivers/media/platform/exynos4-is/fimc-is-i2c.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-i2c.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.h
diff --git a/drivers/media/platform/exynos4-is/fimc-is-param.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-param.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-param.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-param.c
diff --git a/drivers/media/platform/exynos4-is/fimc-is-param.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-param.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-param.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-param.h
diff --git a/drivers/media/platform/exynos4-is/fimc-is-regs.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-regs.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-regs.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-regs.c
diff --git a/drivers/media/platform/exynos4-is/fimc-is-regs.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-regs.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-regs.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-regs.h
diff --git a/drivers/media/platform/exynos4-is/fimc-is-sensor.c b/drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-sensor.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.c
diff --git a/drivers/media/platform/exynos4-is/fimc-is-sensor.h b/drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is-sensor.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.h
diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/samsung/exynos4-is/fimc-is.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-is.c
diff --git a/drivers/media/platform/exynos4-is/fimc-is.h b/drivers/media/platform/samsung/exynos4-is/fimc-is.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is.h
diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-isp-video.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c
diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.h b/drivers/media/platform/samsung/exynos4-is/fimc-isp-video.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-isp-video.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-isp-video.h
diff --git a/drivers/media/platform/exynos4-is/fimc-isp.c b/drivers/media/platform/samsung/exynos4-is/fimc-isp.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-isp.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-isp.c
diff --git a/drivers/media/platform/exynos4-is/fimc-isp.h b/drivers/media/platform/samsung/exynos4-is/fimc-isp.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-isp.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-isp.h
diff --git a/drivers/media/platform/exynos4-is/fimc-lite-reg.c b/drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-lite-reg.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.c
diff --git a/drivers/media/platform/exynos4-is/fimc-lite-reg.h b/drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-lite-reg.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.h
diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/samsung/exynos4-is/fimc-lite.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-lite.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-lite.c
diff --git a/drivers/media/platform/exynos4-is/fimc-lite.h b/drivers/media/platform/samsung/exynos4-is/fimc-lite.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-lite.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-lite.h
diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/platform/samsung/exynos4-is/fimc-m2m.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-m2m.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-m2m.c
diff --git a/drivers/media/platform/exynos4-is/fimc-reg.c b/drivers/media/platform/samsung/exynos4-is/fimc-reg.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-reg.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-reg.c
diff --git a/drivers/media/platform/exynos4-is/fimc-reg.h b/drivers/media/platform/samsung/exynos4-is/fimc-reg.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-reg.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-reg.h
diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/samsung/exynos4-is/media-dev.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/media-dev.c
rename to drivers/media/platform/samsung/exynos4-is/media-dev.c
diff --git a/drivers/media/platform/exynos4-is/media-dev.h b/drivers/media/platform/samsung/exynos4-is/media-dev.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/media-dev.h
rename to drivers/media/platform/samsung/exynos4-is/media-dev.h
diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/samsung/exynos4-is/mipi-csis.c
similarity index 100%
rename from drivers/media/platform/exynos4-is/mipi-csis.c
rename to drivers/media/platform/samsung/exynos4-is/mipi-csis.c
diff --git a/drivers/media/platform/exynos4-is/mipi-csis.h b/drivers/media/platform/samsung/exynos4-is/mipi-csis.h
similarity index 100%
rename from drivers/media/platform/exynos4-is/mipi-csis.h
rename to drivers/media/platform/samsung/exynos4-is/mipi-csis.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 12/24] media: platform: rename exynos-gsc/ to samsung/exynos-gsc/
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
` (8 preceding siblings ...)
2022-03-13 10:51 ` [PATCH 11/24] media: platform: rename exynos4-is/ to samsung/exynos4-is/ Mauro Carvalho Chehab
@ 2022-03-13 10:51 ` Mauro Carvalho Chehab
2022-03-13 10:51 ` [PATCH 14/24] media: platform: rename s5p-g2d/ to samsung/s5p-g2d/ Mauro Carvalho Chehab
` (6 subsequent siblings)
16 siblings, 0 replies; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:51 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Cai Huoqing,
Dmitry Osipenko, Eugen Hristev, Hans Verkuil, Jacopo Mondi,
Jernej Skrabec, Jonathan Cameron, Krzysztof Kozlowski,
Lad Prabhakar, Laurent Pinchart, Ming Qian, Sakari Ailus,
Sylwester Nawrocki, linux-arm-kernel, linux-kernel, linux-media,
linux-samsung-soc
As the end goal is to have platform drivers split by vendor,
rename exynos-gsc/ to samsung/exynos-gsc/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => samsung}/exynos-gsc/Kconfig | 0
drivers/media/platform/{ => samsung}/exynos-gsc/Makefile | 0
drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.c | 0
drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.h | 0
drivers/media/platform/{ => samsung}/exynos-gsc/gsc-m2m.c | 0
drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.c | 0
drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.h | 0
9 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/media/platform/{ => samsung}/exynos-gsc/Kconfig (100%)
rename drivers/media/platform/{ => samsung}/exynos-gsc/Makefile (100%)
rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.c (100%)
rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-core.h (100%)
rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-m2m.c (100%)
rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.c (100%)
rename drivers/media/platform/{ => samsung}/exynos-gsc/gsc-regs.h (100%)
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 1bbada840723..81888d348149 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -74,7 +74,6 @@ source "drivers/media/platform/atmel/Kconfig"
source "drivers/media/platform/cadence/Kconfig"
source "drivers/media/platform/chips-media/Kconfig"
source "drivers/media/platform/davinci/Kconfig"
-source "drivers/media/platform/exynos-gsc/Kconfig"
source "drivers/media/platform/intel/Kconfig"
source "drivers/media/platform/marvell/Kconfig"
source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
@@ -93,6 +92,7 @@ source "drivers/media/platform/s3c-camif/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/sti/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 613ca6a3efa7..848cbd6147ae 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -14,7 +14,6 @@ obj-y += atmel/
obj-y += cadence/
obj-y += chips-media/
obj-y += davinci/
-obj-y += exynos-gsc/
obj-y += intel/
obj-y += marvell/
obj-y += mediatek/mtk-jpeg/
@@ -35,6 +34,7 @@ obj-y += s3c-camif/
obj-y += s5p-g2d/
obj-y += s5p-jpeg/
obj-y += s5p-mfc/
+obj-y += samsung/exynos-gsc/
obj-y += samsung/exynos4-is/
obj-y += sti/bdisp/
obj-y += sti/c8sectpfe/
diff --git a/drivers/media/platform/exynos-gsc/Kconfig b/drivers/media/platform/samsung/exynos-gsc/Kconfig
similarity index 100%
rename from drivers/media/platform/exynos-gsc/Kconfig
rename to drivers/media/platform/samsung/exynos-gsc/Kconfig
diff --git a/drivers/media/platform/exynos-gsc/Makefile b/drivers/media/platform/samsung/exynos-gsc/Makefile
similarity index 100%
rename from drivers/media/platform/exynos-gsc/Makefile
rename to drivers/media/platform/samsung/exynos-gsc/Makefile
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/samsung/exynos-gsc/gsc-core.c
similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-core.c
rename to drivers/media/platform/samsung/exynos-gsc/gsc-core.c
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.h b/drivers/media/platform/samsung/exynos-gsc/gsc-core.h
similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-core.h
rename to drivers/media/platform/samsung/exynos-gsc/gsc-core.h
diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c
similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-m2m.c
rename to drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c
diff --git a/drivers/media/platform/exynos-gsc/gsc-regs.c b/drivers/media/platform/samsung/exynos-gsc/gsc-regs.c
similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-regs.c
rename to drivers/media/platform/samsung/exynos-gsc/gsc-regs.c
diff --git a/drivers/media/platform/exynos-gsc/gsc-regs.h b/drivers/media/platform/samsung/exynos-gsc/gsc-regs.h
similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-regs.h
rename to drivers/media/platform/samsung/exynos-gsc/gsc-regs.h
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 14/24] media: platform: rename s5p-g2d/ to samsung/s5p-g2d/
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
` (9 preceding siblings ...)
2022-03-13 10:51 ` [PATCH 12/24] media: platform: rename exynos-gsc/ to samsung/exynos-gsc/ Mauro Carvalho Chehab
@ 2022-03-13 10:51 ` Mauro Carvalho Chehab
2022-03-13 10:51 ` [PATCH 15/24] media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/ Mauro Carvalho Chehab
` (5 subsequent siblings)
16 siblings, 0 replies; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:51 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund,
Łukasz Stelmach, Cai Huoqing, Dillon Min, Dmitry Osipenko,
Eugen Hristev, Hans Verkuil, Jacopo Mondi, Jernej Skrabec,
Lad Prabhakar, Laurent Pinchart, Ming Qian, Sakari Ailus,
linux-arm-kernel, linux-kernel, linux-media
As the end goal is to have platform drivers split by vendor,
rename s5p-g2d/ to samsung/s5p-g2d/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.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 8ce4894699cc..4c4be0d7ec14 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 0a87d835b2f5..f70fc95e4195 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -88,12 +88,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/ti-vpe/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index c3dfe40b2def..a5a068e18492 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -30,12 +30,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
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 15/24] media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
` (10 preceding siblings ...)
2022-03-13 10:51 ` [PATCH 14/24] media: platform: rename s5p-g2d/ to samsung/s5p-g2d/ Mauro Carvalho Chehab
@ 2022-03-13 10:51 ` Mauro Carvalho Chehab
2022-03-14 8:54 ` Andrzej Pietrasiewicz
2022-03-13 10:51 ` [PATCH 16/24] media: platform: rename s5p-mfc/ to samsung/s5p-mfc/ Mauro Carvalho Chehab
` (4 subsequent siblings)
16 siblings, 1 reply; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:51 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund,
Andrzej Pietrasiewicz, Cai Huoqing, Colin Ian King,
Dmitry Osipenko, Eugen Hristev, Fabio Estevam, Hans Verkuil,
Jacek Anaszewski, Jacopo Mondi, Jernej Skrabec,
Krzysztof Kozlowski, Laurent Pinchart, Laurentiu Palcu,
Mikhail Ulyanov, Ming Qian, Mirela Rabulea, NXP Linux Team,
Pengutronix Kernel Team, Randy Dunlap, Rikard Falkeborn,
Sakari Ailus, Sascha Hauer, Shawn Guo, Sylwester Nawrocki,
Wei Yongjun, linux-arm-kernel, linux-kernel, linux-media,
linux-renesas-soc, linux-samsung-soc
As the end goal is to have platform drivers split by vendor,
rename s5p-jpeg/ to samsung/s5p-jpeg/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 2 +-
drivers/media/platform/renesas/rcar_jpu.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-jpeg/Kconfig | 0
drivers/media/platform/{ => samsung}/s5p-jpeg/Makefile | 0
drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.h | 2 +-
.../media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.c | 0
.../media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.c | 0
drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.h | 0
drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-regs.h | 2 +-
16 files changed, 11 insertions(+), 11 deletions(-)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/Kconfig (100%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/Makefile (100%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.c (99%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.h (99%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.c (100%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.h (97%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.c (100%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.c (99%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.h (97%)
rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-regs.h (99%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 4c4be0d7ec14..dfd490369d48 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2633,7 +2633,7 @@ M: Sylwester Nawrocki <s.nawrocki@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-jpeg/
+F: drivers/media/platform/samsung/s5p-jpeg/
ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
M: Marek Szyprowski <m.szyprowski@samsung.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index f70fc95e4195..0af01626c008 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -88,12 +88,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-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/samsung/s5p-jpeg/Kconfig"
source "drivers/media/platform/sti/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
source "drivers/media/platform/ti-vpe/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index a5a068e18492..94bdd5d94bb2 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -30,12 +30,12 @@ obj-y += qcom/venus/
obj-y += renesas/
obj-y += rockchip/rga/
obj-y += rockchip/rkisp1/
-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 += samsung/s5p-jpeg/
obj-y += sti/bdisp/
obj-y += sti/c8sectpfe/
obj-y += sti/delta/
diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
index 3b892c5792b4..d1ec1f4b506b 100644
--- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
+++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
@@ -35,7 +35,7 @@
* it, enable dynamic debug for this module and:
* echo 1 > /sys/module/mxc_jpeg_encdec/parameters/jpeg_tracing
*
- * This is inspired by the drivers/media/platform/s5p-jpeg driver
+ * This is inspired by the drivers/media/platform/samsung/s5p-jpeg driver
*
* Copyright 2018-2019 NXP
*/
diff --git a/drivers/media/platform/renesas/rcar_jpu.c b/drivers/media/platform/renesas/rcar_jpu.c
index 56bb464629ed..293beba131e2 100644
--- a/drivers/media/platform/renesas/rcar_jpu.c
+++ b/drivers/media/platform/renesas/rcar_jpu.c
@@ -4,7 +4,7 @@
* Copyright (C) 2014-2015 Cogent Embedded, Inc. <source@cogentembedded.com>
* Copyright (C) 2014-2015 Renesas Electronics Corporation
*
- * This is based on the drivers/media/platform/s5p-jpeg driver by
+ * This is based on the drivers/media/platform/samsung/s5p-jpeg driver by
* Andrzej Pietrasiewicz and Jacek Anaszewski.
* Some portions of code inspired by VSP1 driver by Laurent Pinchart.
*
diff --git a/drivers/media/platform/s5p-jpeg/Kconfig b/drivers/media/platform/samsung/s5p-jpeg/Kconfig
similarity index 100%
rename from drivers/media/platform/s5p-jpeg/Kconfig
rename to drivers/media/platform/samsung/s5p-jpeg/Kconfig
diff --git a/drivers/media/platform/s5p-jpeg/Makefile b/drivers/media/platform/samsung/s5p-jpeg/Makefile
similarity index 100%
rename from drivers/media/platform/s5p-jpeg/Makefile
rename to drivers/media/platform/samsung/s5p-jpeg/Makefile
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
similarity index 99%
rename from drivers/media/platform/s5p-jpeg/jpeg-core.c
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
index a8d9159d5ed8..5479bc8d474d 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
-/* linux/drivers/media/platform/s5p-jpeg/jpeg-core.c
+/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
*
* Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
* http://www.samsung.com
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h
similarity index 99%
rename from drivers/media/platform/s5p-jpeg/jpeg-core.h
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h
index 4a5fb1b15455..5570c79f122f 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.h
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-/* linux/drivers/media/platform/s5p-jpeg/jpeg-core.h
+/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h
*
* Copyright (c) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c
similarity index 100%
rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h
similarity index 97%
rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h
index 68160befce39..15af928fad76 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h
+/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h
*
* Copyright (c) 2014 Samsung Electronics Co., Ltd.
* http://www.samsung.com
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c
similarity index 100%
rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h
similarity index 100%
rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c
similarity index 99%
rename from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c
index 491e9248286c..01b47b3df1e7 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
-/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw.h
+/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw.h
*
* Copyright (c) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h
similarity index 97%
rename from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h
index 98ddf7097562..f068d52c66b7 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw.h
+/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw.h
*
* Copyright (c) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-regs.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h
similarity index 99%
rename from drivers/media/platform/s5p-jpeg/jpeg-regs.h
rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h
index 86f376b50581..c2298b680022 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-regs.h
+++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h
@@ -1,5 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */
-/* linux/drivers/media/platform/s5p-jpeg/jpeg-regs.h
+/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h
*
* Register definition file for Samsung JPEG codec driver
*
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* Re: [PATCH 15/24] media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/
2022-03-13 10:51 ` [PATCH 15/24] media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/ Mauro Carvalho Chehab
@ 2022-03-14 8:54 ` Andrzej Pietrasiewicz
0 siblings, 0 replies; 31+ messages in thread
From: Andrzej Pietrasiewicz @ 2022-03-14 8:54 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Niklas Söderlund, Cai Huoqing, Colin Ian King,
Dmitry Osipenko, Eugen Hristev, Fabio Estevam, Hans Verkuil,
Jacek Anaszewski, Jacopo Mondi, Jernej Skrabec,
Krzysztof Kozlowski, Laurent Pinchart, Laurentiu Palcu,
Mikhail Ulyanov, Ming Qian, Mirela Rabulea, NXP Linux Team,
Pengutronix Kernel Team, Randy Dunlap, Rikard Falkeborn,
Sakari Ailus, Sascha Hauer, Shawn Guo, Sylwester Nawrocki,
Wei Yongjun, linux-arm-kernel, linux-kernel, linux-media,
linux-renesas-soc, linux-samsung-soc
Hi Mauro,
Thanks,
W dniu 13.03.2022 o 11:51, Mauro Carvalho Chehab pisze:
> As the end goal is to have platform drivers split by vendor,
> rename s5p-jpeg/ to samsung/s5p-jpeg/.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Acked-by: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
> ---
>
> To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
> See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
>
> MAINTAINERS | 2 +-
> drivers/media/platform/Kconfig | 2 +-
> drivers/media/platform/Makefile | 2 +-
> drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 2 +-
> drivers/media/platform/renesas/rcar_jpu.c | 2 +-
> drivers/media/platform/{ => samsung}/s5p-jpeg/Kconfig | 0
> drivers/media/platform/{ => samsung}/s5p-jpeg/Makefile | 0
> drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.c | 2 +-
> drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.h | 2 +-
> .../media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.c | 0
> .../media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.h | 2 +-
> drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.c | 0
> drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.h | 0
> drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.c | 2 +-
> drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.h | 2 +-
> drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-regs.h | 2 +-
> 16 files changed, 11 insertions(+), 11 deletions(-)
> rename drivers/media/platform/{ => samsung}/s5p-jpeg/Kconfig (100%)
> rename drivers/media/platform/{ => samsung}/s5p-jpeg/Makefile (100%)
> rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.c (99%)
> rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-core.h (99%)
> rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.c (100%)
> rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos3250.h (97%)
> rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.c (100%)
> rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.h (100%)
> rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.c (99%)
> rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-hw-s5p.h (97%)
> rename drivers/media/platform/{ => samsung}/s5p-jpeg/jpeg-regs.h (99%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 4c4be0d7ec14..dfd490369d48 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -2633,7 +2633,7 @@ M: Sylwester Nawrocki <s.nawrocki@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-jpeg/
> +F: drivers/media/platform/samsung/s5p-jpeg/
>
> ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
> M: Marek Szyprowski <m.szyprowski@samsung.com>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index f70fc95e4195..0af01626c008 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -88,12 +88,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-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/samsung/s5p-jpeg/Kconfig"
> source "drivers/media/platform/sti/Kconfig"
> source "drivers/media/platform/stm32/Kconfig"
> source "drivers/media/platform/ti-vpe/Kconfig"
> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
> index a5a068e18492..94bdd5d94bb2 100644
> --- a/drivers/media/platform/Makefile
> +++ b/drivers/media/platform/Makefile
> @@ -30,12 +30,12 @@ obj-y += qcom/venus/
> obj-y += renesas/
> obj-y += rockchip/rga/
> obj-y += rockchip/rkisp1/
> -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 += samsung/s5p-jpeg/
> obj-y += sti/bdisp/
> obj-y += sti/c8sectpfe/
> obj-y += sti/delta/
> diff --git a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
> index 3b892c5792b4..d1ec1f4b506b 100644
> --- a/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
> +++ b/drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
> @@ -35,7 +35,7 @@
> * it, enable dynamic debug for this module and:
> * echo 1 > /sys/module/mxc_jpeg_encdec/parameters/jpeg_tracing
> *
> - * This is inspired by the drivers/media/platform/s5p-jpeg driver
> + * This is inspired by the drivers/media/platform/samsung/s5p-jpeg driver
> *
> * Copyright 2018-2019 NXP
> */
> diff --git a/drivers/media/platform/renesas/rcar_jpu.c b/drivers/media/platform/renesas/rcar_jpu.c
> index 56bb464629ed..293beba131e2 100644
> --- a/drivers/media/platform/renesas/rcar_jpu.c
> +++ b/drivers/media/platform/renesas/rcar_jpu.c
> @@ -4,7 +4,7 @@
> * Copyright (C) 2014-2015 Cogent Embedded, Inc. <source@cogentembedded.com>
> * Copyright (C) 2014-2015 Renesas Electronics Corporation
> *
> - * This is based on the drivers/media/platform/s5p-jpeg driver by
> + * This is based on the drivers/media/platform/samsung/s5p-jpeg driver by
> * Andrzej Pietrasiewicz and Jacek Anaszewski.
> * Some portions of code inspired by VSP1 driver by Laurent Pinchart.
> *
> diff --git a/drivers/media/platform/s5p-jpeg/Kconfig b/drivers/media/platform/samsung/s5p-jpeg/Kconfig
> similarity index 100%
> rename from drivers/media/platform/s5p-jpeg/Kconfig
> rename to drivers/media/platform/samsung/s5p-jpeg/Kconfig
> diff --git a/drivers/media/platform/s5p-jpeg/Makefile b/drivers/media/platform/samsung/s5p-jpeg/Makefile
> similarity index 100%
> rename from drivers/media/platform/s5p-jpeg/Makefile
> rename to drivers/media/platform/samsung/s5p-jpeg/Makefile
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
> similarity index 99%
> rename from drivers/media/platform/s5p-jpeg/jpeg-core.c
> rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
> index a8d9159d5ed8..5479bc8d474d 100644
> --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
> +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
> @@ -1,5 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0-only
> -/* linux/drivers/media/platform/s5p-jpeg/jpeg-core.c
> +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c
> *
> * Copyright (c) 2011-2014 Samsung Electronics Co., Ltd.
> * http://www.samsung.com
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h
> similarity index 99%
> rename from drivers/media/platform/s5p-jpeg/jpeg-core.h
> rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h
> index 4a5fb1b15455..5570c79f122f 100644
> --- a/drivers/media/platform/s5p-jpeg/jpeg-core.h
> +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h
> @@ -1,5 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0-only */
> -/* linux/drivers/media/platform/s5p-jpeg/jpeg-core.h
> +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h
> *
> * Copyright (c) 2011 Samsung Electronics Co., Ltd.
> * http://www.samsung.com
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c
> similarity index 100%
> rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c
> rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h
> similarity index 97%
> rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h
> rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h
> index 68160befce39..15af928fad76 100644
> --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h
> +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h
> @@ -1,5 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0-only */
> -/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h
> +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h
> *
> * Copyright (c) 2014 Samsung Electronics Co., Ltd.
> * http://www.samsung.com
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c
> similarity index 100%
> rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c
> rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h
> similarity index 100%
> rename from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h
> rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c
> similarity index 99%
> rename from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c
> rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c
> index 491e9248286c..01b47b3df1e7 100644
> --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c
> +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c
> @@ -1,5 +1,5 @@
> // SPDX-License-Identifier: GPL-2.0-only
> -/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw.h
> +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw.h
> *
> * Copyright (c) 2011 Samsung Electronics Co., Ltd.
> * http://www.samsung.com
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h
> similarity index 97%
> rename from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h
> rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h
> index 98ddf7097562..f068d52c66b7 100644
> --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h
> +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h
> @@ -1,5 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0-only */
> -/* linux/drivers/media/platform/s5p-jpeg/jpeg-hw.h
> +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-hw.h
> *
> * Copyright (c) 2011 Samsung Electronics Co., Ltd.
> * http://www.samsung.com
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-regs.h b/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h
> similarity index 99%
> rename from drivers/media/platform/s5p-jpeg/jpeg-regs.h
> rename to drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h
> index 86f376b50581..c2298b680022 100644
> --- a/drivers/media/platform/s5p-jpeg/jpeg-regs.h
> +++ b/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h
> @@ -1,5 +1,5 @@
> /* SPDX-License-Identifier: GPL-2.0-only */
> -/* linux/drivers/media/platform/s5p-jpeg/jpeg-regs.h
> +/* linux/drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h
> *
> * Register definition file for Samsung JPEG codec driver
> *
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 16/24] media: platform: rename s5p-mfc/ to samsung/s5p-mfc/
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
` (11 preceding siblings ...)
2022-03-13 10:51 ` [PATCH 15/24] media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/ Mauro Carvalho Chehab
@ 2022-03-13 10:51 ` Mauro Carvalho Chehab
2022-03-13 10:51 ` [PATCH 17/24] media: platform: rename stm32/ to sti/stm32/ Mauro Carvalho Chehab
` (3 subsequent siblings)
16 siblings, 0 replies; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:51 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Andrzej Hajda,
Cai Huoqing, Christophe JAILLET, Dmitry Osipenko, Eugen Hristev,
Hans Verkuil, Herman, Jacopo Mondi, Jernej Skrabec,
Lad Prabhakar, Laurent Pinchart, Marek Szyprowski,
Maxime Jourdan, Ming Qian, Nadezda Lutovinova, Paul Kocialkowski,
Sakari Ailus, Stanimir Varbanov, Sylwester Nawrocki, Tuo Li,
linux-arm-kernel, linux-kernel, linux-media
As the end goal is to have platform drivers split by vendor,
rename s5p-mfc/ to samsung/s5p-mfc/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/Kconfig | 0
drivers/media/platform/{ => samsung}/s5p-mfc/Makefile | 0
drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v10.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v6.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v7.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v8.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc.c | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_common.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_debug.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.c | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_iommu.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.c | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.h | 0
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.h | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.c | 2 +-
drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.h | 2 +-
36 files changed, 22 insertions(+), 22 deletions(-)
rename drivers/media/platform/{ => samsung}/s5p-mfc/Kconfig (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/Makefile (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v10.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v6.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v7.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc-v8.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/regs-mfc.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc.c (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.c (89%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd.h (92%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.c (98%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.h (82%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.c (98%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.h (82%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_common.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.c (99%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_ctrl.h (92%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_debug.h (95%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.c (99%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_dec.h (90%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.c (99%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_enc.h (90%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.c (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_intr.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_iommu.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.c (98%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr.h (99%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.c (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.h (100%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.c (99%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.h (96%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.c (97%)
rename drivers/media/platform/{ => samsung}/s5p-mfc/s5p_mfc_pm.h (87%)
diff --git a/MAINTAINERS b/MAINTAINERS
index dfd490369d48..7711a5ea125e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2641,7 +2641,7 @@ M: Andrzej Hajda <andrzej.hajda@intel.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-mfc/
+F: drivers/media/platform/samsung/s5p-mfc/
ARM/SHMOBILE ARM ARCHITECTURE
M: Geert Uytterhoeven <geert+renesas@glider.be>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 0af01626c008..c3594807f8d7 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -88,12 +88,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-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/samsung/s5p-jpeg/Kconfig"
+source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
source "drivers/media/platform/sti/Kconfig"
source "drivers/media/platform/stm32/Kconfig"
source "drivers/media/platform/ti-vpe/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 94bdd5d94bb2..6a766acfbe37 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -30,12 +30,12 @@ obj-y += qcom/venus/
obj-y += renesas/
obj-y += rockchip/rga/
obj-y += rockchip/rkisp1/
-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 += samsung/s5p-jpeg/
+obj-y += samsung/s5p-mfc/
obj-y += sti/bdisp/
obj-y += sti/c8sectpfe/
obj-y += sti/delta/
diff --git a/drivers/media/platform/s5p-mfc/Kconfig b/drivers/media/platform/samsung/s5p-mfc/Kconfig
similarity index 100%
rename from drivers/media/platform/s5p-mfc/Kconfig
rename to drivers/media/platform/samsung/s5p-mfc/Kconfig
diff --git a/drivers/media/platform/s5p-mfc/Makefile b/drivers/media/platform/samsung/s5p-mfc/Makefile
similarity index 100%
rename from drivers/media/platform/s5p-mfc/Makefile
rename to drivers/media/platform/samsung/s5p-mfc/Makefile
diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v10.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/regs-mfc-v10.h
rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v10.h
diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v6.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v6.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/regs-mfc-v6.h
rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v6.h
diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v7.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v7.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/regs-mfc-v7.h
rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v7.h
diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v8.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc-v8.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/regs-mfc-v8.h
rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc-v8.h
diff --git a/drivers/media/platform/s5p-mfc/regs-mfc.h b/drivers/media/platform/samsung/s5p-mfc/regs-mfc.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/regs-mfc.h
rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc.h
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c
similarity index 89%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c
index 0e88c28f4ad3..774c573dc075 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c
*
* Copyright (C) 2012 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h
similarity index 92%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h
index ed4e32a12552..945d12fdceb7 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h
*
* Copyright (C) 2012 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c
similarity index 98%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c
index 1ea4eda9c8e0..327e54e70611 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h
similarity index 82%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h
index 917854bffe9f..6eafa514aebc 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c
similarity index 98%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c
index 1f42130cc865..f8588e52dfc8 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c
*
* Copyright (c) 2012 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h
similarity index 82%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h
index c19884ea2bfc..9dc44460cc38 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_common.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
similarity index 99%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
index da138c314963..72d70984e99a 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h
similarity index 92%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h
index 7f32ef8a6b61..653ba5f3d048 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h
similarity index 95%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_debug.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h
index 752bbe4fe48e..bba5dad6dbff 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_debug.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
- * drivers/media/platform/s5p-mfc/s5p_mfc_debug.h
+ * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h
*
* Header file for Samsung MFC (Multi Function Codec - FIMV) driver
* This file contains debug macros
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c
similarity index 99%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c
index c0798811755c..4b89df8bfd18 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h
similarity index 90%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_dec.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h
index 0e9a0e3bbbe7..0c52ab46cff7 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_dec.h
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
similarity index 99%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
index 1fad99edb091..a8877d805b29 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c
*
* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h
similarity index 90%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_enc.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h
index cacd1ca43e19..3f1b1a037a4f 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_enc.h
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_intr.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.c
similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_intr.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.c
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_intr.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_intr.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.h
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_iommu.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_iommu.h
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c
similarity index 98%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c
index bb65671eea91..673962301173 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
+ * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c
*
* Samsung MFC (Multi Function Codec - FIMV) driver
* This file contains hw related functions.
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h
similarity index 99%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h
index 1c5d2d4c0543..b9831275f3ab 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
- * drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
+ * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h
*
* Header file for Samsung MFC (Multi Function Codec - FIMV) driver
* Contains declarations of hw related functions.
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c
similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h
similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
similarity index 99%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
index a1453053e31a..8227004f6746 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
- * drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+ * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c
*
* Samsung MFC (Multi Function Codec - FIMV) driver
* This file contains hw related functions.
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h
similarity index 96%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h
index 8ca514bf5e37..e4dd03c5454c 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
- * drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
+ * drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h
*
* Header file for Samsung MFC (Multi Function Codec - FIMV) driver
* Contains declarations of hw related functions.
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c
similarity index 97%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c
index 88b7d33c9197..72a901e99450 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h
similarity index 87%
rename from drivers/media/platform/s5p-mfc/s5p_mfc_pm.h
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h
index 3d26443189a2..4159d2364e87 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h
+++ b/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * linux/drivers/media/platform/s5p-mfc/s5p_mfc_pm.h
+ * linux/drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h
*
* Copyright (C) 2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 17/24] media: platform: rename stm32/ to sti/stm32/
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
` (12 preceding siblings ...)
2022-03-13 10:51 ` [PATCH 16/24] media: platform: rename s5p-mfc/ to samsung/s5p-mfc/ Mauro Carvalho Chehab
@ 2022-03-13 10:51 ` Mauro Carvalho Chehab
2022-03-14 8:39 ` Alain Volmat
2022-03-13 10:52 ` [PATCH 23/24] media: platform: Create vendor/{Makefile, Kconfig} files Mauro Carvalho Chehab
` (2 subsequent siblings)
16 siblings, 1 reply; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:51 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Alain Volmat,
Alexandre Torgue, Alexey Khoroshilov, Dillon Min, Dmitriy Ulitin,
Dmitry Osipenko, Eugen Hristev, Hans Verkuil, Hugues Fruchet,
Jacopo Mondi, Jernej Skrabec, Lad Prabhakar, Laurent Pinchart,
Leon Romanovsky, Maxime Coquelin, Ming Qian, Sakari Ailus,
Tomi Valkeinen, linux-arm-kernel, linux-kernel, linux-media,
linux-stm32
As the end goal is to have platform drivers split by vendor,
rename stm32/ to sti/stm32/.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
MAINTAINERS | 2 +-
drivers/media/platform/Kconfig | 2 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/{ => sti}/stm32/Kconfig | 0
drivers/media/platform/{ => sti}/stm32/Makefile | 0
drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c | 0
drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h | 0
drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c | 0
drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h | 0
drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c | 0
10 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/media/platform/{ => sti}/stm32/Kconfig (100%)
rename drivers/media/platform/{ => sti}/stm32/Makefile (100%)
rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c (100%)
rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h (100%)
rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c (100%)
rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h (100%)
rename drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7711a5ea125e..620705e0f043 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12046,7 +12046,7 @@ L: linux-media@vger.kernel.org
S: Supported
T: git git://linuxtv.org/media_tree.git
F: Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
-F: drivers/media/platform/stm32/stm32-dcmi.c
+F: drivers/media/platform/sti/stm32/stm32-dcmi.c
MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
M: Mauro Carvalho Chehab <mchehab@kernel.org>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index c3594807f8d7..cf373bfbca1b 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -95,7 +95,7 @@ source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
source "drivers/media/platform/sti/Kconfig"
-source "drivers/media/platform/stm32/Kconfig"
+source "drivers/media/platform/sti/stm32/Kconfig"
source "drivers/media/platform/ti-vpe/Kconfig"
source "drivers/media/platform/via/Kconfig"
source "drivers/media/platform/xilinx/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 6a766acfbe37..e3dd2331003a 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -40,7 +40,7 @@ obj-y += sti/bdisp/
obj-y += sti/c8sectpfe/
obj-y += sti/delta/
obj-y += sti/hva/
-obj-y += stm32/
+obj-y += sti/stm32/
obj-y += ti-vpe/
obj-y += via/
obj-y += xilinx/
diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/sti/stm32/Kconfig
similarity index 100%
rename from drivers/media/platform/stm32/Kconfig
rename to drivers/media/platform/sti/stm32/Kconfig
diff --git a/drivers/media/platform/stm32/Makefile b/drivers/media/platform/sti/stm32/Makefile
similarity index 100%
rename from drivers/media/platform/stm32/Makefile
rename to drivers/media/platform/sti/stm32/Makefile
diff --git a/drivers/media/platform/stm32/dma2d/dma2d-hw.c b/drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c
rename to drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
diff --git a/drivers/media/platform/stm32/dma2d/dma2d-regs.h b/drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h
rename to drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
diff --git a/drivers/media/platform/stm32/dma2d/dma2d.c b/drivers/media/platform/sti/stm32/dma2d/dma2d.c
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d.c
rename to drivers/media/platform/sti/stm32/dma2d/dma2d.c
diff --git a/drivers/media/platform/stm32/dma2d/dma2d.h b/drivers/media/platform/sti/stm32/dma2d/dma2d.h
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d.h
rename to drivers/media/platform/sti/stm32/dma2d/dma2d.h
diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/sti/stm32/stm32-dcmi.c
similarity index 100%
rename from drivers/media/platform/stm32/stm32-dcmi.c
rename to drivers/media/platform/sti/stm32/stm32-dcmi.c
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* Re: [PATCH 17/24] media: platform: rename stm32/ to sti/stm32/
2022-03-13 10:51 ` [PATCH 17/24] media: platform: rename stm32/ to sti/stm32/ Mauro Carvalho Chehab
@ 2022-03-14 8:39 ` Alain Volmat
2022-03-14 11:14 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 31+ messages in thread
From: Alain Volmat @ 2022-03-14 8:39 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Niklas Söderlund, Alexandre Torgue, Alexey Khoroshilov,
Dillon Min, Dmitriy Ulitin, Dmitry Osipenko, Eugen Hristev,
Hans Verkuil, Hugues Fruchet, Jacopo Mondi, Jernej Skrabec,
Lad Prabhakar, Laurent Pinchart, Leon Romanovsky,
Maxime Coquelin, Ming Qian, Sakari Ailus, Tomi Valkeinen,
linux-arm-kernel, linux-kernel, linux-media, linux-stm32
Hi Mauro,
I don't think stm32 should be put within the sti platform folder.
sti and stm32 are 2 different platforms from ST Microelectronics.
STi refers to the platform with SoCs such as STiH407/STiH410 and STiH418
while stm32 are all STM32 ones. Those two platforms aren't related.
What about having a folder stmicro or stmicroelectronics (too long
probably :D) with the 2 folders sti and stm32 into it ?
Alain
On Sun, Mar 13, 2022 at 11:51:58AM +0100, Mauro Carvalho Chehab wrote:
> As the end goal is to have platform drivers split by vendor,
> rename stm32/ to sti/stm32/.
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> ---
>
> To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
> See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
>
> MAINTAINERS | 2 +-
> drivers/media/platform/Kconfig | 2 +-
> drivers/media/platform/Makefile | 2 +-
> drivers/media/platform/{ => sti}/stm32/Kconfig | 0
> drivers/media/platform/{ => sti}/stm32/Makefile | 0
> drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c | 0
> drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h | 0
> drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c | 0
> drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h | 0
> drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c | 0
> 10 files changed, 3 insertions(+), 3 deletions(-)
> rename drivers/media/platform/{ => sti}/stm32/Kconfig (100%)
> rename drivers/media/platform/{ => sti}/stm32/Makefile (100%)
> rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c (100%)
> rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h (100%)
> rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c (100%)
> rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h (100%)
> rename drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7711a5ea125e..620705e0f043 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -12046,7 +12046,7 @@ L: linux-media@vger.kernel.org
> S: Supported
> T: git git://linuxtv.org/media_tree.git
> F: Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
> -F: drivers/media/platform/stm32/stm32-dcmi.c
> +F: drivers/media/platform/sti/stm32/stm32-dcmi.c
>
> MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
> M: Mauro Carvalho Chehab <mchehab@kernel.org>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index c3594807f8d7..cf373bfbca1b 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -95,7 +95,7 @@ source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
> source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
> source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
> source "drivers/media/platform/sti/Kconfig"
> -source "drivers/media/platform/stm32/Kconfig"
> +source "drivers/media/platform/sti/stm32/Kconfig"
> source "drivers/media/platform/ti-vpe/Kconfig"
> source "drivers/media/platform/via/Kconfig"
> source "drivers/media/platform/xilinx/Kconfig"
> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
> index 6a766acfbe37..e3dd2331003a 100644
> --- a/drivers/media/platform/Makefile
> +++ b/drivers/media/platform/Makefile
> @@ -40,7 +40,7 @@ obj-y += sti/bdisp/
> obj-y += sti/c8sectpfe/
> obj-y += sti/delta/
> obj-y += sti/hva/
> -obj-y += stm32/
> +obj-y += sti/stm32/
> obj-y += ti-vpe/
> obj-y += via/
> obj-y += xilinx/
> diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/sti/stm32/Kconfig
> similarity index 100%
> rename from drivers/media/platform/stm32/Kconfig
> rename to drivers/media/platform/sti/stm32/Kconfig
> diff --git a/drivers/media/platform/stm32/Makefile b/drivers/media/platform/sti/stm32/Makefile
> similarity index 100%
> rename from drivers/media/platform/stm32/Makefile
> rename to drivers/media/platform/sti/stm32/Makefile
> diff --git a/drivers/media/platform/stm32/dma2d/dma2d-hw.c b/drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
> similarity index 100%
> rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c
> rename to drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
> diff --git a/drivers/media/platform/stm32/dma2d/dma2d-regs.h b/drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
> similarity index 100%
> rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h
> rename to drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
> diff --git a/drivers/media/platform/stm32/dma2d/dma2d.c b/drivers/media/platform/sti/stm32/dma2d/dma2d.c
> similarity index 100%
> rename from drivers/media/platform/stm32/dma2d/dma2d.c
> rename to drivers/media/platform/sti/stm32/dma2d/dma2d.c
> diff --git a/drivers/media/platform/stm32/dma2d/dma2d.h b/drivers/media/platform/sti/stm32/dma2d/dma2d.h
> similarity index 100%
> rename from drivers/media/platform/stm32/dma2d/dma2d.h
> rename to drivers/media/platform/sti/stm32/dma2d/dma2d.h
> diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/sti/stm32/stm32-dcmi.c
> similarity index 100%
> rename from drivers/media/platform/stm32/stm32-dcmi.c
> rename to drivers/media/platform/sti/stm32/stm32-dcmi.c
> --
> 2.35.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PATCH 17/24] media: platform: rename stm32/ to sti/stm32/
2022-03-14 8:39 ` Alain Volmat
@ 2022-03-14 11:14 ` Mauro Carvalho Chehab
2022-03-14 11:34 ` Hugues FRUCHET - FOSS
0 siblings, 1 reply; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 11:14 UTC (permalink / raw)
To: Alain Volmat
Cc: Niklas Söderlund, Alexandre Torgue, Alexey Khoroshilov,
Dillon Min, Dmitriy Ulitin, Dmitry Osipenko, Eugen Hristev,
Hans Verkuil, Hugues Fruchet, Jacopo Mondi, Jernej Skrabec,
Lad Prabhakar, Laurent Pinchart, Leon Romanovsky,
Maxime Coquelin, Ming Qian, Sakari Ailus, Tomi Valkeinen,
linux-arm-kernel, linux-kernel, linux-media, linux-stm32
Hi Alain,
Em Mon, 14 Mar 2022 09:39:42 +0100
Alain Volmat <alain.volmat@foss.st.com> escreveu:
> Hi Mauro,
>
> I don't think stm32 should be put within the sti platform folder.
> sti and stm32 are 2 different platforms from ST Microelectronics.
> STi refers to the platform with SoCs such as STiH407/STiH410 and STiH418
> while stm32 are all STM32 ones. Those two platforms aren't related.
> What about having a folder stmicro or stmicroelectronics (too long
> probably :D) with the 2 folders sti and stm32 into it ?
Yeah, a folder like "st", "stm" (New York Stock Exchange uses this name),
"stmicro", or even "stmicroelectronics" with either two folders on it
or two separate submenus work from my side.
I would prefer to have a short name there, like "st" or "stm", but it
is up to you to choose whatever works best for ST Microelectronics.
Just let me know what works best and I'll change it at the patch.
>
> Alain
>
> On Sun, Mar 13, 2022 at 11:51:58AM +0100, Mauro Carvalho Chehab wrote:
> > As the end goal is to have platform drivers split by vendor,
> > rename stm32/ to sti/stm32/.
> >
> > Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> > ---
> >
> > To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
> > See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
> >
> > MAINTAINERS | 2 +-
> > drivers/media/platform/Kconfig | 2 +-
> > drivers/media/platform/Makefile | 2 +-
> > drivers/media/platform/{ => sti}/stm32/Kconfig | 0
> > drivers/media/platform/{ => sti}/stm32/Makefile | 0
> > drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c | 0
> > drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h | 0
> > drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c | 0
> > drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h | 0
> > drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c | 0
> > 10 files changed, 3 insertions(+), 3 deletions(-)
> > rename drivers/media/platform/{ => sti}/stm32/Kconfig (100%)
> > rename drivers/media/platform/{ => sti}/stm32/Makefile (100%)
> > rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c (100%)
> > rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h (100%)
> > rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c (100%)
> > rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h (100%)
> > rename drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c (100%)
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 7711a5ea125e..620705e0f043 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -12046,7 +12046,7 @@ L: linux-media@vger.kernel.org
> > S: Supported
> > T: git git://linuxtv.org/media_tree.git
> > F: Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
> > -F: drivers/media/platform/stm32/stm32-dcmi.c
> > +F: drivers/media/platform/sti/stm32/stm32-dcmi.c
> >
> > MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
> > M: Mauro Carvalho Chehab <mchehab@kernel.org>
> > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> > index c3594807f8d7..cf373bfbca1b 100644
> > --- a/drivers/media/platform/Kconfig
> > +++ b/drivers/media/platform/Kconfig
> > @@ -95,7 +95,7 @@ source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
> > source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
> > source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
> > source "drivers/media/platform/sti/Kconfig"
> > -source "drivers/media/platform/stm32/Kconfig"
> > +source "drivers/media/platform/sti/stm32/Kconfig"
> > source "drivers/media/platform/ti-vpe/Kconfig"
> > source "drivers/media/platform/via/Kconfig"
> > source "drivers/media/platform/xilinx/Kconfig"
> > diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
> > index 6a766acfbe37..e3dd2331003a 100644
> > --- a/drivers/media/platform/Makefile
> > +++ b/drivers/media/platform/Makefile
> > @@ -40,7 +40,7 @@ obj-y += sti/bdisp/
> > obj-y += sti/c8sectpfe/
> > obj-y += sti/delta/
> > obj-y += sti/hva/
> > -obj-y += stm32/
> > +obj-y += sti/stm32/
> > obj-y += ti-vpe/
> > obj-y += via/
> > obj-y += xilinx/
> > diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/sti/stm32/Kconfig
> > similarity index 100%
> > rename from drivers/media/platform/stm32/Kconfig
> > rename to drivers/media/platform/sti/stm32/Kconfig
> > diff --git a/drivers/media/platform/stm32/Makefile b/drivers/media/platform/sti/stm32/Makefile
> > similarity index 100%
> > rename from drivers/media/platform/stm32/Makefile
> > rename to drivers/media/platform/sti/stm32/Makefile
> > diff --git a/drivers/media/platform/stm32/dma2d/dma2d-hw.c b/drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
> > similarity index 100%
> > rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c
> > rename to drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
> > diff --git a/drivers/media/platform/stm32/dma2d/dma2d-regs.h b/drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
> > similarity index 100%
> > rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h
> > rename to drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
> > diff --git a/drivers/media/platform/stm32/dma2d/dma2d.c b/drivers/media/platform/sti/stm32/dma2d/dma2d.c
> > similarity index 100%
> > rename from drivers/media/platform/stm32/dma2d/dma2d.c
> > rename to drivers/media/platform/sti/stm32/dma2d/dma2d.c
> > diff --git a/drivers/media/platform/stm32/dma2d/dma2d.h b/drivers/media/platform/sti/stm32/dma2d/dma2d.h
> > similarity index 100%
> > rename from drivers/media/platform/stm32/dma2d/dma2d.h
> > rename to drivers/media/platform/sti/stm32/dma2d/dma2d.h
> > diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/sti/stm32/stm32-dcmi.c
> > similarity index 100%
> > rename from drivers/media/platform/stm32/stm32-dcmi.c
> > rename to drivers/media/platform/sti/stm32/stm32-dcmi.c
> > --
> > 2.35.1
> >
Thanks,
Mauro
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PATCH 17/24] media: platform: rename stm32/ to sti/stm32/
2022-03-14 11:14 ` Mauro Carvalho Chehab
@ 2022-03-14 11:34 ` Hugues FRUCHET - FOSS
2022-03-14 13:10 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 31+ messages in thread
From: Hugues FRUCHET - FOSS @ 2022-03-14 11:34 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Alain Volmat
Cc: Niklas Söderlund, Alexandre Torgue, Alexey Khoroshilov,
Dillon Min, Dmitriy Ulitin, Dmitry Osipenko, Eugen Hristev,
Hans Verkuil, Jacopo Mondi, Jernej Skrabec, Lad Prabhakar,
Laurent Pinchart, Leon Romanovsky, Maxime Coquelin, Ming Qian,
Sakari Ailus, Tomi Valkeinen, linux-arm-kernel, linux-kernel,
linux-media, linux-stm32
Hi Mauro,
Ideally we would like to stick to sti/ and stm32/ at same level, as it
is done in various other locations:
./Documentation/arm/sti/
./Documentation/arm/stm32/
./arch/arm/mach-sti
./arch/arm/mach-stm32
./drivers/media/cec/platform/sti/
./drivers/media/cec/platform/stm32/
./drivers/gpu/drm/sti/
./drivers/gpu/drm/stm/
./sound/soc/sti/
./sound/soc/stm/
Is this possible to keep those media folders as is ?
Best regards,
Hugues.
On 3/14/22 12:14 PM, Mauro Carvalho Chehab wrote:
> Hi Alain,
>
> Em Mon, 14 Mar 2022 09:39:42 +0100
> Alain Volmat <alain.volmat@foss.st.com> escreveu:
>
>> Hi Mauro,
>>
>> I don't think stm32 should be put within the sti platform folder.
>> sti and stm32 are 2 different platforms from ST Microelectronics.
>> STi refers to the platform with SoCs such as STiH407/STiH410 and STiH418
>> while stm32 are all STM32 ones. Those two platforms aren't related.
>> What about having a folder stmicro or stmicroelectronics (too long
>> probably :D) with the 2 folders sti and stm32 into it ?
>
> Yeah, a folder like "st", "stm" (New York Stock Exchange uses this name),
> "stmicro", or even "stmicroelectronics" with either two folders on it
> or two separate submenus work from my side.
>
> I would prefer to have a short name there, like "st" or "stm", but it
> is up to you to choose whatever works best for ST Microelectronics.
>
> Just let me know what works best and I'll change it at the patch.
>
>>
>> Alain
>>
>> On Sun, Mar 13, 2022 at 11:51:58AM +0100, Mauro Carvalho Chehab wrote:
>>> As the end goal is to have platform drivers split by vendor,
>>> rename stm32/ to sti/stm32/.
>>>
>>> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
>>> ---
>>>
>>> To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
>>> See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
>>>
>>> MAINTAINERS | 2 +-
>>> drivers/media/platform/Kconfig | 2 +-
>>> drivers/media/platform/Makefile | 2 +-
>>> drivers/media/platform/{ => sti}/stm32/Kconfig | 0
>>> drivers/media/platform/{ => sti}/stm32/Makefile | 0
>>> drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c | 0
>>> drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h | 0
>>> drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c | 0
>>> drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h | 0
>>> drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c | 0
>>> 10 files changed, 3 insertions(+), 3 deletions(-)
>>> rename drivers/media/platform/{ => sti}/stm32/Kconfig (100%)
>>> rename drivers/media/platform/{ => sti}/stm32/Makefile (100%)
>>> rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-hw.c (100%)
>>> rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d-regs.h (100%)
>>> rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.c (100%)
>>> rename drivers/media/platform/{ => sti}/stm32/dma2d/dma2d.h (100%)
>>> rename drivers/media/platform/{ => sti}/stm32/stm32-dcmi.c (100%)
>>>
>>> diff --git a/MAINTAINERS b/MAINTAINERS
>>> index 7711a5ea125e..620705e0f043 100644
>>> --- a/MAINTAINERS
>>> +++ b/MAINTAINERS
>>> @@ -12046,7 +12046,7 @@ L: linux-media@vger.kernel.org
>>> S: Supported
>>> T: git git://linuxtv.org/media_tree.git
>>> F: Documentation/devicetree/bindings/media/st,stm32-dcmi.yaml
>>> -F: drivers/media/platform/stm32/stm32-dcmi.c
>>> +F: drivers/media/platform/sti/stm32/stm32-dcmi.c
>>>
>>> MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
>>> M: Mauro Carvalho Chehab <mchehab@kernel.org>
>>> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
>>> index c3594807f8d7..cf373bfbca1b 100644
>>> --- a/drivers/media/platform/Kconfig
>>> +++ b/drivers/media/platform/Kconfig
>>> @@ -95,7 +95,7 @@ source "drivers/media/platform/samsung/s5p-g2d/Kconfig"
>>> source "drivers/media/platform/samsung/s5p-jpeg/Kconfig"
>>> source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
>>> source "drivers/media/platform/sti/Kconfig"
>>> -source "drivers/media/platform/stm32/Kconfig"
>>> +source "drivers/media/platform/sti/stm32/Kconfig"
>>> source "drivers/media/platform/ti-vpe/Kconfig"
>>> source "drivers/media/platform/via/Kconfig"
>>> source "drivers/media/platform/xilinx/Kconfig"
>>> diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
>>> index 6a766acfbe37..e3dd2331003a 100644
>>> --- a/drivers/media/platform/Makefile
>>> +++ b/drivers/media/platform/Makefile
>>> @@ -40,7 +40,7 @@ obj-y += sti/bdisp/
>>> obj-y += sti/c8sectpfe/
>>> obj-y += sti/delta/
>>> obj-y += sti/hva/
>>> -obj-y += stm32/
>>> +obj-y += sti/stm32/
>>> obj-y += ti-vpe/
>>> obj-y += via/
>>> obj-y += xilinx/
>>> diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/sti/stm32/Kconfig
>>> similarity index 100%
>>> rename from drivers/media/platform/stm32/Kconfig
>>> rename to drivers/media/platform/sti/stm32/Kconfig
>>> diff --git a/drivers/media/platform/stm32/Makefile b/drivers/media/platform/sti/stm32/Makefile
>>> similarity index 100%
>>> rename from drivers/media/platform/stm32/Makefile
>>> rename to drivers/media/platform/sti/stm32/Makefile
>>> diff --git a/drivers/media/platform/stm32/dma2d/dma2d-hw.c b/drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
>>> similarity index 100%
>>> rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c
>>> rename to drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
>>> diff --git a/drivers/media/platform/stm32/dma2d/dma2d-regs.h b/drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
>>> similarity index 100%
>>> rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h
>>> rename to drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
>>> diff --git a/drivers/media/platform/stm32/dma2d/dma2d.c b/drivers/media/platform/sti/stm32/dma2d/dma2d.c
>>> similarity index 100%
>>> rename from drivers/media/platform/stm32/dma2d/dma2d.c
>>> rename to drivers/media/platform/sti/stm32/dma2d/dma2d.c
>>> diff --git a/drivers/media/platform/stm32/dma2d/dma2d.h b/drivers/media/platform/sti/stm32/dma2d/dma2d.h
>>> similarity index 100%
>>> rename from drivers/media/platform/stm32/dma2d/dma2d.h
>>> rename to drivers/media/platform/sti/stm32/dma2d/dma2d.h
>>> diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/sti/stm32/stm32-dcmi.c
>>> similarity index 100%
>>> rename from drivers/media/platform/stm32/stm32-dcmi.c
>>> rename to drivers/media/platform/sti/stm32/stm32-dcmi.c
>>> --
>>> 2.35.1
>>>
>
>
>
> Thanks,
> Mauro
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PATCH 17/24] media: platform: rename stm32/ to sti/stm32/
2022-03-14 11:34 ` Hugues FRUCHET - FOSS
@ 2022-03-14 13:10 ` Mauro Carvalho Chehab
2022-03-15 9:02 ` Hugues FRUCHET - FOSS
0 siblings, 1 reply; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-14 13:10 UTC (permalink / raw)
To: Hugues FRUCHET - FOSS
Cc: Alain Volmat, Niklas Söderlund, Alexandre Torgue,
Alexey Khoroshilov, Dillon Min, Dmitriy Ulitin, Dmitry Osipenko,
Eugen Hristev, Hans Verkuil, Jacopo Mondi, Jernej Skrabec,
Lad Prabhakar, Laurent Pinchart, Leon Romanovsky,
Maxime Coquelin, Ming Qian, Sakari Ailus, Tomi Valkeinen,
linux-arm-kernel, linux-kernel, linux-media, linux-stm32
Em Mon, 14 Mar 2022 12:34:47 +0100
Hugues FRUCHET - FOSS <hugues.fruchet@foss.st.com> escreveu:
> Hi Mauro,
>
> Ideally we would like to stick to sti/ and stm32/ at same level, as it
> is done in various other locations:
>
> ./Documentation/arm/sti/
> ./Documentation/arm/stm32/
>
> ./arch/arm/mach-sti
> ./arch/arm/mach-stm32
>
> ./drivers/media/cec/platform/sti/
> ./drivers/media/cec/platform/stm32/
>
> ./drivers/gpu/drm/sti/
> ./drivers/gpu/drm/stm/
>
> ./sound/soc/sti/
> ./sound/soc/stm/
>
> Is this possible to keep those media folders as is ?
If we add them under:
./drivers/media/platform/stm/sti/
./drivers/media/platform/stm/stm32/
They'll both be at the same level.
It has been increasingly hard to maintain media/platform, as the file
become too big and disorganized. Sorting it per-vendor seems to be the
best thing, as it will keep things better organized.
As a side effect, with such kind of change, it is now possible to
have a MAINTAINERS entry that would point to a mailing list and/or
some SoC maintainers/reviewers that should be c/c to all patches
affecting drivers/media/platform/<vendor>.
Thanks,
Mauro
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 17/24] media: platform: rename stm32/ to sti/stm32/
2022-03-14 13:10 ` Mauro Carvalho Chehab
@ 2022-03-15 9:02 ` Hugues FRUCHET - FOSS
2022-03-16 13:28 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 31+ messages in thread
From: Hugues FRUCHET - FOSS @ 2022-03-15 9:02 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Alain Volmat, Niklas Söderlund, Alexandre Torgue,
Alexey Khoroshilov, Dillon Min, Dmitriy Ulitin, Dmitry Osipenko,
Eugen Hristev, Hans Verkuil, Jacopo Mondi, Jernej Skrabec,
Lad Prabhakar, Laurent Pinchart, Leon Romanovsky,
Maxime Coquelin, Ming Qian, Sakari Ailus, Tomi Valkeinen,
linux-arm-kernel, linux-kernel, linux-media, linux-stm32
Hi Mauro,
sti and stm32 architectures don't have the same maintainers nor same
mailing list as you can see below:
ARM/STM32 ARCHITECTURE
M: Maxime Coquelin <mcoquelin.stm32@gmail.com>
M: Alexandre Torgue <alexandre.torgue@foss.st.com>
L: linux-stm32@st-md-mailman.stormreply.com (moderated for
non-subscribers)
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
T: git
git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
F: arch/arm/boot/dts/stm32*
F: arch/arm/mach-stm32/
F: drivers/clocksource/armv7m_systick.c
N: stm32
N: stm
ARM/STI ARCHITECTURE
M: Patrice Chotard <patrice.chotard@foss.st.com>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
W: http://www.stlinux.com
F: Documentation/devicetree/bindings/i2c/i2c-st.txt
F: arch/arm/boot/dts/sti*
F: arch/arm/mach-sti/
F: drivers/ata/ahci_st.c
F: drivers/char/hw_random/st-rng.c
F: drivers/clocksource/arm_global_timer.c
F: drivers/clocksource/clksrc_st_lpc.c
F: drivers/cpufreq/sti-cpufreq.c
F: drivers/dma/st_fdma*
F: drivers/i2c/busses/i2c-st.c
F: drivers/media/platform/sti/c8sectpfe/
F: drivers/media/rc/st_rc.c
F: drivers/mmc/host/sdhci-st.c
F: drivers/phy/st/phy-miphy28lp.c
F: drivers/phy/st/phy-stih407-usb.c
F: drivers/pinctrl/pinctrl-st.c
F: drivers/remoteproc/st_remoteproc.c
F: drivers/remoteproc/st_slim_rproc.c
F: drivers/reset/sti/
F: drivers/rtc/rtc-st-lpc.c
F: drivers/tty/serial/st-asc.c
F: drivers/usb/dwc3/dwc3-st.c
F: drivers/usb/host/ehci-st.c
F: drivers/usb/host/ohci-st.c
F: drivers/watchdog/st_lpc_wdt.c
F: include/linux/remoteproc/st_slim_rproc.h
but anyway, if this is really important for you to have a top folder to
group all ST stuff, we prefer to have "st" prefix than "stm":
> ./drivers/media/platform/st/sti/
> ./drivers/media/platform/st/stm32/
But one more time, our flavour is to stick to:
> ./drivers/media/platform/sti/
> ./drivers/media/platform/stm32/
Best regards,
Hugues.
On 3/14/22 2:10 PM, Mauro Carvalho Chehab wrote:
> Em Mon, 14 Mar 2022 12:34:47 +0100
> Hugues FRUCHET - FOSS <hugues.fruchet@foss.st.com> escreveu:
>
>> Hi Mauro,
>>
>> Ideally we would like to stick to sti/ and stm32/ at same level, as it
>> is done in various other locations:
>>
>> ./Documentation/arm/sti/
>> ./Documentation/arm/stm32/
>>
>> ./arch/arm/mach-sti
>> ./arch/arm/mach-stm32
>>
>> ./drivers/media/cec/platform/sti/
>> ./drivers/media/cec/platform/stm32/
>>
>> ./drivers/gpu/drm/sti/
>> ./drivers/gpu/drm/stm/
>>
>> ./sound/soc/sti/
>> ./sound/soc/stm/
>>
>> Is this possible to keep those media folders as is ?
>
> If we add them under:
> ./drivers/media/platform/stm/sti/
> ./drivers/media/platform/stm/stm32/
>
> They'll both be at the same level.
>
> It has been increasingly hard to maintain media/platform, as the file
> become too big and disorganized. Sorting it per-vendor seems to be the
> best thing, as it will keep things better organized.
>
> As a side effect, with such kind of change, it is now possible to
> have a MAINTAINERS entry that would point to a mailing list and/or
> some SoC maintainers/reviewers that should be c/c to all patches
> affecting drivers/media/platform/<vendor>.
>
> Thanks,
> Mauro
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH 17/24] media: platform: rename stm32/ to sti/stm32/
2022-03-15 9:02 ` Hugues FRUCHET - FOSS
@ 2022-03-16 13:28 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-16 13:28 UTC (permalink / raw)
To: Hugues FRUCHET - FOSS
Cc: Alain Volmat, Niklas Söderlund, Alexandre Torgue,
Alexey Khoroshilov, Dillon Min, Dmitriy Ulitin, Dmitry Osipenko,
Eugen Hristev, Hans Verkuil, Jacopo Mondi, Jernej Skrabec,
Lad Prabhakar, Laurent Pinchart, Leon Romanovsky,
Maxime Coquelin, Ming Qian, Sakari Ailus, Tomi Valkeinen,
linux-arm-kernel, linux-kernel, linux-media, linux-stm32
Em Tue, 15 Mar 2022 10:02:53 +0100
Hugues FRUCHET - FOSS <hugues.fruchet@foss.st.com> escreveu:
> Hi Mauro,
>
> sti and stm32 architectures don't have the same maintainers nor same
> mailing list as you can see below:
>
> ARM/STM32 ARCHITECTURE
> M: Maxime Coquelin <mcoquelin.stm32@gmail.com>
> M: Alexandre Torgue <alexandre.torgue@foss.st.com>
> L: linux-stm32@st-md-mailman.stormreply.com (moderated for
> non-subscribers)
> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> S: Maintained
> T: git
> git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
> F: arch/arm/boot/dts/stm32*
> F: arch/arm/mach-stm32/
> F: drivers/clocksource/armv7m_systick.c
> N: stm32
> N: stm
>
> ARM/STI ARCHITECTURE
> M: Patrice Chotard <patrice.chotard@foss.st.com>
> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> S: Maintained
> W: http://www.stlinux.com
> F: Documentation/devicetree/bindings/i2c/i2c-st.txt
> F: arch/arm/boot/dts/sti*
> F: arch/arm/mach-sti/
> F: drivers/ata/ahci_st.c
> F: drivers/char/hw_random/st-rng.c
> F: drivers/clocksource/arm_global_timer.c
> F: drivers/clocksource/clksrc_st_lpc.c
> F: drivers/cpufreq/sti-cpufreq.c
> F: drivers/dma/st_fdma*
> F: drivers/i2c/busses/i2c-st.c
> F: drivers/media/platform/sti/c8sectpfe/
> F: drivers/media/rc/st_rc.c
> F: drivers/mmc/host/sdhci-st.c
> F: drivers/phy/st/phy-miphy28lp.c
> F: drivers/phy/st/phy-stih407-usb.c
> F: drivers/pinctrl/pinctrl-st.c
> F: drivers/remoteproc/st_remoteproc.c
> F: drivers/remoteproc/st_slim_rproc.c
> F: drivers/reset/sti/
> F: drivers/rtc/rtc-st-lpc.c
> F: drivers/tty/serial/st-asc.c
> F: drivers/usb/dwc3/dwc3-st.c
> F: drivers/usb/host/ehci-st.c
> F: drivers/usb/host/ohci-st.c
> F: drivers/watchdog/st_lpc_wdt.c
> F: include/linux/remoteproc/st_slim_rproc.h
Ok.
> but anyway, if this is really important for you to have a top folder to
> group all ST stuff, we prefer to have "st" prefix than "stm":
> > ./drivers/media/platform/st/sti/
> > ./drivers/media/platform/st/stm32/
Works for me. Yeah, it is important to have them at the same dir.
After this series, there's a comment on each platform subdir that
tells what vendor is there. That is meant to help selecting the right
drivers with make menuconfig/gconfig/xconfig, and it is reflected at
the .config file. I'm considering to actually add a submenu per vendor.
Ether way, if there's more than one directory per vendor, the "comment"
and/or "menuconfig/if/endif" entries would needed to be moved back to the
drivers/media/platform, making in messier again.
Thanks,
Mauro
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH 23/24] media: platform: Create vendor/{Makefile, Kconfig} files
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
` (13 preceding siblings ...)
2022-03-13 10:51 ` [PATCH 17/24] media: platform: rename stm32/ to sti/stm32/ Mauro Carvalho Chehab
@ 2022-03-13 10:52 ` Mauro Carvalho Chehab
2022-03-13 10:52 ` [PATCH 24/24] media: platform/*/Kconfig: make menus more uniform Mauro Carvalho Chehab
2022-03-13 11:00 ` [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
16 siblings, 0 replies; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:52 UTC (permalink / raw)
Cc: Mauro Carvalho Chehab, Niklas Söderlund, Andy Gross,
Bjorn Andersson, Dmitry Osipenko, Eugen Hristev, Hans Verkuil,
Heiko Stuebner, Jacopo Mondi, Jernej Skrabec, Laurent Pinchart,
Matthias Brugger, Ming Qian, Robert Foss, Sakari Ailus,
linux-arm-kernel, linux-arm-msm, linux-kernel, linux-media,
linux-mediatek, linux-rockchip
Instead of placing multiple per-vendor entries at the
platform/{Makefile,Kconfig}, create them at the per-vendor
directories.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
drivers/media/platform/Kconfig | 24 ++++------------
drivers/media/platform/Makefile | 35 ++++++------------------
drivers/media/platform/amlogic/Kconfig | 2 ++
drivers/media/platform/amlogic/Makefile | 2 ++
drivers/media/platform/mediatek/Kconfig | 5 ++++
drivers/media/platform/mediatek/Makefile | 5 ++++
drivers/media/platform/nvidia/Kconfig | 2 ++
drivers/media/platform/nxp/Kconfig | 1 +
drivers/media/platform/nxp/Makefile | 1 +
drivers/media/platform/qcom/Makefile | 3 ++
drivers/media/platform/rockchip/Makefile | 3 ++
drivers/media/platform/samsung/Kconfig | 7 +++++
drivers/media/platform/samsung/Makefile | 7 +++++
drivers/media/platform/sti/Kconfig | 1 +
drivers/media/platform/sti/Makefile | 6 ++++
drivers/media/platform/ti/Kconfig | 6 ++++
drivers/media/platform/ti/Makefile | 6 ++++
17 files changed, 70 insertions(+), 46 deletions(-)
create mode 100644 drivers/media/platform/amlogic/Kconfig
create mode 100644 drivers/media/platform/amlogic/Makefile
create mode 100644 drivers/media/platform/mediatek/Kconfig
create mode 100644 drivers/media/platform/mediatek/Makefile
create mode 100644 drivers/media/platform/nvidia/Kconfig
create mode 100644 drivers/media/platform/qcom/Makefile
create mode 100644 drivers/media/platform/rockchip/Makefile
create mode 100644 drivers/media/platform/samsung/Kconfig
create mode 100644 drivers/media/platform/samsung/Makefile
create mode 100644 drivers/media/platform/sti/Makefile
create mode 100644 drivers/media/platform/ti/Kconfig
create mode 100644 drivers/media/platform/ti/Makefile
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index d9bd7a675c22..4e7b2973fbc1 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -67,36 +67,22 @@ config VIDEO_MUX
source "drivers/media/platform/allegro-dvt/Kconfig"
source "drivers/media/platform/allwinner/Kconfig"
-source "drivers/media/platform/amlogic/meson-ge2d/Kconfig"
+source "drivers/media/platform/amlogic/Kconfig"
source "drivers/media/platform/aspeed/Kconfig"
source "drivers/media/platform/atmel/Kconfig"
source "drivers/media/platform/cadence/Kconfig"
source "drivers/media/platform/chips-media/Kconfig"
source "drivers/media/platform/intel/Kconfig"
source "drivers/media/platform/marvell/Kconfig"
-source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
-source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
-source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
-source "drivers/media/platform/mediatek/mtk-vpu/Kconfig"
-source "drivers/media/platform/nvidia/tegra-vde/Kconfig"
+source "drivers/media/platform/mediatek/Kconfig"
+source "drivers/media/platform/nvidia/Kconfig"
source "drivers/media/platform/nxp/Kconfig"
-source "drivers/media/platform/nxp/amphion/Kconfig"
source "drivers/media/platform/qcom/Kconfig"
source "drivers/media/platform/renesas/Kconfig"
source "drivers/media/platform/rockchip/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/samsung/s5p-jpeg/Kconfig"
-source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
+source "drivers/media/platform/samsung/Kconfig"
source "drivers/media/platform/sti/Kconfig"
-source "drivers/media/platform/sti/stm32/Kconfig"
-source "drivers/media/platform/ti/am437x/Kconfig"
-source "drivers/media/platform/ti/davinci/Kconfig"
-source "drivers/media/platform/ti/omap/Kconfig"
-source "drivers/media/platform/ti/omap3isp/Kconfig"
-source "drivers/media/platform/ti/vpe/Kconfig"
+source "drivers/media/platform/ti/Kconfig"
source "drivers/media/platform/via/Kconfig"
source "drivers/media/platform/xilinx/Kconfig"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 1e62a4009b6c..5b14b231140b 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -7,41 +7,22 @@
# (e. g. LC_ALL=C sort Makefile)
obj-y += allegro-dvt/
obj-y += allwinner/
-obj-y += amlogic/meson-ge2d/
+obj-y += amlogic/
obj-y += aspeed/
obj-y += atmel/
obj-y += cadence/
obj-y += chips-media/
obj-y += intel/
obj-y += marvell/
-obj-y += mediatek/mtk-jpeg/
-obj-y += mediatek/mtk-mdp/
-obj-y += mediatek/mtk-vcodec/
-obj-y += mediatek/mtk-vpu/
-obj-y += nvidia/tegra-vde/
+obj-y += mediatek/
+obj-y += nvidia/
obj-y += nxp/
-obj-y += nxp/amphion/
-obj-y += qcom/camss/
-obj-y += qcom/venus/
+obj-y += qcom/
obj-y += renesas/
-obj-y += rockchip/rga/
-obj-y += rockchip/rkisp1/
-obj-y += samsung/exynos-gsc/
-obj-y += samsung/exynos4-is/
-obj-y += samsung/s3c-camif/
-obj-y += samsung/s5p-g2d/
-obj-y += samsung/s5p-jpeg/
-obj-y += samsung/s5p-mfc/
-obj-y += sti/bdisp/
-obj-y += sti/c8sectpfe/
-obj-y += sti/delta/
-obj-y += sti/hva/
-obj-y += sti/stm32/
-obj-y += ti/am437x/
-obj-y += ti/davinci/
-obj-y += ti/omap/
-obj-y += ti/omap3isp/
-obj-y += ti/vpe/
+obj-y += rockchip/
+obj-y += samsung/
+obj-y += sti/
+obj-y += ti/
obj-y += via/
obj-y += xilinx/
diff --git a/drivers/media/platform/amlogic/Kconfig b/drivers/media/platform/amlogic/Kconfig
new file mode 100644
index 000000000000..09fb145a0b30
--- /dev/null
+++ b/drivers/media/platform/amlogic/Kconfig
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+source "drivers/media/platform/amlogic/meson-ge2d/Kconfig"
diff --git a/drivers/media/platform/amlogic/Makefile b/drivers/media/platform/amlogic/Makefile
new file mode 100644
index 000000000000..ec387adbacdd
--- /dev/null
+++ b/drivers/media/platform/amlogic/Makefile
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y += meson-ge2d/
diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platform/mediatek/Kconfig
new file mode 100644
index 000000000000..549abf1df7d9
--- /dev/null
+++ b/drivers/media/platform/mediatek/Kconfig
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
+source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
+source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
+source "drivers/media/platform/mediatek/mtk-vpu/Kconfig"
diff --git a/drivers/media/platform/mediatek/Makefile b/drivers/media/platform/mediatek/Makefile
new file mode 100644
index 000000000000..ec7f58943576
--- /dev/null
+++ b/drivers/media/platform/mediatek/Makefile
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y += mtk-jpeg/
+obj-y += mtk-mdp/
+obj-y += mtk-vcodec/
+obj-y += mtk-vpu/
diff --git a/drivers/media/platform/nvidia/Kconfig b/drivers/media/platform/nvidia/Kconfig
new file mode 100644
index 000000000000..413005d8cd66
--- /dev/null
+++ b/drivers/media/platform/nvidia/Kconfig
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+source "drivers/media/platform/nvidia/tegra-vde/Kconfig"
diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig
index af5cd4eb6bf3..e8c9d33cd3b7 100644
--- a/drivers/media/platform/nxp/Kconfig
+++ b/drivers/media/platform/nxp/Kconfig
@@ -64,3 +64,4 @@ config VIDEO_MX2_EMMAPRP
conversion.
source "drivers/media/platform/nxp/imx-jpeg/Kconfig"
+source "drivers/media/platform/nxp/amphion/Kconfig"
diff --git a/drivers/media/platform/nxp/Makefile b/drivers/media/platform/nxp/Makefile
index a217cf7f109d..9ff13ce1391d 100644
--- a/drivers/media/platform/nxp/Makefile
+++ b/drivers/media/platform/nxp/Makefile
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
+obj-y += amphion/
obj-y += imx-jpeg/
obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o
diff --git a/drivers/media/platform/qcom/Makefile b/drivers/media/platform/qcom/Makefile
new file mode 100644
index 000000000000..98628912bc05
--- /dev/null
+++ b/drivers/media/platform/qcom/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y += camss/
+obj-y += venus/
diff --git a/drivers/media/platform/rockchip/Makefile b/drivers/media/platform/rockchip/Makefile
new file mode 100644
index 000000000000..ef58d1a82fc6
--- /dev/null
+++ b/drivers/media/platform/rockchip/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y += rga/
+obj-y += rkisp1/
diff --git a/drivers/media/platform/samsung/Kconfig b/drivers/media/platform/samsung/Kconfig
new file mode 100644
index 000000000000..9e9e8acdccd3
--- /dev/null
+++ b/drivers/media/platform/samsung/Kconfig
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+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/samsung/s5p-jpeg/Kconfig"
+source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
diff --git a/drivers/media/platform/samsung/Makefile b/drivers/media/platform/samsung/Makefile
new file mode 100644
index 000000000000..00a2d7e4daab
--- /dev/null
+++ b/drivers/media/platform/samsung/Makefile
@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y += exynos-gsc/
+obj-y += exynos4-is/
+obj-y += s3c-camif/
+obj-y += s5p-g2d/
+obj-y += s5p-jpeg/
+obj-y += s5p-mfc/
diff --git a/drivers/media/platform/sti/Kconfig b/drivers/media/platform/sti/Kconfig
index 9fb5e78a92cf..d5423743d905 100644
--- a/drivers/media/platform/sti/Kconfig
+++ b/drivers/media/platform/sti/Kconfig
@@ -3,3 +3,4 @@ source "drivers/media/platform/sti/bdisp/Kconfig"
source "drivers/media/platform/sti/c8sectpfe/Kconfig"
source "drivers/media/platform/sti/delta/Kconfig"
source "drivers/media/platform/sti/hva/Kconfig"
+source "drivers/media/platform/sti/stm32/Kconfig"
diff --git a/drivers/media/platform/sti/Makefile b/drivers/media/platform/sti/Makefile
new file mode 100644
index 000000000000..a26dc89de577
--- /dev/null
+++ b/drivers/media/platform/sti/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y += bdisp/
+obj-y += c8sectpfe/
+obj-y += delta/
+obj-y += hva/
+obj-y += stm32/
diff --git a/drivers/media/platform/ti/Kconfig b/drivers/media/platform/ti/Kconfig
new file mode 100644
index 000000000000..796acd229987
--- /dev/null
+++ b/drivers/media/platform/ti/Kconfig
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+source "drivers/media/platform/ti/am437x/Kconfig"
+source "drivers/media/platform/ti/davinci/Kconfig"
+source "drivers/media/platform/ti/omap/Kconfig"
+source "drivers/media/platform/ti/omap3isp/Kconfig"
+source "drivers/media/platform/ti/vpe/Kconfig"
diff --git a/drivers/media/platform/ti/Makefile b/drivers/media/platform/ti/Makefile
new file mode 100644
index 000000000000..2e0f43ed2e25
--- /dev/null
+++ b/drivers/media/platform/ti/Makefile
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y += am437x/
+obj-y += davinci/
+obj-y += omap/
+obj-y += omap3isp/
+obj-y += vpe/
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* [PATCH 24/24] media: platform/*/Kconfig: make menus more uniform
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
` (14 preceding siblings ...)
2022-03-13 10:52 ` [PATCH 23/24] media: platform: Create vendor/{Makefile, Kconfig} files Mauro Carvalho Chehab
@ 2022-03-13 10:52 ` Mauro Carvalho Chehab
2022-03-13 11:00 ` [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
16 siblings, 0 replies; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 10:52 UTC (permalink / raw)
Cc: Alexandre Belloni, Heiko Stuebner, linux-aspeed, Eddie James,
Michael Tretter, Laurent Pinchart, Mauro Carvalho Chehab,
openbmc, Michal Simek, Jernej Skrabec, linux-rockchip,
Ludovic Desroches, Andy Gross, Joel Stanley, linux-media,
Pengutronix Kernel Team, linux-arm-msm, linux-mediatek,
Matthias Brugger, Bjorn Andersson, linux-arm-kernel, Hyun Kwon,
Andrew Jeffery, Robert Foss, linux-kernel, Jacopo Mondi,
Philipp Zabel, Hans Verkuil, Eugen Hristev
Do some adjustments at the per-vendor Kconfig, adding a comment at
the beginning in order to identify the manufacturer, and adjust
a few entries to make them look more uniform.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH 00/24] at: https://lore.kernel.org/all/cover.1647167750.git.mchehab@kernel.org/
drivers/media/platform/allegro-dvt/Kconfig | 3 +++
drivers/media/platform/amlogic/Kconfig | 3 +++
drivers/media/platform/aspeed/Kconfig | 3 +++
drivers/media/platform/atmel/Kconfig | 3 +++
drivers/media/platform/cadence/Kconfig | 13 +-----------
drivers/media/platform/chips-media/Kconfig | 3 +++
drivers/media/platform/intel/Kconfig | 3 +++
drivers/media/platform/marvell/Kconfig | 3 +++
drivers/media/platform/mediatek/Kconfig | 3 +++
drivers/media/platform/nvidia/Kconfig | 3 +++
drivers/media/platform/nxp/Kconfig | 24 ++++++----------------
drivers/media/platform/qcom/Kconfig | 3 +++
drivers/media/platform/renesas/Kconfig | 2 ++
drivers/media/platform/rockchip/Kconfig | 3 +++
drivers/media/platform/samsung/Kconfig | 3 +++
drivers/media/platform/sti/Kconfig | 3 +++
drivers/media/platform/ti/Kconfig | 3 +++
drivers/media/platform/via/Kconfig | 3 +++
drivers/media/platform/xilinx/Kconfig | 7 +++----
19 files changed, 57 insertions(+), 34 deletions(-)
diff --git a/drivers/media/platform/allegro-dvt/Kconfig b/drivers/media/platform/allegro-dvt/Kconfig
index c3f76a6fb6f8..735440369c5c 100644
--- a/drivers/media/platform/allegro-dvt/Kconfig
+++ b/drivers/media/platform/allegro-dvt/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Allegro DVT drivers"
+
config VIDEO_ALLEGRO_DVT
tristate "Allegro DVT Video IP Core"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/amlogic/Kconfig b/drivers/media/platform/amlogic/Kconfig
index 09fb145a0b30..bc8d99e12f96 100644
--- a/drivers/media/platform/amlogic/Kconfig
+++ b/drivers/media/platform/amlogic/Kconfig
@@ -1,2 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
+
+comment "Amlogic drivers"
+
source "drivers/media/platform/amlogic/meson-ge2d/Kconfig"
diff --git a/drivers/media/platform/aspeed/Kconfig b/drivers/media/platform/aspeed/Kconfig
index 810902c8a85a..af95b08adf46 100644
--- a/drivers/media/platform/aspeed/Kconfig
+++ b/drivers/media/platform/aspeed/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Aspeed drivers"
+
config VIDEO_ASPEED
tristate "Aspeed AST2400 and AST2500 Video Engine driver"
depends on V4L_PLATFORM_DRIVERS
diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/atmel/Kconfig
index abeb0ac595b3..ae0fa7f96f66 100644
--- a/drivers/media/platform/atmel/Kconfig
+++ b/drivers/media/platform/atmel/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Atmel drivers"
+
config VIDEO_ATMEL_ISC
tristate "ATMEL Image Sensor Controller (ISC) support"
depends on V4L_PLATFORM_DRIVERS
diff --git a/drivers/media/platform/cadence/Kconfig b/drivers/media/platform/cadence/Kconfig
index acfa0ef6247e..1a0f2d9a6a28 100644
--- a/drivers/media/platform/cadence/Kconfig
+++ b/drivers/media/platform/cadence/Kconfig
@@ -1,15 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
-config VIDEO_CADENCE
- bool "Cadence Video Devices"
- depends on V4L_PLATFORM_DRIVERS
- help
- If you have a media device designed by Cadence, say Y.
- Note that this option doesn't include new drivers in the kernel:
- saying N will just cause Kconfig to skip all the questions about
- Cadence media devices.
-
-if VIDEO_CADENCE
+comment "Cadence drivers"
config VIDEO_CADENCE_CSI2RX
tristate "Cadence MIPI-CSI2 RX Controller"
@@ -34,5 +25,3 @@ config VIDEO_CADENCE_CSI2TX
To compile this driver as a module, choose M here: the module will be
called cdns-csi2tx.
-
-endif
diff --git a/drivers/media/platform/chips-media/Kconfig b/drivers/media/platform/chips-media/Kconfig
index 22b654018f3c..ea49b3563320 100644
--- a/drivers/media/platform/chips-media/Kconfig
+++ b/drivers/media/platform/chips-media/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Chips&Media drivers"
+
config VIDEO_CODA
tristate "Chips&Media Coda multi-standard codec IP"
depends on V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/platform/intel/Kconfig b/drivers/media/platform/intel/Kconfig
index d47a2cf6f334..091e15f00ef5 100644
--- a/drivers/media/platform/intel/Kconfig
+++ b/drivers/media/platform/intel/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Intel drivers"
+
config VIDEO_PXA27x
tristate "PXA27x Quick Capture Interface driver"
depends on V4L_PLATFORM_DRIVERS
diff --git a/drivers/media/platform/marvell/Kconfig b/drivers/media/platform/marvell/Kconfig
index 474795668930..d7275322fd92 100644
--- a/drivers/media/platform/marvell/Kconfig
+++ b/drivers/media/platform/marvell/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "Marvell drivers"
+
config VIDEO_CAFE_CCIC
tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"
depends on V4L_PLATFORM_DRIVERS
diff --git a/drivers/media/platform/mediatek/Kconfig b/drivers/media/platform/mediatek/Kconfig
index 549abf1df7d9..8e0770fb2dd3 100644
--- a/drivers/media/platform/mediatek/Kconfig
+++ b/drivers/media/platform/mediatek/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
+
+comment "Mediatek drivers"
+
source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"
source "drivers/media/platform/mediatek/mtk-mdp/Kconfig"
source "drivers/media/platform/mediatek/mtk-vcodec/Kconfig"
diff --git a/drivers/media/platform/nvidia/Kconfig b/drivers/media/platform/nvidia/Kconfig
index 413005d8cd66..8fdb41e64308 100644
--- a/drivers/media/platform/nvidia/Kconfig
+++ b/drivers/media/platform/nvidia/Kconfig
@@ -1,2 +1,5 @@
# SPDX-License-Identifier: GPL-2.0
+
+comment "NVidia drivers"
+
source "drivers/media/platform/nvidia/tegra-vde/Kconfig"
diff --git a/drivers/media/platform/nxp/Kconfig b/drivers/media/platform/nxp/Kconfig
index e8c9d33cd3b7..65357344d5e5 100644
--- a/drivers/media/platform/nxp/Kconfig
+++ b/drivers/media/platform/nxp/Kconfig
@@ -2,20 +2,10 @@
# V4L drivers
-menuconfig VIDEO_IMX
- bool "V4L2 capture drivers for NXP i.MX devices"
- depends on V4L_PLATFORM_DRIVERS
- depends on ARCH_MXC || COMPILE_TEST
- depends on VIDEO_DEV
- help
- Say yes here to enable support for capture drivers on i.MX SoCs.
- Support for the single SoC features are selectable in the sub-menu
- options.
-
-if VIDEO_IMX
+comment "NXP drivers"
config VIDEO_IMX_MIPI_CSIS
- tristate "MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models"
+ tristate "NXP MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models"
select MEDIA_CONTROLLER
select V4L2_FWNODE
select VIDEO_V4L2_SUBDEV_API
@@ -24,10 +14,8 @@ config VIDEO_IMX_MIPI_CSIS
Video4Linux2 sub-device driver for the MIPI CSI-2 CSIS receiver
v3.3/v3.6.3 found on some i.MX7 and i.MX8 SoCs.
-endif # VIDEO_IMX
-
config VIDEO_VIU
- tristate "Freescale/NXP VIU Video Driver"
+ tristate "NXP VIU Video Driver"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_DEV && (PPC_MPC512x || COMPILE_TEST) && I2C
select VIDEOBUF_DMA_CONTIG
@@ -42,7 +30,7 @@ config VIDEO_VIU
# mem2mem drivers
config VIDEO_IMX_PXP
- tristate "i.MX Pixel Pipeline (PXP)"
+ tristate "NXP i.MX Pixel Pipeline (PXP)"
depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV && (ARCH_MXC || COMPILE_TEST)
select VIDEOBUF2_DMA_CONTIG
@@ -52,7 +40,7 @@ config VIDEO_IMX_PXP
color space conversion, and rotation.
config VIDEO_MX2_EMMAPRP
- tristate "Freescale/NXP MX2 eMMa-PrP support"
+ tristate "NXP MX2 eMMa-PrP support"
depends on V4L_MEM2MEM_DRIVERS
depends on VIDEO_DEV
depends on SOC_IMX27 || COMPILE_TEST
@@ -63,5 +51,5 @@ config VIDEO_MX2_EMMAPRP
memory to memory. Operations include resizing and format
conversion.
-source "drivers/media/platform/nxp/imx-jpeg/Kconfig"
source "drivers/media/platform/nxp/amphion/Kconfig"
+source "drivers/media/platform/nxp/imx-jpeg/Kconfig"
diff --git a/drivers/media/platform/qcom/Kconfig b/drivers/media/platform/qcom/Kconfig
index aa2428f641d3..b19b4f319f6b 100644
--- a/drivers/media/platform/qcom/Kconfig
+++ b/drivers/media/platform/qcom/Kconfig
@@ -1,3 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
+
+comment "Qualcomm drivers"
+
source "drivers/media/platform/qcom/camss/Kconfig"
source "drivers/media/platform/qcom/venus/Kconfig"
diff --git a/drivers/media/platform/renesas/Kconfig b/drivers/media/platform/renesas/Kconfig
index 0c0de21584ba..8c707ab38d0a 100644
--- a/drivers/media/platform/renesas/Kconfig
+++ b/drivers/media/platform/renesas/Kconfig
@@ -1,5 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+comment "Renesas drivers"
+
# V4L drivers
config VIDEO_RENESAS_CEU
diff --git a/drivers/media/platform/rockchip/Kconfig b/drivers/media/platform/rockchip/Kconfig
index c7ba06388780..558e3e4b5aa4 100644
--- a/drivers/media/platform/rockchip/Kconfig
+++ b/drivers/media/platform/rockchip/Kconfig
@@ -1,3 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
+
+comment "Rockchip drivers"
+
source "drivers/media/platform/rockchip/rga/Kconfig"
source "drivers/media/platform/rockchip/rkisp1/Kconfig"
diff --git a/drivers/media/platform/samsung/Kconfig b/drivers/media/platform/samsung/Kconfig
index 9e9e8acdccd3..8813b61b06f4 100644
--- a/drivers/media/platform/samsung/Kconfig
+++ b/drivers/media/platform/samsung/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
+
+comment "Samsung drivers"
+
source "drivers/media/platform/samsung/exynos-gsc/Kconfig"
source "drivers/media/platform/samsung/exynos4-is/Kconfig"
source "drivers/media/platform/samsung/s3c-camif/Kconfig"
diff --git a/drivers/media/platform/sti/Kconfig b/drivers/media/platform/sti/Kconfig
index d5423743d905..a352087dba27 100644
--- a/drivers/media/platform/sti/Kconfig
+++ b/drivers/media/platform/sti/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "STMicroelectronics drivers"
+
source "drivers/media/platform/sti/bdisp/Kconfig"
source "drivers/media/platform/sti/c8sectpfe/Kconfig"
source "drivers/media/platform/sti/delta/Kconfig"
diff --git a/drivers/media/platform/ti/Kconfig b/drivers/media/platform/ti/Kconfig
index 796acd229987..9e63ea70b48f 100644
--- a/drivers/media/platform/ti/Kconfig
+++ b/drivers/media/platform/ti/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
+
+comment "Texas Instruments drivers"
+
source "drivers/media/platform/ti/am437x/Kconfig"
source "drivers/media/platform/ti/davinci/Kconfig"
source "drivers/media/platform/ti/omap/Kconfig"
diff --git a/drivers/media/platform/via/Kconfig b/drivers/media/platform/via/Kconfig
index a289f5c81b7c..6077222eb274 100644
--- a/drivers/media/platform/via/Kconfig
+++ b/drivers/media/platform/via/Kconfig
@@ -1,4 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
+
+comment "VIA drivers"
+
config VIDEO_VIA_CAMERA
tristate "VIAFB camera controller support"
depends on V4L_PLATFORM_DRIVERS
diff --git a/drivers/media/platform/xilinx/Kconfig b/drivers/media/platform/xilinx/Kconfig
index 439120c45eb1..0c772d070eb6 100644
--- a/drivers/media/platform/xilinx/Kconfig
+++ b/drivers/media/platform/xilinx/Kconfig
@@ -1,5 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
+comment "Xilinx drivers"
+
config VIDEO_XILINX
tristate "Xilinx Video IP (EXPERIMENTAL)"
depends on V4L_PLATFORM_DRIVERS
@@ -11,9 +13,8 @@ config VIDEO_XILINX
help
Driver for Xilinx Video IP Pipelines
-if VIDEO_XILINX
-
config VIDEO_XILINX_CSI2RXSS
+ depends on VIDEO_XILINX
tristate "Xilinx CSI-2 Rx Subsystem"
help
Driver for Xilinx MIPI CSI-2 Rx Subsystem. This is a V4L sub-device
@@ -32,5 +33,3 @@ config VIDEO_XILINX_VTC
depends on VIDEO_XILINX
help
Driver for the Xilinx Video Timing Controller
-
-endif #VIDEO_XILINX
--
2.35.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 31+ messages in thread* Re: [PATCH 00/24] Organize media platform drivers per manufacturer
2022-03-13 10:51 [PATCH 00/24] Organize media platform drivers per manufacturer Mauro Carvalho Chehab
` (15 preceding siblings ...)
2022-03-13 10:52 ` [PATCH 24/24] media: platform/*/Kconfig: make menus more uniform Mauro Carvalho Chehab
@ 2022-03-13 11:00 ` Mauro Carvalho Chehab
16 siblings, 0 replies; 31+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-13 11:00 UTC (permalink / raw)
Cc: Lad, Prabhakar, Alexandre Torgue, Andrew Jeffery, Andrzej Hajda,
Andy Gross, Bjorn Andersson, Eddie James, Fabio Estevam,
Heiko Stuebner, Jacek Anaszewski, Jerome Brunet, Kevin Hilman,
Martin Blumenstingl, Matthias Brugger, Maxime Coquelin,
Michael Tretter, Mikhail Ulyanov, NXP Linux Team,
Pengutronix Kernel Team, Philipp Zabel, Sascha Hauer, Shawn Guo,
Sylwester Nawrocki, Yong Deng, linux-amlogic, linux-arm-kernel,
linux-arm-msm, linux-aspeed, linux-kernel, linux-media,
linux-mediatek, linux-renesas-soc, linux-rockchip,
linux-samsung-soc, linux-stm32, linux-sunxi, linux-tegra,
openbmc
Em Sun, 13 Mar 2022 11:51:41 +0100
Mauro Carvalho Chehab <mchehab@kernel.org> escreveu:
> This series comes after the one I sent earlier today sorting media/platform Makefile and Kconfig.
>
> It basically groups all drivers per vendor, ensuring that each vendor has a Makefile/Kconfig
> pair.
>
> The end goal is to keep the platform Makefile/Kconfig clean and easier to maintain, less
> prune to errors. After applying both series, the size of such files were drastically reduced:
>
> drivers/media/platform/Kconfig | 731 ++------------------------------
> drivers/media/platform/Makefile | 115 +----
> 2 files changed, 78 insertions(+), 768 deletions(-)
>
> Mauro Carvalho Chehab (24):
> media: platform: rename coda/ to chips-media/
> media: platform: rename marvell-ccic/ to marvell/
> media: platform: rename meson/ge2d/ to amlogic/meson-ge2d/
> media: platform: rename mtk-jpeg/ to mediatek/mtk-jpeg/
> media: platform: rename mtk-mdp/ to mediatek/mtk-mdp/
> media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/
> media: platform: rename mtk-vpu/ to mediatek/mtk-vpu/
> media: platform: rename sunxi/ to allwinner/
> media: platform: rename tegra/vde/ to nvidia/tegra-vde/
> media: platform: rename amphion/ to nxp/amphion/
> media: platform: rename exynos4-is/ to samsung/exynos4-is/
> media: platform: rename exynos-gsc/ to samsung/exynos-gsc/
> media: platform: rename s3c-camif/ to samsung/s3c-camif/
> media: platform: rename s5p-g2d/ to samsung/s5p-g2d/
> media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/
> media: platform: rename s5p-mfc/ to samsung/s5p-mfc/
> media: platform: rename stm32/ to sti/stm32/
> media: platform: rename am437x/ to ti/am437x/
> media: platform: rename davinci/ to ti/davinci/
> media: platform: rename omap3isp/ to ti/omap3isp/
> media: platform: rename omap/ to ti/omap/
> media: platform: rename ti-vpe/ to ti/vpe/
> media: platform: Create vendor/{Makefile,Kconfig} files
Worth mention that, while the above changes are really trivial, it is
no fun to do them individually. It is also subject to errors.
So, after manually doing a couple of them, I decided to revert
to the original state and do it via the script below, checking
the patches and editing the last one.
Thanks,
Mauro
---
#!/bin/bash -e
export LC_ALL=C # Needed by sort
TMP=$(mktemp /tmp/rename.XXXXXXXXX)
trap 'catch $LINENO' ERR SIGINT
catch()
{
echo "Error on line $1"
rm $TMP || true
exit 1
}
sort_makefile()
{
# sort Makefile
sed '/^obj-y/Q' drivers/media/platform/Makefile> $TMP
grep "^obj-y" drivers/media/platform/Makefile |sort | uniq >> $TMP
cat <<EOF >> $TMP
# Please place here only ancillary drivers that aren't SoC-specific
# Please keep it alphabetically sorted by Kconfig name
# (e. g. LC_ALL=C sort Makefile)
obj-\$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE) += m2m-deinterlace.o
obj-\$(CONFIG_VIDEO_MUX) += video-mux.o
EOF
mv $TMP drivers/media/platform/Makefile
}
sort_kconfig()
{
# sort Kconfig
sed '/^source/Q' drivers/media/platform/Kconfig> $TMP
grep "^source" drivers/media/platform/Kconfig |sort | uniq >> $TMP
cat <<EOF >> $TMP
endif # MEDIA_PLATFORM_DRIVERS
EOF
mv $TMP drivers/media/platform/Kconfig
}
do_rename_vendor()
{
old=$(echo $1 |perl -ne 's,/$,,; print $_')
new=$(echo $2 |perl -ne 's,/$,,; print $_')
echo "$old -> $new"
mkdir -p dirname drivers/media/platform/$new
git mv drivers/media/platform/$old/* drivers/media/platform/$new/
sed s,$old/,$new/, -i $(find drivers/media/platform/ -name Kconfig) $(find drivers/media/platform/ -name Makefile)
sed s,drivers/media/platform/$old,drivers/media/platform/$new, -i $(git grep -l drivers/media/platform/$old) || true
# Remove obj files, to make the directory cleaner
rm -rf drivers/media/platform/$old/ || true
sort_makefile
sort_kconfig
cat <<EOF >> $TMP
media: platform: rename $old/ to $new/
As the end goal is to have platform drivers split by vendor,
rename $old/ to $new/.
EOF
git commit -as -m "$(cat $TMP)" --no-edit
}
do_rename_vendor coda chips-media
do_rename_vendor marvell-ccic/ marvell/
do_rename_vendor meson/ge2d/ amlogic/meson-ge2d/
do_rename_vendor mtk-jpeg mediatek/mtk-jpeg
do_rename_vendor mtk-mdp mediatek/mtk-mdp
do_rename_vendor mtk-vcodec mediatek/mtk-vcodec
do_rename_vendor mtk-vpu mediatek/mtk-vpu
do_rename_vendor sunxi/ allwinner/
do_rename_vendor tegra/vde nvidia/tegra-vde
do_rename_vendor amphion nxp/amphion
do_rename_vendor exynos4-is/ samsung/exynos4-is/
do_rename_vendor exynos-gsc samsung/exynos-gsc
do_rename_vendor s3c-camif samsung/s3c-camif
do_rename_vendor s5p-g2d samsung/s5p-g2d
do_rename_vendor s5p-jpeg samsung/s5p-jpeg
do_rename_vendor s5p-mfc samsung/s5p-mfc
do_rename_vendor stm32 sti/stm32
do_rename_vendor am437x/ ti/am437x/
do_rename_vendor davinci ti/davinci
do_rename_vendor omap3isp ti/omap3isp
do_rename_vendor omap ti/omap
do_rename_vendor ti-vpe ti/vpe
# Create or update drivers/media/platform/*/Kconfig
IFS=$'\n'
# Fixup Kconfig files
for i in $(cat drivers/media/platform/Kconfig|perl -ne 'if (m,platform/([^/]+)/([^/]+)/Kconfig,) { print "$1 $2\n" }'); do
echo "Handling $i Kconfig entries"
a=$(echo $i|cut -d' ' -f1)
b=$(echo $i|cut -d' ' -f2)
kconfig="drivers/media/platform/$a/$b/Kconfig"
parent="drivers/media/platform/$a/Kconfig"
if [ ! -e $parent ]; then
echo "creating $parent..."
echo "# SPDX-License-Identifier: GPL-2.0" > $parent
git add $parent
fi
echo "source \"$kconfig\"" >> drivers/media/platform/$a/Kconfig
echo "source \"$parent\"" >> drivers/media/platform/Kconfig
sed s,$kconfig,$parent, -i drivers/media/platform/Kconfig
echo "sorting..."
sort_kconfig
done
# Create or update drivers/media/platform/*/Makefile
for i in $(cat drivers/media/platform/Makefile|perl -ne 'if (m,.*=\s*([^/]+)/([^/]+)/,) { print "$1 $2\n" }'); do
echo "Handling $i Makefile entries"
a=$(echo $i|cut -d' ' -f1)
b=$(echo $i|cut -d' ' -f2)
make="$a/$b/"
parent="$a/"
if [ ! -e drivers/media/platform/$a/Makefile ]; then
echo "creating $parent..."
echo "# SPDX-License-Identifier: GPL-2.0" > drivers/media/platform/$a/Makefile
git add drivers/media/platform/$a/Makefile
fi
echo "obj-y += $b/" >> drivers/media/platform/$a/Makefile
echo "obj-y += $parent" >> drivers/media/platform/Makefile
sed s,$make\$,$parent, -i drivers/media/platform/Makefile
done
sort_kconfig
sort_makefile
cat <<EOF >> $TMP
media: platform: Create vendor/{Makefile,Kconfig} files
Instead of placing multiple per-vendor entries at the
platform/{Makefile,Kconfig}, create them at the per-vendor
directories.
EOF
git commit -as -m "$(cat $TMP)" --no-edit
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 31+ messages in thread