@@ -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
@@ -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"
@@ -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/
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Kconfig
rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Makefile
rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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/64] at: https://lore.kernel.org/all/cover.1647242578.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%)