Organize media platform drivers per manufacturer

PATCH In review Mauro Carvalho Chehab 7 participants 39 messages Mar 13, 2022 – Mar 16, 2022

Subsystems (37)

Media (V4L/DVB) Arm Qualcomm mailing list Arm i.MX and Layerscape Arm/Amlogic Meson SoC support +33 more subsystems

lore

Share & tools

lore

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:51 UTC #0 lore raw

cover Organize media platform drivers per manufacturer

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
media: platform/*/Kconfig: make menus more uniform

 Documentation/admin-guide/media/fimc.rst      |  2 +-
 Documentation/admin-guide/media/omap3isp.rst  |  2 +-
 .../admin-guide/media/omap4_camera.rst        |  2 +-
 .../media/drivers/davinci-vpbe-devel.rst      | 20 ++++----
 .../driver-api/media/drivers/fimc-devel.rst   | 14 +++---
 Documentation/driver-api/media/v4l2-event.rst |  2 +-
 MAINTAINERS                                   | 48 +++++++++----------
 drivers/media/platform/Kconfig                | 30 ++++--------
 drivers/media/platform/Makefile               | 41 +++++-----------
 drivers/media/platform/allegro-dvt/Kconfig    |  3 ++
 drivers/media/platform/allwinner/Kconfig      |  6 +++
 .../platform/{sunxi => allwinner}/Makefile    |  0
 .../{sunxi => allwinner}/sun4i-csi/Kconfig    |  0
 .../{sunxi => allwinner}/sun4i-csi/Makefile   |  0
 .../sun4i-csi/sun4i_csi.c                     |  0
 .../sun4i-csi/sun4i_csi.h                     |  0
 .../sun4i-csi/sun4i_dma.c                     |  0
 .../sun4i-csi/sun4i_v4l2.c                    |  0
 .../{sunxi => allwinner}/sun6i-csi/Kconfig    |  0
 .../{sunxi => allwinner}/sun6i-csi/Makefile   |  0
 .../sun6i-csi/sun6i_csi.c                     |  0
 .../sun6i-csi/sun6i_csi.h                     |  0
 .../sun6i-csi/sun6i_csi_reg.h                 |  0
 .../sun6i-csi/sun6i_video.c                   |  0
 .../sun6i-csi/sun6i_video.h                   |  0
 .../{sunxi => allwinner}/sun8i-di/Kconfig     |  0
 .../{sunxi => allwinner}/sun8i-di/Makefile    |  0
 .../{sunxi => allwinner}/sun8i-di/sun8i-di.c  |  0
 .../{sunxi => allwinner}/sun8i-di/sun8i-di.h  |  0
 .../{sunxi => allwinner}/sun8i-rotate/Kconfig |  0
 .../sun8i-rotate/Makefile                     |  0
 .../sun8i-rotate/sun8i-formats.h              |  0
 .../sun8i-rotate/sun8i-rotate.h               |  0
 .../sun8i-rotate/sun8i_formats.c              |  0
 .../sun8i-rotate/sun8i_rotate.c               |  0
 drivers/media/platform/amlogic/Kconfig        |  5 ++
 drivers/media/platform/amlogic/Makefile       |  2 +
 .../ge2d => amlogic/meson-ge2d}/Kconfig       |  0
 .../ge2d => amlogic/meson-ge2d}/Makefile      |  0
 .../ge2d => amlogic/meson-ge2d}/ge2d-regs.h   |  0
 .../{meson/ge2d => amlogic/meson-ge2d}/ge2d.c |  0
 drivers/media/platform/aspeed/Kconfig         |  3 ++
 drivers/media/platform/atmel/Kconfig          |  3 ++
 drivers/media/platform/cadence/Kconfig        | 13 +----
 .../platform/{coda => chips-media}/Kconfig    |  3 ++
 .../platform/{coda => chips-media}/Makefile   |  0
 .../platform/{coda => chips-media}/coda-bit.c |  0
 .../{coda => chips-media}/coda-common.c       |  0
 .../platform/{coda => chips-media}/coda-gdi.c |  0
 .../{coda => chips-media}/coda-h264.c         |  0
 .../{coda => chips-media}/coda-jpeg.c         |  0
 .../{coda => chips-media}/coda-mpeg2.c        |  0
 .../{coda => chips-media}/coda-mpeg4.c        |  0
 .../platform/{coda => chips-media}/coda.h     |  0
 .../{coda => chips-media}/coda_regs.h         |  2 +-
 .../platform/{coda => chips-media}/imx-vdoa.c |  0
 .../platform/{coda => chips-media}/imx-vdoa.h |  0
 .../platform/{coda => chips-media}/trace.h    |  2 +-
 drivers/media/platform/intel/Kconfig          |  3 ++
 .../{marvell-ccic => marvell}/Kconfig         |  3 ++
 .../{marvell-ccic => marvell}/Makefile        |  0
 .../{marvell-ccic => marvell}/cafe-driver.c   |  0
 .../{marvell-ccic => marvell}/mcam-core.c     |  0
 .../{marvell-ccic => marvell}/mcam-core.h     |  0
 .../{marvell-ccic => marvell}/mmp-driver.c    |  0
 drivers/media/platform/mediatek/Kconfig       |  8 ++++
 drivers/media/platform/mediatek/Makefile      |  5 ++
 .../platform/{ => mediatek}/mtk-jpeg/Kconfig  |  0
 .../platform/{ => mediatek}/mtk-jpeg/Makefile |  0
 .../{ => mediatek}/mtk-jpeg/mtk_jpeg_core.c   |  0
 .../{ => mediatek}/mtk-jpeg/mtk_jpeg_core.h   |  0
 .../{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.c |  0
 .../{ => mediatek}/mtk-jpeg/mtk_jpeg_dec_hw.h |  0
 .../mtk-jpeg/mtk_jpeg_dec_parse.c             |  0
 .../mtk-jpeg/mtk_jpeg_dec_parse.h             |  0
 .../mtk-jpeg/mtk_jpeg_dec_reg.h               |  0
 .../{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.c |  0
 .../{ => mediatek}/mtk-jpeg/mtk_jpeg_enc_hw.h |  0
 .../platform/{ => mediatek}/mtk-mdp/Kconfig   |  0
 .../platform/{ => mediatek}/mtk-mdp/Makefile  |  2 +-
 .../{ => mediatek}/mtk-mdp/mtk_mdp_comp.c     |  0
 .../{ => mediatek}/mtk-mdp/mtk_mdp_comp.h     |  0
 .../{ => mediatek}/mtk-mdp/mtk_mdp_core.c     |  0
 .../{ => mediatek}/mtk-mdp/mtk_mdp_core.h     |  0
 .../{ => mediatek}/mtk-mdp/mtk_mdp_ipi.h      |  0
 .../{ => mediatek}/mtk-mdp/mtk_mdp_m2m.c      |  0
 .../{ => mediatek}/mtk-mdp/mtk_mdp_m2m.h      |  0
 .../{ => mediatek}/mtk-mdp/mtk_mdp_regs.c     |  0
 .../{ => mediatek}/mtk-mdp/mtk_mdp_regs.h     |  0
 .../{ => mediatek}/mtk-mdp/mtk_mdp_vpu.c      |  0
 .../{ => mediatek}/mtk-mdp/mtk_mdp_vpu.h      |  0
 .../{ => mediatek}/mtk-vcodec/Kconfig         |  0
 .../{ => mediatek}/mtk-vcodec/Makefile        |  0
 .../mtk-vcodec/mtk_vcodec_dec.c               |  0
 .../mtk-vcodec/mtk_vcodec_dec.h               |  0
 .../mtk-vcodec/mtk_vcodec_dec_drv.c           |  0
 .../mtk-vcodec/mtk_vcodec_dec_hw.c            |  0
 .../mtk-vcodec/mtk_vcodec_dec_hw.h            |  0
 .../mtk-vcodec/mtk_vcodec_dec_pm.c            |  0
 .../mtk-vcodec/mtk_vcodec_dec_pm.h            |  0
 .../mtk-vcodec/mtk_vcodec_dec_stateful.c      |  0
 .../mtk-vcodec/mtk_vcodec_dec_stateless.c     |  0
 .../mtk-vcodec/mtk_vcodec_drv.h               |  0
 .../mtk-vcodec/mtk_vcodec_enc.c               |  0
 .../mtk-vcodec/mtk_vcodec_enc.h               |  0
 .../mtk-vcodec/mtk_vcodec_enc_drv.c           |  0
 .../mtk-vcodec/mtk_vcodec_enc_pm.c            |  0
 .../mtk-vcodec/mtk_vcodec_enc_pm.h            |  0
 .../{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.c |  0
 .../{ => mediatek}/mtk-vcodec/mtk_vcodec_fw.h |  0
 .../mtk-vcodec/mtk_vcodec_fw_priv.h           |  0
 .../mtk-vcodec/mtk_vcodec_fw_scp.c            |  0
 .../mtk-vcodec/mtk_vcodec_fw_vpu.c            |  0
 .../mtk-vcodec/mtk_vcodec_intr.c              |  0
 .../mtk-vcodec/mtk_vcodec_intr.h              |  0
 .../mtk-vcodec/mtk_vcodec_util.c              |  0
 .../mtk-vcodec/mtk_vcodec_util.h              |  0
 .../mtk-vcodec/vdec/vdec_h264_if.c            |  0
 .../mtk-vcodec/vdec/vdec_h264_req_if.c        |  0
 .../mtk-vcodec/vdec/vdec_vp8_if.c             |  0
 .../mtk-vcodec/vdec/vdec_vp9_if.c             |  0
 .../{ => mediatek}/mtk-vcodec/vdec_drv_base.h |  0
 .../{ => mediatek}/mtk-vcodec/vdec_drv_if.c   |  0
 .../{ => mediatek}/mtk-vcodec/vdec_drv_if.h   |  0
 .../{ => mediatek}/mtk-vcodec/vdec_ipi_msg.h  |  0
 .../mtk-vcodec/vdec_msg_queue.c               |  0
 .../mtk-vcodec/vdec_msg_queue.h               |  0
 .../{ => mediatek}/mtk-vcodec/vdec_vpu_if.c   |  0
 .../{ => mediatek}/mtk-vcodec/vdec_vpu_if.h   |  0
 .../mtk-vcodec/venc/venc_h264_if.c            |  0
 .../mtk-vcodec/venc/venc_vp8_if.c             |  0
 .../{ => mediatek}/mtk-vcodec/venc_drv_base.h |  0
 .../{ => mediatek}/mtk-vcodec/venc_drv_if.c   |  0
 .../{ => mediatek}/mtk-vcodec/venc_drv_if.h   |  0
 .../{ => mediatek}/mtk-vcodec/venc_ipi_msg.h  |  0
 .../{ => mediatek}/mtk-vcodec/venc_vpu_if.c   |  0
 .../{ => mediatek}/mtk-vcodec/venc_vpu_if.h   |  0
 .../platform/{ => mediatek}/mtk-vpu/Kconfig   |  0
 .../platform/{ => mediatek}/mtk-vpu/Makefile  |  0
 .../platform/{ => mediatek}/mtk-vpu/mtk_vpu.c |  0
 .../platform/{ => mediatek}/mtk-vpu/mtk_vpu.h |  0
 drivers/media/platform/nvidia/Kconfig         |  5 ++
 .../{tegra/vde => nvidia/tegra-vde}/Kconfig   |  0
 .../{tegra/vde => nvidia/tegra-vde}/Makefile  |  0
 .../vde => nvidia/tegra-vde}/dmabuf-cache.c   |  0
 .../{tegra/vde => nvidia/tegra-vde}/h264.c    |  0
 .../{tegra/vde => nvidia/tegra-vde}/iommu.c   |  0
 .../{tegra/vde => nvidia/tegra-vde}/trace.h   |  2 +-
 .../{tegra/vde => nvidia/tegra-vde}/v4l2.c    |  0
 .../{tegra/vde => nvidia/tegra-vde}/vde.c     |  0
 .../{tegra/vde => nvidia/tegra-vde}/vde.h     |  0
 drivers/media/platform/nxp/Kconfig            | 23 +++------
 drivers/media/platform/nxp/Makefile           |  1 +
 .../media/platform/{ => nxp}/amphion/Kconfig  |  0
 .../media/platform/{ => nxp}/amphion/Makefile |  0
 .../media/platform/{ => nxp}/amphion/vdec.c   |  0
 .../media/platform/{ => nxp}/amphion/venc.c   |  0
 .../media/platform/{ => nxp}/amphion/vpu.h    |  0
 .../platform/{ => nxp}/amphion/vpu_cmds.c     |  0
 .../platform/{ => nxp}/amphion/vpu_cmds.h     |  0
 .../platform/{ => nxp}/amphion/vpu_codec.h    |  0
 .../platform/{ => nxp}/amphion/vpu_color.c    |  0
 .../platform/{ => nxp}/amphion/vpu_core.c     |  0
 .../platform/{ => nxp}/amphion/vpu_core.h     |  0
 .../platform/{ => nxp}/amphion/vpu_dbg.c      |  0
 .../platform/{ => nxp}/amphion/vpu_defs.h     |  0
 .../platform/{ => nxp}/amphion/vpu_drv.c      |  0
 .../platform/{ => nxp}/amphion/vpu_helpers.c  |  0
 .../platform/{ => nxp}/amphion/vpu_helpers.h  |  0
 .../platform/{ => nxp}/amphion/vpu_imx8q.c    |  0
 .../platform/{ => nxp}/amphion/vpu_imx8q.h    |  0
 .../platform/{ => nxp}/amphion/vpu_malone.c   |  0
 .../platform/{ => nxp}/amphion/vpu_malone.h   |  0
 .../platform/{ => nxp}/amphion/vpu_mbox.c     |  0
 .../platform/{ => nxp}/amphion/vpu_mbox.h     |  0
 .../platform/{ => nxp}/amphion/vpu_msgs.c     |  0
 .../platform/{ => nxp}/amphion/vpu_msgs.h     |  0
 .../platform/{ => nxp}/amphion/vpu_rpc.c      |  0
 .../platform/{ => nxp}/amphion/vpu_rpc.h      |  0
 .../platform/{ => nxp}/amphion/vpu_v4l2.c     |  0
 .../platform/{ => nxp}/amphion/vpu_v4l2.h     |  0
 .../platform/{ => nxp}/amphion/vpu_windsor.c  |  0
 .../platform/{ => nxp}/amphion/vpu_windsor.h  |  0
 .../media/platform/nxp/imx-jpeg/mxc-jpeg.c    |  2 +-
 drivers/media/platform/qcom/Kconfig           |  3 ++
 drivers/media/platform/qcom/Makefile          |  3 ++
 drivers/media/platform/renesas/Kconfig        |  2 +
 drivers/media/platform/renesas/rcar_jpu.c     |  2 +-
 drivers/media/platform/rockchip/Kconfig       |  3 ++
 drivers/media/platform/rockchip/Makefile      |  3 ++
 drivers/media/platform/samsung/Kconfig        | 10 ++++
 drivers/media/platform/samsung/Makefile       |  7 +++
 .../platform/{ => samsung}/exynos-gsc/Kconfig |  0
 .../{ => samsung}/exynos-gsc/Makefile         |  0
 .../{ => samsung}/exynos-gsc/gsc-core.c       |  0
 .../{ => samsung}/exynos-gsc/gsc-core.h       |  0
 .../{ => samsung}/exynos-gsc/gsc-m2m.c        |  0
 .../{ => samsung}/exynos-gsc/gsc-regs.c       |  0
 .../{ => samsung}/exynos-gsc/gsc-regs.h       |  0
 .../platform/{ => samsung}/exynos4-is/Kconfig |  0
 .../{ => samsung}/exynos4-is/Makefile         |  0
 .../{ => samsung}/exynos4-is/common.c         |  0
 .../{ => samsung}/exynos4-is/common.h         |  0
 .../{ => samsung}/exynos4-is/fimc-capture.c   |  0
 .../{ => samsung}/exynos4-is/fimc-core.c      |  0
 .../{ => samsung}/exynos4-is/fimc-core.h      |  0
 .../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
 .../{ => samsung}/exynos4-is/fimc-is.c        |  0
 .../{ => samsung}/exynos4-is/fimc-is.h        |  0
 .../{ => samsung}/exynos4-is/fimc-isp-video.c |  0
 .../{ => samsung}/exynos4-is/fimc-isp-video.h |  0
 .../{ => samsung}/exynos4-is/fimc-isp.c       |  0
 .../{ => samsung}/exynos4-is/fimc-isp.h       |  0
 .../{ => samsung}/exynos4-is/fimc-lite-reg.c  |  0
 .../{ => samsung}/exynos4-is/fimc-lite-reg.h  |  0
 .../{ => samsung}/exynos4-is/fimc-lite.c      |  0
 .../{ => samsung}/exynos4-is/fimc-lite.h      |  0
 .../{ => samsung}/exynos4-is/fimc-m2m.c       |  0
 .../{ => samsung}/exynos4-is/fimc-reg.c       |  0
 .../{ => samsung}/exynos4-is/fimc-reg.h       |  0
 .../{ => samsung}/exynos4-is/media-dev.c      |  0
 .../{ => samsung}/exynos4-is/media-dev.h      |  0
 .../{ => samsung}/exynos4-is/mipi-csis.c      |  0
 .../{ => samsung}/exynos4-is/mipi-csis.h      |  0
 .../platform/{ => samsung}/s3c-camif/Kconfig  |  0
 .../platform/{ => samsung}/s3c-camif/Makefile |  0
 .../{ => samsung}/s3c-camif/camif-capture.c   |  0
 .../{ => samsung}/s3c-camif/camif-core.c      |  0
 .../{ => samsung}/s3c-camif/camif-core.h      |  0
 .../{ => samsung}/s3c-camif/camif-regs.c      |  0
 .../{ => samsung}/s3c-camif/camif-regs.h      |  0
 .../platform/{ => samsung}/s5p-g2d/Kconfig    |  0
 .../platform/{ => samsung}/s5p-g2d/Makefile   |  0
 .../platform/{ => samsung}/s5p-g2d/g2d-hw.c   |  0
 .../platform/{ => samsung}/s5p-g2d/g2d-regs.h |  0
 .../platform/{ => samsung}/s5p-g2d/g2d.c      |  0
 .../platform/{ => samsung}/s5p-g2d/g2d.h      |  0
 .../platform/{ => samsung}/s5p-jpeg/Kconfig   |  0
 .../platform/{ => samsung}/s5p-jpeg/Makefile  |  0
 .../{ => samsung}/s5p-jpeg/jpeg-core.c        |  2 +-
 .../{ => samsung}/s5p-jpeg/jpeg-core.h        |  2 +-
 .../s5p-jpeg/jpeg-hw-exynos3250.c             |  0
 .../s5p-jpeg/jpeg-hw-exynos3250.h             |  2 +-
 .../{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.c  |  0
 .../{ => samsung}/s5p-jpeg/jpeg-hw-exynos4.h  |  0
 .../{ => samsung}/s5p-jpeg/jpeg-hw-s5p.c      |  2 +-
 .../{ => samsung}/s5p-jpeg/jpeg-hw-s5p.h      |  2 +-
 .../{ => samsung}/s5p-jpeg/jpeg-regs.h        |  2 +-
 .../platform/{ => samsung}/s5p-mfc/Kconfig    |  0
 .../platform/{ => samsung}/s5p-mfc/Makefile   |  0
 .../{ => samsung}/s5p-mfc/regs-mfc-v10.h      |  0
 .../{ => samsung}/s5p-mfc/regs-mfc-v6.h       |  0
 .../{ => samsung}/s5p-mfc/regs-mfc-v7.h       |  0
 .../{ => samsung}/s5p-mfc/regs-mfc-v8.h       |  0
 .../platform/{ => samsung}/s5p-mfc/regs-mfc.h |  0
 .../platform/{ => samsung}/s5p-mfc/s5p_mfc.c  |  0
 .../{ => samsung}/s5p-mfc/s5p_mfc_cmd.c       |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_cmd.h       |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.c    |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_cmd_v5.h    |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.c    |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_cmd_v6.h    |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_common.h    |  0
 .../{ => samsung}/s5p-mfc/s5p_mfc_ctrl.c      |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_ctrl.h      |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_debug.h     |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_dec.c       |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_dec.h       |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_enc.c       |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_enc.h       |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_intr.c      |  0
 .../{ => samsung}/s5p-mfc/s5p_mfc_intr.h      |  0
 .../{ => samsung}/s5p-mfc/s5p_mfc_iommu.h     |  0
 .../{ => samsung}/s5p-mfc/s5p_mfc_opr.c       |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_opr.h       |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.c    |  0
 .../{ => samsung}/s5p-mfc/s5p_mfc_opr_v5.h    |  0
 .../{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.c    |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_opr_v6.h    |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_pm.c        |  2 +-
 .../{ => samsung}/s5p-mfc/s5p_mfc_pm.h        |  2 +-
 drivers/media/platform/sti/Kconfig            |  4 ++
 drivers/media/platform/sti/Makefile           |  6 +++
 .../media/platform/{ => sti}/stm32/Kconfig    |  0
 .../media/platform/{ => sti}/stm32/Makefile   |  0
 .../platform/{ => sti}/stm32/dma2d/dma2d-hw.c |  0
 .../{ => sti}/stm32/dma2d/dma2d-regs.h        |  0
 .../platform/{ => sti}/stm32/dma2d/dma2d.c    |  0
 .../platform/{ => sti}/stm32/dma2d/dma2d.h    |  0
 .../platform/{ => sti}/stm32/stm32-dcmi.c     |  0
 drivers/media/platform/sunxi/Kconfig          |  6 ---
 drivers/media/platform/ti/Kconfig             |  9 ++++
 drivers/media/platform/ti/Makefile            |  6 +++
 .../media/platform/{ => ti}/am437x/Kconfig    |  0
 .../media/platform/{ => ti}/am437x/Makefile   |  0
 .../platform/{ => ti}/am437x/am437x-vpfe.c    |  0
 .../platform/{ => ti}/am437x/am437x-vpfe.h    |  0
 .../{ => ti}/am437x/am437x-vpfe_regs.h        |  0
 .../media/platform/{ => ti}/davinci/Kconfig   |  0
 .../media/platform/{ => ti}/davinci/Makefile  |  0
 .../{ => ti}/davinci/ccdc_hw_device.h         |  0
 .../platform/{ => ti}/davinci/dm355_ccdc.c    |  0
 .../{ => ti}/davinci/dm355_ccdc_regs.h        |  0
 .../platform/{ => ti}/davinci/dm644x_ccdc.c   |  0
 .../{ => ti}/davinci/dm644x_ccdc_regs.h       |  0
 .../media/platform/{ => ti}/davinci/isif.c    |  0
 .../platform/{ => ti}/davinci/isif_regs.h     |  0
 .../media/platform/{ => ti}/davinci/vpbe.c    |  0
 .../platform/{ => ti}/davinci/vpbe_display.c  |  0
 .../platform/{ => ti}/davinci/vpbe_osd.c      |  0
 .../platform/{ => ti}/davinci/vpbe_osd_regs.h |  0
 .../platform/{ => ti}/davinci/vpbe_venc.c     |  0
 .../{ => ti}/davinci/vpbe_venc_regs.h         |  0
 .../platform/{ => ti}/davinci/vpfe_capture.c  |  0
 .../media/platform/{ => ti}/davinci/vpif.c    |  0
 .../media/platform/{ => ti}/davinci/vpif.h    |  0
 .../platform/{ => ti}/davinci/vpif_capture.c  |  0
 .../platform/{ => ti}/davinci/vpif_capture.h  |  0
 .../platform/{ => ti}/davinci/vpif_display.c  |  0
 .../platform/{ => ti}/davinci/vpif_display.h  |  0
 .../media/platform/{ => ti}/davinci/vpss.c    |  0
 drivers/media/platform/{ => ti}/omap/Kconfig  |  0
 drivers/media/platform/{ => ti}/omap/Makefile |  0
 .../media/platform/{ => ti}/omap/omap_vout.c  |  0
 .../platform/{ => ti}/omap/omap_vout_vrfb.c   |  0
 .../platform/{ => ti}/omap/omap_vout_vrfb.h   |  0
 .../platform/{ => ti}/omap/omap_voutdef.h     |  0
 .../platform/{ => ti}/omap/omap_voutlib.c     |  0
 .../platform/{ => ti}/omap/omap_voutlib.h     |  0
 .../media/platform/{ => ti}/omap3isp/Kconfig  |  0
 .../media/platform/{ => ti}/omap3isp/Makefile |  0
 .../{ => ti}/omap3isp/cfa_coef_table.h        |  0
 .../platform/{ => ti}/omap3isp/gamma_table.h  |  0
 .../media/platform/{ => ti}/omap3isp/isp.c    |  0
 .../media/platform/{ => ti}/omap3isp/isp.h    |  0
 .../platform/{ => ti}/omap3isp/ispccdc.c      |  0
 .../platform/{ => ti}/omap3isp/ispccdc.h      |  0
 .../platform/{ => ti}/omap3isp/ispccp2.c      |  0
 .../platform/{ => ti}/omap3isp/ispccp2.h      |  0
 .../platform/{ => ti}/omap3isp/ispcsi2.c      |  0
 .../platform/{ => ti}/omap3isp/ispcsi2.h      |  0
 .../platform/{ => ti}/omap3isp/ispcsiphy.c    |  0
 .../platform/{ => ti}/omap3isp/ispcsiphy.h    |  0
 .../media/platform/{ => ti}/omap3isp/isph3a.h |  0
 .../platform/{ => ti}/omap3isp/isph3a_aewb.c  |  0
 .../platform/{ => ti}/omap3isp/isph3a_af.c    |  0
 .../platform/{ => ti}/omap3isp/isphist.c      |  0
 .../platform/{ => ti}/omap3isp/isphist.h      |  0
 .../platform/{ => ti}/omap3isp/isppreview.c   |  0
 .../platform/{ => ti}/omap3isp/isppreview.h   |  0
 .../media/platform/{ => ti}/omap3isp/ispreg.h |  0
 .../platform/{ => ti}/omap3isp/ispresizer.c   |  0
 .../platform/{ => ti}/omap3isp/ispresizer.h   |  0
 .../platform/{ => ti}/omap3isp/ispstat.c      |  0
 .../platform/{ => ti}/omap3isp/ispstat.h      |  0
 .../platform/{ => ti}/omap3isp/ispvideo.c     |  0
 .../platform/{ => ti}/omap3isp/ispvideo.h     |  0
 .../{ => ti}/omap3isp/luma_enhance_table.h    |  0
 .../{ => ti}/omap3isp/noise_filter_table.h    |  0
 .../platform/{ => ti}/omap3isp/omap3isp.h     |  0
 .../media/platform/{ti-vpe => ti/vpe}/Kconfig |  0
 .../platform/{ti-vpe => ti/vpe}/Makefile      |  0
 .../{ti-vpe => ti/vpe}/cal-camerarx.c         |  0
 .../platform/{ti-vpe => ti/vpe}/cal-video.c   |  0
 .../media/platform/{ti-vpe => ti/vpe}/cal.c   |  0
 .../media/platform/{ti-vpe => ti/vpe}/cal.h   |  0
 .../platform/{ti-vpe => ti/vpe}/cal_regs.h    |  0
 .../media/platform/{ti-vpe => ti/vpe}/csc.c   |  0
 .../media/platform/{ti-vpe => ti/vpe}/csc.h   |  0
 .../media/platform/{ti-vpe => ti/vpe}/sc.c    |  0
 .../media/platform/{ti-vpe => ti/vpe}/sc.h    |  0
 .../platform/{ti-vpe => ti/vpe}/sc_coeff.h    |  0
 .../media/platform/{ti-vpe => ti/vpe}/vpdma.c |  0
 .../media/platform/{ti-vpe => ti/vpe}/vpdma.h |  0
 .../platform/{ti-vpe => ti/vpe}/vpdma_priv.h  |  0
 .../media/platform/{ti-vpe => ti/vpe}/vpe.c   |  0
 .../platform/{ti-vpe => ti/vpe}/vpe_regs.h    |  0
 drivers/media/platform/via/Kconfig            |  3 ++
 drivers/media/platform/xilinx/Kconfig         |  7 ++-
 389 files changed, 214 insertions(+), 167 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%)
 create mode 100644 drivers/media/platform/amlogic/Kconfig
 create mode 100644 drivers/media/platform/amlogic/Makefile
 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%)
 rename drivers/media/platform/{coda => chips-media}/Kconfig (94%)
 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%)
 rename drivers/media/platform/{marvell-ccic => marvell}/Kconfig (97%)
 rename drivers/media/platform/{marvell-ccic => marvell}/Makefile (100%)
 rename drivers/media/platform/{marvell-ccic => marvell}/cafe-driver.c (100%)
 rename drivers/media/platform/{marvell-ccic => marvell}/mcam-core.c (100%)
 rename drivers/media/platform/{marvell-ccic => marvell}/mcam-core.h (100%)
 rename drivers/media/platform/{marvell-ccic => marvell}/mmp-driver.c (100%)
 create mode 100644 drivers/media/platform/mediatek/Kconfig
 create mode 100644 drivers/media/platform/mediatek/Makefile
 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%)
 rename drivers/media/platform/{ => mediatek}/mtk-mdp/Kconfig (100%)
 rename drivers/media/platform/{ => mediatek}/mtk-mdp/Makefile (77%)
 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%)
 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%)
 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%)
 create mode 100644 drivers/media/platform/nvidia/Kconfig
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/Kconfig (100%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/Makefile (100%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/dmabuf-cache.c (100%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/h264.c (100%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/iommu.c (100%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/trace.h (97%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/v4l2.c (100%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/vde.c (100%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/vde.h (100%)
 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%)
 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
 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%)
 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%)
 rename drivers/media/platform/{ => samsung}/s3c-camif/Kconfig (100%)
 rename drivers/media/platform/{ => samsung}/s3c-camif/Makefile (100%)
 rename drivers/media/platform/{ => samsung}/s3c-camif/camif-capture.c (100%)
 rename drivers/media/platform/{ => samsung}/s3c-camif/camif-core.c (100%)
 rename drivers/media/platform/{ => samsung}/s3c-camif/camif-core.h (100%)
 rename drivers/media/platform/{ => samsung}/s3c-camif/camif-regs.c (100%)
 rename drivers/media/platform/{ => samsung}/s3c-camif/camif-regs.h (100%)
 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%)
 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%)
 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%)
 create mode 100644 drivers/media/platform/sti/Makefile
 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%)
 delete mode 100644 drivers/media/platform/sunxi/Kconfig
 create mode 100644 drivers/media/platform/ti/Kconfig
 create mode 100644 drivers/media/platform/ti/Makefile
 rename drivers/media/platform/{ => ti}/am437x/Kconfig (100%)
 rename drivers/media/platform/{ => ti}/am437x/Makefile (100%)
 rename drivers/media/platform/{ => ti}/am437x/am437x-vpfe.c (100%)
 rename drivers/media/platform/{ => ti}/am437x/am437x-vpfe.h (100%)
 rename drivers/media/platform/{ => ti}/am437x/am437x-vpfe_regs.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/Kconfig (100%)
 rename drivers/media/platform/{ => ti}/davinci/Makefile (100%)
 rename drivers/media/platform/{ => ti}/davinci/ccdc_hw_device.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/dm355_ccdc.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/dm355_ccdc_regs.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/dm644x_ccdc.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/dm644x_ccdc_regs.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/isif.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/isif_regs.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpbe.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpbe_display.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpbe_osd.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpbe_osd_regs.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpbe_venc.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpbe_venc_regs.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpfe_capture.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpif.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpif.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpif_capture.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpif_capture.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpif_display.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpif_display.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpss.c (100%)
 rename drivers/media/platform/{ => ti}/omap/Kconfig (100%)
 rename drivers/media/platform/{ => ti}/omap/Makefile (100%)
 rename drivers/media/platform/{ => ti}/omap/omap_vout.c (100%)
 rename drivers/media/platform/{ => ti}/omap/omap_vout_vrfb.c (100%)
 rename drivers/media/platform/{ => ti}/omap/omap_vout_vrfb.h (100%)
 rename drivers/media/platform/{ => ti}/omap/omap_voutdef.h (100%)
 rename drivers/media/platform/{ => ti}/omap/omap_voutlib.c (100%)
 rename drivers/media/platform/{ => ti}/omap/omap_voutlib.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/Kconfig (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/Makefile (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/cfa_coef_table.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/gamma_table.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isp.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isp.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispccdc.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispccdc.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispccp2.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispccp2.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispcsi2.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispcsi2.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispcsiphy.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispcsiphy.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isph3a.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isph3a_aewb.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isph3a_af.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isphist.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isphist.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isppreview.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isppreview.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispreg.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispresizer.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispresizer.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispstat.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispstat.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispvideo.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispvideo.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/luma_enhance_table.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/noise_filter_table.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/omap3isp.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/Kconfig (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/Makefile (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/cal-camerarx.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/cal-video.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/cal.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/cal.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/cal_regs.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/csc.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/csc.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/sc.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/sc.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/sc_coeff.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/vpdma.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/vpdma.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/vpdma_priv.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/vpe.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/vpe_regs.h (100%)

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #1 lore raw

PATCH 1/24 media: platform: rename coda/ to chips-media/

As the end goal is to have platform drivers split by vendor, rename coda/ to chips-media/.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index 848640546398..84bc106acc57 100644
@@ -4771,7 +4771,7 @@ M:	Philipp Zabel <[email protected]>
 L:	[email protected]
 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 <[email protected]>

drivers/media/platform/Kconfig +1 -1

index f15ab9739823..615736ac117c 100644
@@ -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"

drivers/media/platform/Makefile +2 -2

index 20b07ae3ebf1..8d6e15fad0b1 100644
@@ -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/

drivers/media/platform/chips-media/Kconfig renamed from drivers/media/platform/coda/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/coda/Kconfig
rename to drivers/media/platform/chips-media/Kconfig

drivers/media/platform/chips-media/Makefile renamed from drivers/media/platform/coda/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/coda/Makefile
rename to drivers/media/platform/chips-media/Makefile

drivers/media/platform/chips-media/coda-bit.c renamed from drivers/media/platform/coda/coda-bit.c +0 -0

similarity index 100%
rename from drivers/media/platform/coda/coda-bit.c
rename to drivers/media/platform/chips-media/coda-bit.c

drivers/media/platform/chips-media/coda-common.c renamed from drivers/media/platform/coda/coda-common.c +0 -0

similarity index 100%
rename from drivers/media/platform/coda/coda-common.c
rename to drivers/media/platform/chips-media/coda-common.c

drivers/media/platform/chips-media/coda-gdi.c renamed from drivers/media/platform/coda/coda-gdi.c +0 -0

similarity index 100%
rename from drivers/media/platform/coda/coda-gdi.c
rename to drivers/media/platform/chips-media/coda-gdi.c

drivers/media/platform/chips-media/coda-h264.c renamed from drivers/media/platform/coda/coda-h264.c +0 -0

similarity index 100%
rename from drivers/media/platform/coda/coda-h264.c
rename to drivers/media/platform/chips-media/coda-h264.c

drivers/media/platform/chips-media/coda-jpeg.c renamed from drivers/media/platform/coda/coda-jpeg.c +0 -0

similarity index 100%
rename from drivers/media/platform/coda/coda-jpeg.c
rename to drivers/media/platform/chips-media/coda-jpeg.c

drivers/media/platform/chips-media/coda-mpeg2.c renamed from drivers/media/platform/coda/coda-mpeg2.c +0 -0

similarity index 100%
rename from drivers/media/platform/coda/coda-mpeg2.c
rename to drivers/media/platform/chips-media/coda-mpeg2.c

drivers/media/platform/chips-media/coda-mpeg4.c renamed from drivers/media/platform/coda/coda-mpeg4.c +0 -0

similarity index 100%
rename from drivers/media/platform/coda/coda-mpeg4.c
rename to drivers/media/platform/chips-media/coda-mpeg4.c

drivers/media/platform/chips-media/coda.h renamed from drivers/media/platform/coda/coda.h +0 -0

similarity index 100%
rename from drivers/media/platform/coda/coda.h
rename to drivers/media/platform/chips-media/coda.h

drivers/media/platform/chips-media/coda_regs.h renamed from drivers/media/platform/coda/coda_regs.h +1 -1

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
@@ -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 <[email protected]>

drivers/media/platform/chips-media/imx-vdoa.c renamed from drivers/media/platform/coda/imx-vdoa.c +0 -0

similarity index 100%
rename from drivers/media/platform/coda/imx-vdoa.c
rename to drivers/media/platform/chips-media/imx-vdoa.c

drivers/media/platform/chips-media/imx-vdoa.h renamed from drivers/media/platform/coda/imx-vdoa.h +0 -0

similarity index 100%
rename from drivers/media/platform/coda/imx-vdoa.h
rename to drivers/media/platform/chips-media/imx-vdoa.h

drivers/media/platform/chips-media/trace.h renamed from drivers/media/platform/coda/trace.h +1 -1

similarity index 98%
rename from drivers/media/platform/coda/trace.h
rename to drivers/media/platform/chips-media/trace.h
index c0791c847f7c..19f98e6dafb9 100644
@@ -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

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:52 UTC #2 lore raw

PATCH 2/24 media: platform: rename marvell-ccic/ to marvell/

In reply to Mauro Carvalho Chehab

As the end goal is to have platform drivers split by vendor, rename marvell-ccic/ to marvell/.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 MAINTAINERS                                                    | 2 +-
 drivers/media/platform/Kconfig                                 | 2 +-
 drivers/media/platform/Makefile                                | 2 +-
 drivers/media/platform/{marvell-ccic => marvell}/Kconfig       | 0
 drivers/media/platform/{marvell-ccic => marvell}/Makefile      | 0
 drivers/media/platform/{marvell-ccic => marvell}/cafe-driver.c | 0
 drivers/media/platform/{marvell-ccic => marvell}/mcam-core.c   | 0
 drivers/media/platform/{marvell-ccic => marvell}/mcam-core.h   | 0
 drivers/media/platform/{marvell-ccic => marvell}/mmp-driver.c  | 0
 9 files changed, 3 insertions(+), 3 deletions(-)
 rename drivers/media/platform/{marvell-ccic => marvell}/Kconfig (100%)
 rename drivers/media/platform/{marvell-ccic => marvell}/Makefile (100%)
 rename drivers/media/platform/{marvell-ccic => marvell}/cafe-driver.c (100%)
 rename drivers/media/platform/{marvell-ccic => marvell}/mcam-core.c (100%)
 rename drivers/media/platform/{marvell-ccic => marvell}/mcam-core.h (100%)
 rename drivers/media/platform/{marvell-ccic => marvell}/mmp-driver.c (100%)

MAINTAINERS +1 -1

index 84bc106acc57..b83cf0eb99ce 100644
@@ -4248,7 +4248,7 @@ L:	[email protected]
 S:	Orphan
 T:	git git://linuxtv.org/media_tree.git
 F:	Documentation/admin-guide/media/cafe_ccic*
-F:	drivers/media/platform/marvell-ccic/
+F:	drivers/media/platform/marvell/
 
 CAIF NETWORK LAYER
 L:	[email protected]

drivers/media/platform/Kconfig +1 -1

index 615736ac117c..5e7cb24038fe 100644
@@ -76,7 +76,7 @@ source "drivers/media/platform/davinci/Kconfig"
 source "drivers/media/platform/exynos-gsc/Kconfig"
 source "drivers/media/platform/exynos4-is/Kconfig"
 source "drivers/media/platform/intel/Kconfig"
-source "drivers/media/platform/marvell-ccic/Kconfig"
+source "drivers/media/platform/marvell/Kconfig"
 source "drivers/media/platform/meson/ge2d/Kconfig"
 source "drivers/media/platform/mtk-jpeg/Kconfig"
 source "drivers/media/platform/mtk-mdp/Kconfig"

drivers/media/platform/Makefile +1 -1

index 8d6e15fad0b1..8b2deba4b62c 100644
@@ -16,7 +16,7 @@ obj-y += davinci/
 obj-y += exynos-gsc/
 obj-y += exynos4-is/
 obj-y += intel/
-obj-y += marvell-ccic/
+obj-y += marvell/
 obj-y += meson/ge2d/
 obj-y += mtk-jpeg/
 obj-y += mtk-mdp/

drivers/media/platform/marvell/Kconfig renamed from drivers/media/platform/marvell-ccic/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/marvell-ccic/Kconfig
rename to drivers/media/platform/marvell/Kconfig

drivers/media/platform/marvell/Makefile renamed from drivers/media/platform/marvell-ccic/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/marvell-ccic/Makefile
rename to drivers/media/platform/marvell/Makefile

drivers/media/platform/marvell/cafe-driver.c renamed from drivers/media/platform/marvell-ccic/cafe-driver.c +0 -0

similarity index 100%
rename from drivers/media/platform/marvell-ccic/cafe-driver.c
rename to drivers/media/platform/marvell/cafe-driver.c

drivers/media/platform/marvell/mcam-core.c renamed from drivers/media/platform/marvell-ccic/mcam-core.c +0 -0

similarity index 100%
rename from drivers/media/platform/marvell-ccic/mcam-core.c
rename to drivers/media/platform/marvell/mcam-core.c

drivers/media/platform/marvell/mcam-core.h renamed from drivers/media/platform/marvell-ccic/mcam-core.h +0 -0

similarity index 100%
rename from drivers/media/platform/marvell-ccic/mcam-core.h
rename to drivers/media/platform/marvell/mcam-core.h

drivers/media/platform/marvell/mmp-driver.c renamed from drivers/media/platform/marvell-ccic/mmp-driver.c +0 -0

similarity index 100%
rename from drivers/media/platform/marvell-ccic/mmp-driver.c
rename to drivers/media/platform/marvell/mmp-driver.c

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #3 lore raw

PATCH 3/24 media: platform: rename meson/ge2d/ to amlogic/meson-ge2d/

In reply to Mauro Carvalho Chehab

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 <[email protected]>

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index b83cf0eb99ce..09b0e60da4e9 100644
@@ -12523,7 +12523,7 @@ L:	[email protected]
 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 <[email protected]>

drivers/media/platform/Kconfig +1 -1

index 5e7cb24038fe..d8436923aebe 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index 8b2deba4b62c..48531f93d92f 100644
@@ -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/

drivers/media/platform/amlogic/meson-ge2d/Kconfig renamed from drivers/media/platform/meson/ge2d/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/meson/ge2d/Kconfig
rename to drivers/media/platform/amlogic/meson-ge2d/Kconfig

drivers/media/platform/amlogic/meson-ge2d/Makefile renamed from drivers/media/platform/meson/ge2d/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/meson/ge2d/Makefile
rename to drivers/media/platform/amlogic/meson-ge2d/Makefile

drivers/media/platform/amlogic/meson-ge2d/ge2d-regs.h renamed from drivers/media/platform/meson/ge2d/ge2d-regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/meson/ge2d/ge2d-regs.h
rename to drivers/media/platform/amlogic/meson-ge2d/ge2d-regs.h

drivers/media/platform/amlogic/meson-ge2d/ge2d.c renamed from drivers/media/platform/meson/ge2d/ge2d.c +0 -0

similarity index 100%
rename from drivers/media/platform/meson/ge2d/ge2d.c
rename to drivers/media/platform/amlogic/meson-ge2d/ge2d.c

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:52 UTC #4 lore raw

PATCH 4/24 media: platform: rename mtk-jpeg/ to mediatek/mtk-jpeg/

In reply to Mauro Carvalho Chehab

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 <[email protected]>

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index 09b0e60da4e9..fa0a3de3865f 100644
@@ -12130,7 +12130,7 @@ M:	Rick Chang <[email protected]>
 M:	Bin Liu <[email protected]>
 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 <[email protected]>

drivers/media/platform/Kconfig +1 -1

index d8436923aebe..fdb4e1a8aa81 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index 48531f93d92f..c792f6216918 100644
@@ -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/

drivers/media/platform/mediatek/mtk-jpeg/Kconfig renamed from drivers/media/platform/mtk-jpeg/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/mtk-jpeg/Kconfig
rename to drivers/media/platform/mediatek/mtk-jpeg/Kconfig

drivers/media/platform/mediatek/mtk-jpeg/Makefile renamed from drivers/media/platform/mtk-jpeg/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/mtk-jpeg/Makefile
rename to drivers/media/platform/mediatek/mtk-jpeg/Makefile

drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.c renamed from drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +0 -0

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

drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_core.h renamed from drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h +0 -0

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

drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.c renamed from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.c +0 -0

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

drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_hw.h renamed from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_hw.h +0 -0

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

drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.c renamed from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.c +0 -0

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

drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_parse.h renamed from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_parse.h +0 -0

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

drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_dec_reg.h renamed from drivers/media/platform/mtk-jpeg/mtk_jpeg_dec_reg.h +0 -0

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

drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.c renamed from drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.c +0 -0

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

drivers/media/platform/mediatek/mtk-jpeg/mtk_jpeg_enc_hw.h renamed from drivers/media/platform/mtk-jpeg/mtk_jpeg_enc_hw.h +0 -0

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

Signature · 7 lines

2.35.1


_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #5 lore raw

PATCH 5/24 media: platform: rename mtk-mdp/ to mediatek/mtk-mdp/

In reply to Mauro Carvalho Chehab

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 <[email protected]>

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index fa0a3de3865f..2203d98bbcf1 100644
@@ -12138,7 +12138,7 @@ M:	Houlong Wei <[email protected]>
 M:	Andrew-CT Chen <[email protected]>
 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

drivers/media/platform/Kconfig +1 -1

index fdb4e1a8aa81..a45fd3fe103e 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index c792f6216918..6f5d09cd8f9b 100644
@@ -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/

drivers/media/platform/mediatek/mtk-mdp/Kconfig renamed from drivers/media/platform/mtk-mdp/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/mtk-mdp/Kconfig
rename to drivers/media/platform/mediatek/mtk-mdp/Kconfig

drivers/media/platform/mediatek/mtk-mdp/Makefile renamed from drivers/media/platform/mtk-mdp/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/mtk-mdp/Makefile
rename to drivers/media/platform/mediatek/mtk-mdp/Makefile

drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.c renamed from drivers/media/platform/mtk-mdp/mtk_mdp_comp.c +0 -0

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

drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_comp.h renamed from drivers/media/platform/mtk-mdp/mtk_mdp_comp.h +0 -0

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

drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.c renamed from drivers/media/platform/mtk-mdp/mtk_mdp_core.c +0 -0

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

drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_core.h renamed from drivers/media/platform/mtk-mdp/mtk_mdp_core.h +0 -0

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

drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_ipi.h renamed from drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h +0 -0

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

drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.c renamed from drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c +0 -0

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

drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_m2m.h renamed from drivers/media/platform/mtk-mdp/mtk_mdp_m2m.h +0 -0

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

drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.c renamed from drivers/media/platform/mtk-mdp/mtk_mdp_regs.c +0 -0

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

drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_regs.h renamed from drivers/media/platform/mtk-mdp/mtk_mdp_regs.h +0 -0

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

drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.c renamed from drivers/media/platform/mtk-mdp/mtk_mdp_vpu.c +0 -0

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

drivers/media/platform/mediatek/mtk-mdp/mtk_mdp_vpu.h renamed from drivers/media/platform/mtk-mdp/mtk_mdp_vpu.h +0 -0

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

Signature · 7 lines

2.35.1


_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #6 lore raw

PATCH 6/24 media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/

In reply to Mauro Carvalho Chehab

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 <[email protected]>

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index 2203d98bbcf1..bfe014870a77 100644
@@ -12147,7 +12147,7 @@ M:	Andrew-CT Chen <[email protected]>
 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

drivers/media/platform/Kconfig +1 -1

index a45fd3fe103e..8ba10b657164 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index 6f5d09cd8f9b..637a3a7ac036 100644
@@ -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/

drivers/media/platform/mediatek/mtk-vcodec/Kconfig renamed from drivers/media/platform/mtk-vcodec/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Kconfig
rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig

drivers/media/platform/mediatek/mtk-vcodec/Makefile renamed from drivers/media/platform/mtk-vcodec/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Makefile
rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h renamed from drivers/media/platform/mtk-vcodec/vdec_drv_base.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c renamed from drivers/media/platform/mtk-vcodec/vdec_drv_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h renamed from drivers/media/platform/mtk-vcodec/vdec_drv_if.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h renamed from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c renamed from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h renamed from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c renamed from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h renamed from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c renamed from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c renamed from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h renamed from drivers/media/platform/mtk-vcodec/venc_drv_base.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c renamed from drivers/media/platform/mtk-vcodec/venc_drv_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h renamed from drivers/media/platform/mtk-vcodec/venc_drv_if.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h renamed from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c renamed from drivers/media/platform/mtk-vcodec/venc_vpu_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h renamed from drivers/media/platform/mtk-vcodec/venc_vpu_if.h +0 -0

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

Signature · 1 line

2.35.1

Nicolas Dufresne

Acked-by on v1 6/24

2022-03-14 13:10 UTC #7 lore raw

Re: [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/

Le dimanche 13 mars 2022 à 11:51 +0100, Mauro Carvalho Chehab a écrit :

Quoted 2 lines

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.

Quoted 2 lines

Signed-off-by Mauro Carvalho Chehab <[email protected]>

Acked-by Nicolas Dufresne <[email protected]>

Quoted 325 lines

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index 2203d98bbcf1..bfe014870a77 100644
@@ -12147,7 +12147,7 @@ M:	Andrew-CT Chen <[email protected]>
 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

drivers/media/platform/Kconfig +1 -1

index a45fd3fe103e..8ba10b657164 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index 6f5d09cd8f9b..637a3a7ac036 100644
@@ -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/

drivers/media/platform/mediatek/mtk-vcodec/Kconfig renamed from drivers/media/platform/mtk-vcodec/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Kconfig
rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig

drivers/media/platform/mediatek/mtk-vcodec/Makefile renamed from drivers/media/platform/mtk-vcodec/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Makefile
rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h renamed from drivers/media/platform/mtk-vcodec/vdec_drv_base.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c renamed from drivers/media/platform/mtk-vcodec/vdec_drv_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h renamed from drivers/media/platform/mtk-vcodec/vdec_drv_if.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h renamed from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c renamed from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h renamed from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c renamed from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h renamed from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c renamed from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c renamed from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h renamed from drivers/media/platform/mtk-vcodec/venc_drv_base.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c renamed from drivers/media/platform/mtk-vcodec/venc_drv_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h renamed from drivers/media/platform/mtk-vcodec/venc_drv_if.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h renamed from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c renamed from drivers/media/platform/mtk-vcodec/venc_vpu_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h renamed from drivers/media/platform/mtk-vcodec/venc_vpu_if.h +0 -0

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

Mauro Carvalho Chehab

author maintainer

2022-03-14 14:37 UTC #8 lore raw

Re: [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/

Em Mon, 14 Mar 2022 09:09:45 -0400
Nicolas Dufresne <[email protected]> escreveu:

Quoted 7 lines

Le dimanche 13 mars 2022 à 11:51 +0100, Mauro Carvalho Chehab a écrit :
Quoted 2 lines
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

Quoted 323 lines

Quoted 3 lines

Signed-off-by Mauro Carvalho Chehab <[email protected]>

Acked-by Nicolas Dufresne <[email protected]>

Quoted 317 lines

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index 2203d98bbcf1..bfe014870a77 100644
@@ -12147,7 +12147,7 @@ M:	Andrew-CT Chen <[email protected]>
 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

drivers/media/platform/Kconfig +1 -1

index a45fd3fe103e..8ba10b657164 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index 6f5d09cd8f9b..637a3a7ac036 100644
@@ -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/

drivers/media/platform/mediatek/mtk-vcodec/Kconfig renamed from drivers/media/platform/mtk-vcodec/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Kconfig
rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig

drivers/media/platform/mediatek/mtk-vcodec/Makefile renamed from drivers/media/platform/mtk-vcodec/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Makefile
rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h renamed from drivers/media/platform/mtk-vcodec/vdec_drv_base.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c renamed from drivers/media/platform/mtk-vcodec/vdec_drv_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h renamed from drivers/media/platform/mtk-vcodec/vdec_drv_if.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h renamed from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c renamed from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h renamed from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c renamed from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h renamed from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c renamed from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c renamed from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h renamed from drivers/media/platform/mtk-vcodec/venc_drv_base.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c renamed from drivers/media/platform/mtk-vcodec/venc_drv_if.c +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h renamed from drivers/media/platform/mtk-vcodec/venc_drv_if.h +0 -0

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

drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h renamed from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h +0 -0

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

Quoted 9 lines

drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
Quoted 8 lines
drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c renamed from drivers/media/platform/mtk-vcodec/venc_vpu_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h renamed from drivers/media/platform/mtk-vcodec/venc_vpu_if.h +0 -0
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

AngeloGioacchino Del Regno

maintainer

2022-03-14 15:02 UTC #9 lore raw

Re: [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/

Il 14/03/22 15:37, Mauro Carvalho Chehab ha scritto:

Quoted 4 lines

Em Mon, 14 Mar 2022 09:09:45 -0400
Nicolas Dufresne <[email protected]> escreveu:
Quoted 1 line
Le dimanche 13 mars 2022 à 11:51 +0100, Mauro Carvalho Chehab a écrit :

Quoted 9 lines

Quoted 6 lines
Quoted 2 lines
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

Quoted 400 lines

     $ 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
Quoted 323 lines
Quoted 3 lines
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Acked-by Nicolas Dufresne <[email protected]>
Quoted 317 lines
---
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/[email protected]/
  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%)
MAINTAINERS +1 -1
index 2203d98bbcf1..bfe014870a77 100644
@@ -12147,7 +12147,7 @@ M:	Andrew-CT Chen <[email protected]>
  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
drivers/media/platform/Kconfig +1 -1
index a45fd3fe103e..8ba10b657164 100644
@@ -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"
drivers/media/platform/Makefile +1 -1
index 6f5d09cd8f9b..637a3a7ac036 100644
@@ -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/
drivers/media/platform/mediatek/mtk-vcodec/Kconfig renamed from drivers/media/platform/mtk-vcodec/Kconfig +0 -0
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Kconfig
rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig
drivers/media/platform/mediatek/mtk-vcodec/Makefile renamed from drivers/media/platform/mtk-vcodec/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Makefile
rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h renamed from drivers/media/platform/mtk-vcodec/vdec_drv_base.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c renamed from drivers/media/platform/mtk-vcodec/vdec_drv_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h renamed from drivers/media/platform/mtk-vcodec/vdec_drv_if.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h renamed from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c renamed from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h renamed from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c renamed from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h renamed from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c renamed from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c renamed from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h renamed from drivers/media/platform/mtk-vcodec/venc_drv_base.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c renamed from drivers/media/platform/mtk-vcodec/venc_drv_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h renamed from drivers/media/platform/mtk-vcodec/venc_drv_if.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h renamed from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h +0 -0
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
Quoted 9 lines
drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
Quoted 8 lines
drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c renamed from drivers/media/platform/mtk-vcodec/venc_vpu_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h renamed from drivers/media/platform/mtk-vcodec/venc_vpu_if.h +0 -0
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

Mauro Carvalho Chehab

author maintainer

2022-03-14 15:42 UTC #10 lore raw

Re: [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/

Em Mon, 14 Mar 2022 16:02:43 +0100
AngeloGioacchino Del Regno <[email protected]> escreveu:

Quoted 17 lines

Il 14/03/22 15:37, Mauro Carvalho Chehab ha scritto:
Quoted 4 lines
Em Mon, 14 Mar 2022 09:09:45 -0400
Nicolas Dufresne <[email protected]> escreveu:
Quoted 1 line
Le dimanche 13 mars 2022 à 11:51 +0100, Mauro Carvalho Chehab a écrit :
Quoted 9 lines
Quoted 6 lines
Quoted 2 lines
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

Quoted 7 lines

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.

Quoted 4 lines

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 ;-)

Quoted 406 lines

Cheers,
Angelo
Quoted 400 lines
     $ 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
Quoted 323 lines
Quoted 3 lines
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Acked-by Nicolas Dufresne <[email protected]>
Quoted 317 lines
---
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/[email protected]/
  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%)
MAINTAINERS +1 -1
index 2203d98bbcf1..bfe014870a77 100644
@@ -12147,7 +12147,7 @@ M:	Andrew-CT Chen <[email protected]>
  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
drivers/media/platform/Kconfig +1 -1
index a45fd3fe103e..8ba10b657164 100644
@@ -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"
drivers/media/platform/Makefile +1 -1
index 6f5d09cd8f9b..637a3a7ac036 100644
@@ -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/
drivers/media/platform/mediatek/mtk-vcodec/Kconfig renamed from drivers/media/platform/mtk-vcodec/Kconfig +0 -0
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Kconfig
rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig
drivers/media/platform/mediatek/mtk-vcodec/Makefile renamed from drivers/media/platform/mtk-vcodec/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Makefile
rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h renamed from drivers/media/platform/mtk-vcodec/vdec_drv_base.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c renamed from drivers/media/platform/mtk-vcodec/vdec_drv_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h renamed from drivers/media/platform/mtk-vcodec/vdec_drv_if.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h renamed from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c renamed from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h renamed from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c renamed from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h renamed from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c renamed from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c renamed from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h renamed from drivers/media/platform/mtk-vcodec/venc_drv_base.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c renamed from drivers/media/platform/mtk-vcodec/venc_drv_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h renamed from drivers/media/platform/mtk-vcodec/venc_drv_if.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h renamed from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h +0 -0
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
Quoted 9 lines
drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
Quoted 8 lines
drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c renamed from drivers/media/platform/mtk-vcodec/venc_vpu_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h renamed from drivers/media/platform/mtk-vcodec/venc_vpu_if.h +0 -0
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

AngeloGioacchino Del Regno

maintainer

2022-03-14 15:43 UTC #11 lore raw

Re: [PATCH 06/24] media: platform: rename mtk-vcodec/ to mediatek/mtk-vcodec/

Il 14/03/22 16:42, Mauro Carvalho Chehab ha scritto:

Quoted 23 lines

Em Mon, 14 Mar 2022 16:02:43 +0100
AngeloGioacchino Del Regno <[email protected]> escreveu:
Quoted 20 lines
Il 14/03/22 15:37, Mauro Carvalho Chehab ha scritto:
Quoted 4 lines
Em Mon, 14 Mar 2022 09:09:45 -0400
Nicolas Dufresne <[email protected]> escreveu:
Quoted 1 line
Le dimanche 13 mars 2022 à 11:51 +0100, Mauro Carvalho Chehab a écrit :
Quoted 9 lines
Quoted 6 lines
Quoted 2 lines
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:

Quoted 6 lines

Quoted 4 lines
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 :))

Quoted 9 lines

Quoted 5 lines
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!

Quoted 411 lines

Quoted 406 lines
Cheers,
Angelo
Quoted 400 lines
      $ 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
Quoted 323 lines
Quoted 3 lines
Signed-off-by Mauro Carvalho Chehab <[email protected]>
Acked-by Nicolas Dufresne <[email protected]>
Quoted 317 lines
---
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/[email protected]/
   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%)
MAINTAINERS +1 -1
index 2203d98bbcf1..bfe014870a77 100644
@@ -12147,7 +12147,7 @@ M:	Andrew-CT Chen <[email protected]>
   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
drivers/media/platform/Kconfig +1 -1
index a45fd3fe103e..8ba10b657164 100644
@@ -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"
drivers/media/platform/Makefile +1 -1
index 6f5d09cd8f9b..637a3a7ac036 100644
@@ -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/
drivers/media/platform/mediatek/mtk-vcodec/Kconfig renamed from drivers/media/platform/mtk-vcodec/Kconfig +0 -0
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Kconfig
rename to drivers/media/platform/mediatek/mtk-vcodec/Kconfig
drivers/media/platform/mediatek/mtk-vcodec/Makefile renamed from drivers/media/platform/mtk-vcodec/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/mtk-vcodec/Makefile
rename to drivers/media/platform/mediatek/mtk-vcodec/Makefile
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_drv.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_hw.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_pm.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateful.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateful.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_dec_stateless.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_stateless.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_drv.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_drv.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_enc_pm.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_priv.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_priv.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_scp.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_scp.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_fw_vpu.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_fw_vpu.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_intr.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_intr.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.c renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/mtk_vcodec_util.h renamed from drivers/media/platform/mtk-vcodec/mtk_vcodec_util.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_h264_req_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_h264_req_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp8_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_vp8_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec/vdec_vp9_if.c renamed from drivers/media/platform/mtk-vcodec/vdec/vdec_vp9_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_base.h renamed from drivers/media/platform/mtk-vcodec/vdec_drv_base.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.c renamed from drivers/media/platform/mtk-vcodec/vdec_drv_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_drv_if.h renamed from drivers/media/platform/mtk-vcodec/vdec_drv_if.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_ipi_msg.h renamed from drivers/media/platform/mtk-vcodec/vdec_ipi_msg.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.c renamed from drivers/media/platform/mtk-vcodec/vdec_msg_queue.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_msg_queue.h renamed from drivers/media/platform/mtk-vcodec/vdec_msg_queue.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.c renamed from drivers/media/platform/mtk-vcodec/vdec_vpu_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/vdec_vpu_if.h renamed from drivers/media/platform/mtk-vcodec/vdec_vpu_if.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc/venc_h264_if.c renamed from drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc/venc_vp8_if.c renamed from drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_drv_base.h renamed from drivers/media/platform/mtk-vcodec/venc_drv_base.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.c renamed from drivers/media/platform/mtk-vcodec/venc_drv_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_drv_if.h renamed from drivers/media/platform/mtk-vcodec/venc_drv_if.h +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_ipi_msg.h renamed from drivers/media/platform/mtk-vcodec/venc_ipi_msg.h +0 -0
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
Quoted 9 lines
drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h
Quoted 8 lines
drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.c renamed from drivers/media/platform/mtk-vcodec/venc_vpu_if.c +0 -0
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
drivers/media/platform/mediatek/mtk-vcodec/venc_vpu_if.h renamed from drivers/media/platform/mtk-vcodec/venc_vpu_if.h +0 -0
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

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #12 lore raw

PATCH 7/24 media: platform: rename mtk-vpu/ to mediatek/mtk-vpu/

In reply to Mauro Carvalho Chehab

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 <[email protected]>

---

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/[email protected]/

 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%)

MAINTAINERS +2 -2

index bfe014870a77..58e0d42b1278 100644
@@ -12139,7 +12139,7 @@ M:	Andrew-CT Chen <[email protected]>
 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 <[email protected]>

@@ -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 <[email protected]>

drivers/media/platform/Kconfig +1 -1

index 8ba10b657164..33f8f41b2771 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index 637a3a7ac036..954ad8f2cde1 100644
@@ -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/

drivers/media/platform/mediatek/mtk-mdp/Makefile +1 -1

index 5982d65c9971..eab6f984aeea 100644
@@ -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

drivers/media/platform/mediatek/mtk-vpu/Kconfig renamed from drivers/media/platform/mtk-vpu/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/mtk-vpu/Kconfig
rename to drivers/media/platform/mediatek/mtk-vpu/Kconfig

drivers/media/platform/mediatek/mtk-vpu/Makefile renamed from drivers/media/platform/mtk-vpu/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/mtk-vpu/Makefile
rename to drivers/media/platform/mediatek/mtk-vpu/Makefile

drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c renamed from drivers/media/platform/mtk-vpu/mtk_vpu.c +0 -0

similarity index 100%
rename from drivers/media/platform/mtk-vpu/mtk_vpu.c
rename to drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.c

drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h renamed from drivers/media/platform/mtk-vpu/mtk_vpu.h +0 -0

similarity index 100%
rename from drivers/media/platform/mtk-vpu/mtk_vpu.h
rename to drivers/media/platform/mediatek/mtk-vpu/mtk_vpu.h

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:52 UTC #13 lore raw

PATCH 8/24 media: platform: rename sunxi/ to allwinner/

In reply to Mauro Carvalho Chehab

As the end goal is to have platform drivers split by vendor, rename sunxi/ to allwinner/.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 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

MAINTAINERS +4 -4

index 58e0d42b1278..f29195850c16 100644
@@ -750,7 +750,7 @@ L:	[email protected]
 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 <[email protected]>

@@ -5114,7 +5114,7 @@ L:	[email protected]
 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 <[email protected]>

@@ -5391,7 +5391,7 @@ L:	[email protected]
 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 <[email protected]>

@@ -16746,7 +16746,7 @@ L:	[email protected]
 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 <[email protected]>

drivers/media/platform/Kconfig +1 -1

index 33f8f41b2771..5ffbbd6c6f91 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index 954ad8f2cde1..88519e902919 100644
@@ -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/

drivers/media/platform/allwinner/Kconfig new file +6 -0

new file mode 100644
index 000000000000..88bffb055528
@@ -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"

drivers/media/platform/allwinner/Makefile renamed from drivers/media/platform/sunxi/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/sunxi/Makefile
rename to drivers/media/platform/allwinner/Makefile

drivers/media/platform/allwinner/sun4i-csi/Kconfig renamed from drivers/media/platform/sunxi/sun4i-csi/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/sunxi/sun4i-csi/Kconfig
rename to drivers/media/platform/allwinner/sun4i-csi/Kconfig

drivers/media/platform/allwinner/sun4i-csi/Makefile renamed from drivers/media/platform/sunxi/sun4i-csi/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/sunxi/sun4i-csi/Makefile
rename to drivers/media/platform/allwinner/sun4i-csi/Makefile

drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.c renamed from drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c +0 -0

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

drivers/media/platform/allwinner/sun4i-csi/sun4i_csi.h renamed from drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.h +0 -0

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

drivers/media/platform/allwinner/sun4i-csi/sun4i_dma.c renamed from drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c +0 -0

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

drivers/media/platform/allwinner/sun4i-csi/sun4i_v4l2.c renamed from drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c +0 -0

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

drivers/media/platform/allwinner/sun6i-csi/Kconfig renamed from drivers/media/platform/sunxi/sun6i-csi/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/Kconfig
rename to drivers/media/platform/allwinner/sun6i-csi/Kconfig

drivers/media/platform/allwinner/sun6i-csi/Makefile renamed from drivers/media/platform/sunxi/sun6i-csi/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/sunxi/sun6i-csi/Makefile
rename to drivers/media/platform/allwinner/sun6i-csi/Makefile

drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.c renamed from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +0 -0

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

drivers/media/platform/allwinner/sun6i-csi/sun6i_csi.h renamed from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h +0 -0

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

drivers/media/platform/allwinner/sun6i-csi/sun6i_csi_reg.h renamed from drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h +0 -0

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

drivers/media/platform/allwinner/sun6i-csi/sun6i_video.c renamed from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c +0 -0

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

drivers/media/platform/allwinner/sun6i-csi/sun6i_video.h renamed from drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h +0 -0

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

drivers/media/platform/allwinner/sun8i-di/Kconfig renamed from drivers/media/platform/sunxi/sun8i-di/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-di/Kconfig
rename to drivers/media/platform/allwinner/sun8i-di/Kconfig

drivers/media/platform/allwinner/sun8i-di/Makefile renamed from drivers/media/platform/sunxi/sun8i-di/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-di/Makefile
rename to drivers/media/platform/allwinner/sun8i-di/Makefile

drivers/media/platform/allwinner/sun8i-di/sun8i-di.c renamed from drivers/media/platform/sunxi/sun8i-di/sun8i-di.c +0 -0

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

drivers/media/platform/allwinner/sun8i-di/sun8i-di.h renamed from drivers/media/platform/sunxi/sun8i-di/sun8i-di.h +0 -0

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

drivers/media/platform/allwinner/sun8i-rotate/Kconfig renamed from drivers/media/platform/sunxi/sun8i-rotate/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-rotate/Kconfig
rename to drivers/media/platform/allwinner/sun8i-rotate/Kconfig

drivers/media/platform/allwinner/sun8i-rotate/Makefile renamed from drivers/media/platform/sunxi/sun8i-rotate/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/sunxi/sun8i-rotate/Makefile
rename to drivers/media/platform/allwinner/sun8i-rotate/Makefile

drivers/media/platform/allwinner/sun8i-rotate/sun8i-formats.h renamed from drivers/media/platform/sunxi/sun8i-rotate/sun8i-formats.h +0 -0

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

drivers/media/platform/allwinner/sun8i-rotate/sun8i-rotate.h renamed from drivers/media/platform/sunxi/sun8i-rotate/sun8i-rotate.h +0 -0

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

drivers/media/platform/allwinner/sun8i-rotate/sun8i_formats.c renamed from drivers/media/platform/sunxi/sun8i-rotate/sun8i_formats.c +0 -0

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

drivers/media/platform/allwinner/sun8i-rotate/sun8i_rotate.c renamed from drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c +0 -0

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

drivers/media/platform/sunxi/Kconfig deleted +0 -6

deleted file mode 100644
index a10032215b08..000000000000
@@ -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"

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:54 UTC #14 lore raw

PATCH 9/24 media: platform: rename tegra/vde/ to nvidia/tegra-vde/

In reply to Mauro Carvalho Chehab

As the end goal is to have platform drivers split by vendor, rename tegra/vde/ to nvidia/tegra-vde/.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 MAINTAINERS                                                     | 2 +-
 drivers/media/platform/Kconfig                                  | 2 +-
 drivers/media/platform/Makefile                                 | 2 +-
 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/Kconfig  | 0
 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/Makefile | 0
 .../platform/{tegra/vde => nvidia/tegra-vde}/dmabuf-cache.c     | 0
 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/h264.c   | 0
 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/iommu.c  | 0
 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/trace.h  | 2 +-
 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/v4l2.c   | 0
 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/vde.c    | 0
 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/vde.h    | 0
 12 files changed, 4 insertions(+), 4 deletions(-)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/Kconfig (100%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/Makefile (100%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/dmabuf-cache.c (100%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/h264.c (100%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/iommu.c (100%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/trace.h (97%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/v4l2.c (100%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/vde.c (100%)
 rename drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/vde.h (100%)

MAINTAINERS +1 -1

index f29195850c16..c9333d46047e 100644
@@ -11964,7 +11964,7 @@ L:	[email protected]
 S:	Maintained
 T:	git git://linuxtv.org/media_tree.git
 F:	Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt
-F:	drivers/media/platform/tegra/vde/
+F:	drivers/media/platform/nvidia/tegra-vde/
 
 MEDIA DRIVERS FOR RENESAS - CEU
 M:	Jacopo Mondi <[email protected]>

drivers/media/platform/Kconfig +1 -1

index 5ffbbd6c6f91..f07ab9a98e3b 100644
@@ -83,6 +83,7 @@ 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/nxp/Kconfig"
 source "drivers/media/platform/omap/Kconfig"
 source "drivers/media/platform/omap3isp/Kconfig"

@@ -95,7 +96,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/tegra/vde/Kconfig"
 source "drivers/media/platform/ti-vpe/Kconfig"
 source "drivers/media/platform/via/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"

drivers/media/platform/Makefile +1 -1

index 88519e902919..ce9909534218 100644
@@ -23,6 +23,7 @@ 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 += nxp/
 obj-y += omap/
 obj-y += omap3isp/

@@ -40,7 +41,6 @@ obj-y += sti/c8sectpfe/
 obj-y += sti/delta/
 obj-y += sti/hva/
 obj-y += stm32/
-obj-y += tegra/vde/
 obj-y += ti-vpe/
 obj-y += via/
 obj-y += xilinx/

drivers/media/platform/nvidia/tegra-vde/Kconfig renamed from drivers/media/platform/tegra/vde/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/tegra/vde/Kconfig
rename to drivers/media/platform/nvidia/tegra-vde/Kconfig

drivers/media/platform/nvidia/tegra-vde/Makefile renamed from drivers/media/platform/tegra/vde/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/tegra/vde/Makefile
rename to drivers/media/platform/nvidia/tegra-vde/Makefile

drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c renamed from drivers/media/platform/tegra/vde/dmabuf-cache.c +0 -0

similarity index 100%
rename from drivers/media/platform/tegra/vde/dmabuf-cache.c
rename to drivers/media/platform/nvidia/tegra-vde/dmabuf-cache.c

drivers/media/platform/nvidia/tegra-vde/h264.c renamed from drivers/media/platform/tegra/vde/h264.c +0 -0

similarity index 100%
rename from drivers/media/platform/tegra/vde/h264.c
rename to drivers/media/platform/nvidia/tegra-vde/h264.c

drivers/media/platform/nvidia/tegra-vde/iommu.c renamed from drivers/media/platform/tegra/vde/iommu.c +0 -0

similarity index 100%
rename from drivers/media/platform/tegra/vde/iommu.c
rename to drivers/media/platform/nvidia/tegra-vde/iommu.c

drivers/media/platform/nvidia/tegra-vde/trace.h renamed from drivers/media/platform/tegra/vde/trace.h +1 -1

similarity index 97%
rename from drivers/media/platform/tegra/vde/trace.h
rename to drivers/media/platform/nvidia/tegra-vde/trace.h
index 77358ddfdb8f..7853ab095ca4 100644
@@ -90,6 +90,6 @@ TRACE_EVENT(vde_ref_l1,
 
 /* This part must be outside protection */
 #undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH ../../drivers/media/platform/tegra/vde
+#define TRACE_INCLUDE_PATH ../../drivers/media/platform/nvidia/tegra-vde
 #define TRACE_INCLUDE_FILE trace
 #include <trace/define_trace.h>

drivers/media/platform/nvidia/tegra-vde/v4l2.c renamed from drivers/media/platform/tegra/vde/v4l2.c +0 -0

similarity index 100%
rename from drivers/media/platform/tegra/vde/v4l2.c
rename to drivers/media/platform/nvidia/tegra-vde/v4l2.c

drivers/media/platform/nvidia/tegra-vde/vde.c renamed from drivers/media/platform/tegra/vde/vde.c +0 -0

similarity index 100%
rename from drivers/media/platform/tegra/vde/vde.c
rename to drivers/media/platform/nvidia/tegra-vde/vde.c

drivers/media/platform/nvidia/tegra-vde/vde.h renamed from drivers/media/platform/tegra/vde/vde.h +0 -0

similarity index 100%
rename from drivers/media/platform/tegra/vde/vde.h
rename to drivers/media/platform/nvidia/tegra-vde/vde.h

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:54 UTC #15 lore raw

PATCH 10/24 media: platform: rename amphion/ to nxp/amphion/

In reply to Mauro Carvalho Chehab

As the end goal is to have platform drivers split by vendor, rename amphion/ to nxp/amphion/.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index c9333d46047e..74901acf8f06 100644
@@ -1037,7 +1037,7 @@ M:	Zhou Peng <[email protected]>
 L:	[email protected]
 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 <[email protected]>

drivers/media/platform/Kconfig +1 -1

index f07ab9a98e3b..2e3925408aa0 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index ce9909534218..7a28b60dbbe6 100644
@@ -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/

drivers/media/platform/nxp/amphion/Kconfig renamed from drivers/media/platform/amphion/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/Kconfig
rename to drivers/media/platform/nxp/amphion/Kconfig

drivers/media/platform/nxp/amphion/Makefile renamed from drivers/media/platform/amphion/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/Makefile
rename to drivers/media/platform/nxp/amphion/Makefile

drivers/media/platform/nxp/amphion/vdec.c renamed from drivers/media/platform/amphion/vdec.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vdec.c
rename to drivers/media/platform/nxp/amphion/vdec.c

drivers/media/platform/nxp/amphion/venc.c renamed from drivers/media/platform/amphion/venc.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/venc.c
rename to drivers/media/platform/nxp/amphion/venc.c

drivers/media/platform/nxp/amphion/vpu.h renamed from drivers/media/platform/amphion/vpu.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu.h
rename to drivers/media/platform/nxp/amphion/vpu.h

drivers/media/platform/nxp/amphion/vpu_cmds.c renamed from drivers/media/platform/amphion/vpu_cmds.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_cmds.c
rename to drivers/media/platform/nxp/amphion/vpu_cmds.c

drivers/media/platform/nxp/amphion/vpu_cmds.h renamed from drivers/media/platform/amphion/vpu_cmds.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_cmds.h
rename to drivers/media/platform/nxp/amphion/vpu_cmds.h

drivers/media/platform/nxp/amphion/vpu_codec.h renamed from drivers/media/platform/amphion/vpu_codec.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_codec.h
rename to drivers/media/platform/nxp/amphion/vpu_codec.h

drivers/media/platform/nxp/amphion/vpu_color.c renamed from drivers/media/platform/amphion/vpu_color.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_color.c
rename to drivers/media/platform/nxp/amphion/vpu_color.c

drivers/media/platform/nxp/amphion/vpu_core.c renamed from drivers/media/platform/amphion/vpu_core.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_core.c
rename to drivers/media/platform/nxp/amphion/vpu_core.c

drivers/media/platform/nxp/amphion/vpu_core.h renamed from drivers/media/platform/amphion/vpu_core.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_core.h
rename to drivers/media/platform/nxp/amphion/vpu_core.h

drivers/media/platform/nxp/amphion/vpu_dbg.c renamed from drivers/media/platform/amphion/vpu_dbg.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_dbg.c
rename to drivers/media/platform/nxp/amphion/vpu_dbg.c

drivers/media/platform/nxp/amphion/vpu_defs.h renamed from drivers/media/platform/amphion/vpu_defs.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_defs.h
rename to drivers/media/platform/nxp/amphion/vpu_defs.h

drivers/media/platform/nxp/amphion/vpu_drv.c renamed from drivers/media/platform/amphion/vpu_drv.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_drv.c
rename to drivers/media/platform/nxp/amphion/vpu_drv.c

drivers/media/platform/nxp/amphion/vpu_helpers.c renamed from drivers/media/platform/amphion/vpu_helpers.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_helpers.c
rename to drivers/media/platform/nxp/amphion/vpu_helpers.c

drivers/media/platform/nxp/amphion/vpu_helpers.h renamed from drivers/media/platform/amphion/vpu_helpers.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_helpers.h
rename to drivers/media/platform/nxp/amphion/vpu_helpers.h

drivers/media/platform/nxp/amphion/vpu_imx8q.c renamed from drivers/media/platform/amphion/vpu_imx8q.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_imx8q.c
rename to drivers/media/platform/nxp/amphion/vpu_imx8q.c

drivers/media/platform/nxp/amphion/vpu_imx8q.h renamed from drivers/media/platform/amphion/vpu_imx8q.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_imx8q.h
rename to drivers/media/platform/nxp/amphion/vpu_imx8q.h

drivers/media/platform/nxp/amphion/vpu_malone.c renamed from drivers/media/platform/amphion/vpu_malone.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_malone.c
rename to drivers/media/platform/nxp/amphion/vpu_malone.c

drivers/media/platform/nxp/amphion/vpu_malone.h renamed from drivers/media/platform/amphion/vpu_malone.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_malone.h
rename to drivers/media/platform/nxp/amphion/vpu_malone.h

drivers/media/platform/nxp/amphion/vpu_mbox.c renamed from drivers/media/platform/amphion/vpu_mbox.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_mbox.c
rename to drivers/media/platform/nxp/amphion/vpu_mbox.c

drivers/media/platform/nxp/amphion/vpu_mbox.h renamed from drivers/media/platform/amphion/vpu_mbox.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_mbox.h
rename to drivers/media/platform/nxp/amphion/vpu_mbox.h

drivers/media/platform/nxp/amphion/vpu_msgs.c renamed from drivers/media/platform/amphion/vpu_msgs.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_msgs.c
rename to drivers/media/platform/nxp/amphion/vpu_msgs.c

drivers/media/platform/nxp/amphion/vpu_msgs.h renamed from drivers/media/platform/amphion/vpu_msgs.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_msgs.h
rename to drivers/media/platform/nxp/amphion/vpu_msgs.h

drivers/media/platform/nxp/amphion/vpu_rpc.c renamed from drivers/media/platform/amphion/vpu_rpc.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_rpc.c
rename to drivers/media/platform/nxp/amphion/vpu_rpc.c

drivers/media/platform/nxp/amphion/vpu_rpc.h renamed from drivers/media/platform/amphion/vpu_rpc.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_rpc.h
rename to drivers/media/platform/nxp/amphion/vpu_rpc.h

drivers/media/platform/nxp/amphion/vpu_v4l2.c renamed from drivers/media/platform/amphion/vpu_v4l2.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_v4l2.c
rename to drivers/media/platform/nxp/amphion/vpu_v4l2.c

drivers/media/platform/nxp/amphion/vpu_v4l2.h renamed from drivers/media/platform/amphion/vpu_v4l2.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_v4l2.h
rename to drivers/media/platform/nxp/amphion/vpu_v4l2.h

drivers/media/platform/nxp/amphion/vpu_windsor.c renamed from drivers/media/platform/amphion/vpu_windsor.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_windsor.c
rename to drivers/media/platform/nxp/amphion/vpu_windsor.c

drivers/media/platform/nxp/amphion/vpu_windsor.h renamed from drivers/media/platform/amphion/vpu_windsor.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_windsor.h
rename to drivers/media/platform/nxp/amphion/vpu_windsor.h

Signature · 1 line

2.35.1

Nicolas Dufresne

2022-03-15 18:26 UTC #16 lore raw

Re: [PATCH 10/24] media: platform: rename amphion/ to nxp/amphion/

Le dimanche 13 mars 2022 à 11:51 +0100, Mauro Carvalho Chehab a écrit :

Quoted 2 lines

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 ?

Quoted 245 lines

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index c9333d46047e..74901acf8f06 100644
@@ -1037,7 +1037,7 @@ M:	Zhou Peng <[email protected]>
 L:	[email protected]
 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 <[email protected]>

drivers/media/platform/Kconfig +1 -1

index f07ab9a98e3b..2e3925408aa0 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index ce9909534218..7a28b60dbbe6 100644
@@ -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/

drivers/media/platform/nxp/amphion/Kconfig renamed from drivers/media/platform/amphion/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/Kconfig
rename to drivers/media/platform/nxp/amphion/Kconfig

drivers/media/platform/nxp/amphion/Makefile renamed from drivers/media/platform/amphion/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/Makefile
rename to drivers/media/platform/nxp/amphion/Makefile

drivers/media/platform/nxp/amphion/vdec.c renamed from drivers/media/platform/amphion/vdec.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vdec.c
rename to drivers/media/platform/nxp/amphion/vdec.c

drivers/media/platform/nxp/amphion/venc.c renamed from drivers/media/platform/amphion/venc.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/venc.c
rename to drivers/media/platform/nxp/amphion/venc.c

drivers/media/platform/nxp/amphion/vpu.h renamed from drivers/media/platform/amphion/vpu.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu.h
rename to drivers/media/platform/nxp/amphion/vpu.h

drivers/media/platform/nxp/amphion/vpu_cmds.c renamed from drivers/media/platform/amphion/vpu_cmds.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_cmds.c
rename to drivers/media/platform/nxp/amphion/vpu_cmds.c

drivers/media/platform/nxp/amphion/vpu_cmds.h renamed from drivers/media/platform/amphion/vpu_cmds.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_cmds.h
rename to drivers/media/platform/nxp/amphion/vpu_cmds.h

drivers/media/platform/nxp/amphion/vpu_codec.h renamed from drivers/media/platform/amphion/vpu_codec.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_codec.h
rename to drivers/media/platform/nxp/amphion/vpu_codec.h

drivers/media/platform/nxp/amphion/vpu_color.c renamed from drivers/media/platform/amphion/vpu_color.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_color.c
rename to drivers/media/platform/nxp/amphion/vpu_color.c

drivers/media/platform/nxp/amphion/vpu_core.c renamed from drivers/media/platform/amphion/vpu_core.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_core.c
rename to drivers/media/platform/nxp/amphion/vpu_core.c

drivers/media/platform/nxp/amphion/vpu_core.h renamed from drivers/media/platform/amphion/vpu_core.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_core.h
rename to drivers/media/platform/nxp/amphion/vpu_core.h

drivers/media/platform/nxp/amphion/vpu_dbg.c renamed from drivers/media/platform/amphion/vpu_dbg.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_dbg.c
rename to drivers/media/platform/nxp/amphion/vpu_dbg.c

drivers/media/platform/nxp/amphion/vpu_defs.h renamed from drivers/media/platform/amphion/vpu_defs.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_defs.h
rename to drivers/media/platform/nxp/amphion/vpu_defs.h

drivers/media/platform/nxp/amphion/vpu_drv.c renamed from drivers/media/platform/amphion/vpu_drv.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_drv.c
rename to drivers/media/platform/nxp/amphion/vpu_drv.c

drivers/media/platform/nxp/amphion/vpu_helpers.c renamed from drivers/media/platform/amphion/vpu_helpers.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_helpers.c
rename to drivers/media/platform/nxp/amphion/vpu_helpers.c

drivers/media/platform/nxp/amphion/vpu_helpers.h renamed from drivers/media/platform/amphion/vpu_helpers.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_helpers.h
rename to drivers/media/platform/nxp/amphion/vpu_helpers.h

drivers/media/platform/nxp/amphion/vpu_imx8q.c renamed from drivers/media/platform/amphion/vpu_imx8q.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_imx8q.c
rename to drivers/media/platform/nxp/amphion/vpu_imx8q.c

drivers/media/platform/nxp/amphion/vpu_imx8q.h renamed from drivers/media/platform/amphion/vpu_imx8q.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_imx8q.h
rename to drivers/media/platform/nxp/amphion/vpu_imx8q.h

drivers/media/platform/nxp/amphion/vpu_malone.c renamed from drivers/media/platform/amphion/vpu_malone.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_malone.c
rename to drivers/media/platform/nxp/amphion/vpu_malone.c

drivers/media/platform/nxp/amphion/vpu_malone.h renamed from drivers/media/platform/amphion/vpu_malone.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_malone.h
rename to drivers/media/platform/nxp/amphion/vpu_malone.h

drivers/media/platform/nxp/amphion/vpu_mbox.c renamed from drivers/media/platform/amphion/vpu_mbox.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_mbox.c
rename to drivers/media/platform/nxp/amphion/vpu_mbox.c

drivers/media/platform/nxp/amphion/vpu_mbox.h renamed from drivers/media/platform/amphion/vpu_mbox.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_mbox.h
rename to drivers/media/platform/nxp/amphion/vpu_mbox.h

drivers/media/platform/nxp/amphion/vpu_msgs.c renamed from drivers/media/platform/amphion/vpu_msgs.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_msgs.c
rename to drivers/media/platform/nxp/amphion/vpu_msgs.c

drivers/media/platform/nxp/amphion/vpu_msgs.h renamed from drivers/media/platform/amphion/vpu_msgs.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_msgs.h
rename to drivers/media/platform/nxp/amphion/vpu_msgs.h

drivers/media/platform/nxp/amphion/vpu_rpc.c renamed from drivers/media/platform/amphion/vpu_rpc.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_rpc.c
rename to drivers/media/platform/nxp/amphion/vpu_rpc.c

drivers/media/platform/nxp/amphion/vpu_rpc.h renamed from drivers/media/platform/amphion/vpu_rpc.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_rpc.h
rename to drivers/media/platform/nxp/amphion/vpu_rpc.h

drivers/media/platform/nxp/amphion/vpu_v4l2.c renamed from drivers/media/platform/amphion/vpu_v4l2.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_v4l2.c
rename to drivers/media/platform/nxp/amphion/vpu_v4l2.c

drivers/media/platform/nxp/amphion/vpu_v4l2.h renamed from drivers/media/platform/amphion/vpu_v4l2.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_v4l2.h
rename to drivers/media/platform/nxp/amphion/vpu_v4l2.h

drivers/media/platform/nxp/amphion/vpu_windsor.c renamed from drivers/media/platform/amphion/vpu_windsor.c +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_windsor.c
rename to drivers/media/platform/nxp/amphion/vpu_windsor.c

drivers/media/platform/nxp/amphion/vpu_windsor.h renamed from drivers/media/platform/amphion/vpu_windsor.h +0 -0

similarity index 100%
rename from drivers/media/platform/amphion/vpu_windsor.h
rename to drivers/media/platform/nxp/amphion/vpu_windsor.h

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #17 lore raw

PATCH 11/24 media: platform: rename exynos4-is/ to samsung/exynos4-is/

In reply to Mauro Carvalho Chehab

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 <[email protected]>

---

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/[email protected]/

 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%)

Documentation/admin-guide/media/fimc.rst +1 -1

index 56b149d9a527..267ef52fe387 100644
@@ -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
 --------------

Documentation/driver-api/media/drivers/fimc-devel.rst +7 -7

index 956e3a9901f8..4c6b7c8be19f 100644
@@ -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

MAINTAINERS +1 -1

index 74901acf8f06..b1418853d56f 100644
@@ -17103,7 +17103,7 @@ M:	Sylwester Nawrocki <[email protected]>
 L:	[email protected]
 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 <[email protected]>

drivers/media/platform/Kconfig +1 -1

index 2e3925408aa0..1bbada840723 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index 7a28b60dbbe6..613ca6a3efa7 100644
@@ -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/

drivers/media/platform/samsung/exynos4-is/Kconfig renamed from drivers/media/platform/exynos4-is/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/Kconfig
rename to drivers/media/platform/samsung/exynos4-is/Kconfig

drivers/media/platform/samsung/exynos4-is/Makefile renamed from drivers/media/platform/exynos4-is/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/Makefile
rename to drivers/media/platform/samsung/exynos4-is/Makefile

drivers/media/platform/samsung/exynos4-is/common.c renamed from drivers/media/platform/exynos4-is/common.c +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/common.c
rename to drivers/media/platform/samsung/exynos4-is/common.c

drivers/media/platform/samsung/exynos4-is/common.h renamed from drivers/media/platform/exynos4-is/common.h +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/common.h
rename to drivers/media/platform/samsung/exynos4-is/common.h

drivers/media/platform/samsung/exynos4-is/fimc-capture.c renamed from drivers/media/platform/exynos4-is/fimc-capture.c +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-capture.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-capture.c

drivers/media/platform/samsung/exynos4-is/fimc-core.c renamed from drivers/media/platform/exynos4-is/fimc-core.c +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-core.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-core.c

drivers/media/platform/samsung/exynos4-is/fimc-core.h renamed from drivers/media/platform/exynos4-is/fimc-core.h +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-core.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-core.h

drivers/media/platform/samsung/exynos4-is/fimc-is-command.h renamed from drivers/media/platform/exynos4-is/fimc-is-command.h +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-is-errno.c renamed from drivers/media/platform/exynos4-is/fimc-is-errno.c +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-is-errno.h renamed from drivers/media/platform/exynos4-is/fimc-is-errno.h +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.c renamed from drivers/media/platform/exynos4-is/fimc-is-i2c.c +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-is-i2c.h renamed from drivers/media/platform/exynos4-is/fimc-is-i2c.h +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-is-param.c renamed from drivers/media/platform/exynos4-is/fimc-is-param.c +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-is-param.h renamed from drivers/media/platform/exynos4-is/fimc-is-param.h +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-is-regs.c renamed from drivers/media/platform/exynos4-is/fimc-is-regs.c +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-is-regs.h renamed from drivers/media/platform/exynos4-is/fimc-is-regs.h +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.c renamed from drivers/media/platform/exynos4-is/fimc-is-sensor.c +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-is-sensor.h renamed from drivers/media/platform/exynos4-is/fimc-is-sensor.h +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-is.c renamed from drivers/media/platform/exynos4-is/fimc-is.c +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-is.c

drivers/media/platform/samsung/exynos4-is/fimc-is.h renamed from drivers/media/platform/exynos4-is/fimc-is.h +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-is.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-is.h

drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c renamed from drivers/media/platform/exynos4-is/fimc-isp-video.c +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-isp-video.h renamed from drivers/media/platform/exynos4-is/fimc-isp-video.h +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-isp.c renamed from drivers/media/platform/exynos4-is/fimc-isp.c +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-isp.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-isp.c

drivers/media/platform/samsung/exynos4-is/fimc-isp.h renamed from drivers/media/platform/exynos4-is/fimc-isp.h +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-isp.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-isp.h

drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.c renamed from drivers/media/platform/exynos4-is/fimc-lite-reg.c +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-lite-reg.h renamed from drivers/media/platform/exynos4-is/fimc-lite-reg.h +0 -0

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

drivers/media/platform/samsung/exynos4-is/fimc-lite.c renamed from drivers/media/platform/exynos4-is/fimc-lite.c +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-lite.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-lite.c

drivers/media/platform/samsung/exynos4-is/fimc-lite.h renamed from drivers/media/platform/exynos4-is/fimc-lite.h +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-lite.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-lite.h

drivers/media/platform/samsung/exynos4-is/fimc-m2m.c renamed from drivers/media/platform/exynos4-is/fimc-m2m.c +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-m2m.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-m2m.c

drivers/media/platform/samsung/exynos4-is/fimc-reg.c renamed from drivers/media/platform/exynos4-is/fimc-reg.c +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-reg.c
rename to drivers/media/platform/samsung/exynos4-is/fimc-reg.c

drivers/media/platform/samsung/exynos4-is/fimc-reg.h renamed from drivers/media/platform/exynos4-is/fimc-reg.h +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/fimc-reg.h
rename to drivers/media/platform/samsung/exynos4-is/fimc-reg.h

drivers/media/platform/samsung/exynos4-is/media-dev.c renamed from drivers/media/platform/exynos4-is/media-dev.c +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/media-dev.c
rename to drivers/media/platform/samsung/exynos4-is/media-dev.c

drivers/media/platform/samsung/exynos4-is/media-dev.h renamed from drivers/media/platform/exynos4-is/media-dev.h +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/media-dev.h
rename to drivers/media/platform/samsung/exynos4-is/media-dev.h

drivers/media/platform/samsung/exynos4-is/mipi-csis.c renamed from drivers/media/platform/exynos4-is/mipi-csis.c +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/mipi-csis.c
rename to drivers/media/platform/samsung/exynos4-is/mipi-csis.c

drivers/media/platform/samsung/exynos4-is/mipi-csis.h renamed from drivers/media/platform/exynos4-is/mipi-csis.h +0 -0

similarity index 100%
rename from drivers/media/platform/exynos4-is/mipi-csis.h
rename to drivers/media/platform/samsung/exynos4-is/mipi-csis.h

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #18 lore raw

PATCH 12/24 media: platform: rename exynos-gsc/ to samsung/exynos-gsc/

In reply to Mauro Carvalho Chehab

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 <[email protected]>

---

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/[email protected]/

 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%)

drivers/media/platform/Kconfig +1 -1

index 1bbada840723..81888d348149 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index 613ca6a3efa7..848cbd6147ae 100644
@@ -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/

drivers/media/platform/samsung/exynos-gsc/Kconfig renamed from drivers/media/platform/exynos-gsc/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/exynos-gsc/Kconfig
rename to drivers/media/platform/samsung/exynos-gsc/Kconfig

drivers/media/platform/samsung/exynos-gsc/Makefile renamed from drivers/media/platform/exynos-gsc/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/exynos-gsc/Makefile
rename to drivers/media/platform/samsung/exynos-gsc/Makefile

drivers/media/platform/samsung/exynos-gsc/gsc-core.c renamed from drivers/media/platform/exynos-gsc/gsc-core.c +0 -0

similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-core.c
rename to drivers/media/platform/samsung/exynos-gsc/gsc-core.c

drivers/media/platform/samsung/exynos-gsc/gsc-core.h renamed from drivers/media/platform/exynos-gsc/gsc-core.h +0 -0

similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-core.h
rename to drivers/media/platform/samsung/exynos-gsc/gsc-core.h

drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c renamed from drivers/media/platform/exynos-gsc/gsc-m2m.c +0 -0

similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-m2m.c
rename to drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c

drivers/media/platform/samsung/exynos-gsc/gsc-regs.c renamed from drivers/media/platform/exynos-gsc/gsc-regs.c +0 -0

similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-regs.c
rename to drivers/media/platform/samsung/exynos-gsc/gsc-regs.c

drivers/media/platform/samsung/exynos-gsc/gsc-regs.h renamed from drivers/media/platform/exynos-gsc/gsc-regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/exynos-gsc/gsc-regs.h
rename to drivers/media/platform/samsung/exynos-gsc/gsc-regs.h

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:52 UTC #19 lore raw

PATCH 13/24 media: platform: rename s3c-camif/ to samsung/s3c-camif/

In reply to Mauro Carvalho Chehab

As the end goal is to have platform drivers split by vendor, rename s3c-camif/ to samsung/s3c-camif/.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 MAINTAINERS                                                    | 2 +-
 drivers/media/platform/Kconfig                                 | 2 +-
 drivers/media/platform/Makefile                                | 2 +-
 drivers/media/platform/{ => samsung}/s3c-camif/Kconfig         | 0
 drivers/media/platform/{ => samsung}/s3c-camif/Makefile        | 0
 drivers/media/platform/{ => samsung}/s3c-camif/camif-capture.c | 0
 drivers/media/platform/{ => samsung}/s3c-camif/camif-core.c    | 0
 drivers/media/platform/{ => samsung}/s3c-camif/camif-core.h    | 0
 drivers/media/platform/{ => samsung}/s3c-camif/camif-regs.c    | 0
 drivers/media/platform/{ => samsung}/s3c-camif/camif-regs.h    | 0
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename drivers/media/platform/{ => samsung}/s3c-camif/Kconfig (100%)
 rename drivers/media/platform/{ => samsung}/s3c-camif/Makefile (100%)
 rename drivers/media/platform/{ => samsung}/s3c-camif/camif-capture.c (100%)
 rename drivers/media/platform/{ => samsung}/s3c-camif/camif-core.c (100%)
 rename drivers/media/platform/{ => samsung}/s3c-camif/camif-core.h (100%)
 rename drivers/media/platform/{ => samsung}/s3c-camif/camif-regs.c (100%)
 rename drivers/media/platform/{ => samsung}/s3c-camif/camif-regs.h (100%)

MAINTAINERS +1 -1

index b1418853d56f..8ce4894699cc 100644
@@ -17063,7 +17063,7 @@ M:	Sylwester Nawrocki <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Maintained
-F:	drivers/media/platform/s3c-camif/
+F:	drivers/media/platform/samsung/s3c-camif/
 F:	include/media/drv-intf/s3c_camif.h
 
 SAMSUNG S3FWRN5 NFC DRIVER

drivers/media/platform/Kconfig +1 -1

index 81888d348149..0a87d835b2f5 100644
@@ -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/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/samsung/s3c-camif/Kconfig"
 source "drivers/media/platform/sti/Kconfig"
 source "drivers/media/platform/stm32/Kconfig"
 source "drivers/media/platform/ti-vpe/Kconfig"

drivers/media/platform/Makefile +1 -1

index 848cbd6147ae..c3dfe40b2def 100644
@@ -30,12 +30,12 @@ obj-y += qcom/venus/
 obj-y += renesas/
 obj-y += rockchip/rga/
 obj-y += rockchip/rkisp1/
-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 += samsung/s3c-camif/
 obj-y += sti/bdisp/
 obj-y += sti/c8sectpfe/
 obj-y += sti/delta/

drivers/media/platform/samsung/s3c-camif/Kconfig renamed from drivers/media/platform/s3c-camif/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/s3c-camif/Kconfig
rename to drivers/media/platform/samsung/s3c-camif/Kconfig

drivers/media/platform/samsung/s3c-camif/Makefile renamed from drivers/media/platform/s3c-camif/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/s3c-camif/Makefile
rename to drivers/media/platform/samsung/s3c-camif/Makefile

drivers/media/platform/samsung/s3c-camif/camif-capture.c renamed from drivers/media/platform/s3c-camif/camif-capture.c +0 -0

similarity index 100%
rename from drivers/media/platform/s3c-camif/camif-capture.c
rename to drivers/media/platform/samsung/s3c-camif/camif-capture.c

drivers/media/platform/samsung/s3c-camif/camif-core.c renamed from drivers/media/platform/s3c-camif/camif-core.c +0 -0

similarity index 100%
rename from drivers/media/platform/s3c-camif/camif-core.c
rename to drivers/media/platform/samsung/s3c-camif/camif-core.c

drivers/media/platform/samsung/s3c-camif/camif-core.h renamed from drivers/media/platform/s3c-camif/camif-core.h +0 -0

similarity index 100%
rename from drivers/media/platform/s3c-camif/camif-core.h
rename to drivers/media/platform/samsung/s3c-camif/camif-core.h

drivers/media/platform/samsung/s3c-camif/camif-regs.c renamed from drivers/media/platform/s3c-camif/camif-regs.c +0 -0

similarity index 100%
rename from drivers/media/platform/s3c-camif/camif-regs.c
rename to drivers/media/platform/samsung/s3c-camif/camif-regs.c

drivers/media/platform/samsung/s3c-camif/camif-regs.h renamed from drivers/media/platform/s3c-camif/camif-regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/s3c-camif/camif-regs.h
rename to drivers/media/platform/samsung/s3c-camif/camif-regs.h

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #20 lore raw

PATCH 14/24 media: platform: rename s5p-g2d/ to samsung/s5p-g2d/

In reply to Mauro Carvalho Chehab

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 <[email protected]>

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index 8ce4894699cc..4c4be0d7ec14 100644
@@ -2616,7 +2616,7 @@ M:	Łukasz Stelmach <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 L:	[email protected]
 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 <[email protected]>

drivers/media/platform/Kconfig +1 -1

index 0a87d835b2f5..f70fc95e4195 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index c3dfe40b2def..a5a068e18492 100644
@@ -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/

drivers/media/platform/samsung/s5p-g2d/Kconfig renamed from drivers/media/platform/s5p-g2d/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/s5p-g2d/Kconfig
rename to drivers/media/platform/samsung/s5p-g2d/Kconfig

drivers/media/platform/samsung/s5p-g2d/Makefile renamed from drivers/media/platform/s5p-g2d/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/s5p-g2d/Makefile
rename to drivers/media/platform/samsung/s5p-g2d/Makefile

drivers/media/platform/samsung/s5p-g2d/g2d-hw.c renamed from drivers/media/platform/s5p-g2d/g2d-hw.c +0 -0

similarity index 100%
rename from drivers/media/platform/s5p-g2d/g2d-hw.c
rename to drivers/media/platform/samsung/s5p-g2d/g2d-hw.c

drivers/media/platform/samsung/s5p-g2d/g2d-regs.h renamed from drivers/media/platform/s5p-g2d/g2d-regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/s5p-g2d/g2d-regs.h
rename to drivers/media/platform/samsung/s5p-g2d/g2d-regs.h

drivers/media/platform/samsung/s5p-g2d/g2d.c renamed from drivers/media/platform/s5p-g2d/g2d.c +0 -0

similarity index 100%
rename from drivers/media/platform/s5p-g2d/g2d.c
rename to drivers/media/platform/samsung/s5p-g2d/g2d.c

drivers/media/platform/samsung/s5p-g2d/g2d.h renamed from drivers/media/platform/s5p-g2d/g2d.h +0 -0

similarity index 100%
rename from drivers/media/platform/s5p-g2d/g2d.h
rename to drivers/media/platform/samsung/s5p-g2d/g2d.h

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #21 lore raw

PATCH 15/24 media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/

In reply to Mauro Carvalho Chehab

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 <[email protected]>

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index 4c4be0d7ec14..dfd490369d48 100644
@@ -2633,7 +2633,7 @@ M:	Sylwester Nawrocki <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 L:	[email protected]
 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 <[email protected]>

drivers/media/platform/Kconfig +1 -1

index f70fc95e4195..0af01626c008 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index a5a068e18492..94bdd5d94bb2 100644
@@ -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/

drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +1 -1

index 3b892c5792b4..d1ec1f4b506b 100644
@@ -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
  */

drivers/media/platform/renesas/rcar_jpu.c +1 -1

index 56bb464629ed..293beba131e2 100644
@@ -4,7 +4,7 @@
  * Copyright (C) 2014-2015 Cogent Embedded, Inc.  <[email protected]>
  * 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.
  *

drivers/media/platform/samsung/s5p-jpeg/Kconfig renamed from drivers/media/platform/s5p-jpeg/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/s5p-jpeg/Kconfig
rename to drivers/media/platform/samsung/s5p-jpeg/Kconfig

drivers/media/platform/samsung/s5p-jpeg/Makefile renamed from drivers/media/platform/s5p-jpeg/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/s5p-jpeg/Makefile
rename to drivers/media/platform/samsung/s5p-jpeg/Makefile

drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c renamed from drivers/media/platform/s5p-jpeg/jpeg-core.c +1 -1

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
@@ -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

drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h renamed from drivers/media/platform/s5p-jpeg/jpeg-core.h +1 -1

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
@@ -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

drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c renamed from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c +0 -0

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

drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h renamed from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h +1 -1

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
@@ -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

drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c renamed from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c +0 -0

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

drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h renamed from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h +0 -0

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

drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c renamed from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c +1 -1

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
@@ -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

drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h renamed from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h +1 -1

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
@@ -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

drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h renamed from drivers/media/platform/s5p-jpeg/jpeg-regs.h +1 -1

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
@@ -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
  *

Signature · 1 line

2.35.1

Andrzej Pietrasiewicz

maintainer Acked-by on v1 15/24

2022-03-14 08:54 UTC #22 lore raw

Re: [PATCH 15/24] media: platform: rename s5p-jpeg/ to samsung/s5p-jpeg/

Hi Mauro,

Thanks,

W dniu 13.03.2022 o 11:51, Mauro Carvalho Chehab pisze:

Quoted 4 lines

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 <[email protected]>

Acked-by Andrzej Pietrasiewicz <[email protected]>

Quoted 213 lines

---

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/[email protected]/

  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%)

MAINTAINERS +1 -1

index 4c4be0d7ec14..dfd490369d48 100644
@@ -2633,7 +2633,7 @@ M:	Sylwester Nawrocki <[email protected]>
  L:	[email protected] (moderated for non-subscribers)
  L:	[email protected]
  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 <[email protected]>

drivers/media/platform/Kconfig +1 -1

index f70fc95e4195..0af01626c008 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index a5a068e18492..94bdd5d94bb2 100644
@@ -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/

drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +1 -1

index 3b892c5792b4..d1ec1f4b506b 100644
@@ -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
   */

drivers/media/platform/renesas/rcar_jpu.c +1 -1

index 56bb464629ed..293beba131e2 100644
@@ -4,7 +4,7 @@
   * Copyright (C) 2014-2015 Cogent Embedded, Inc.  <[email protected]>
   * 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.
   *

drivers/media/platform/samsung/s5p-jpeg/Kconfig renamed from drivers/media/platform/s5p-jpeg/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/s5p-jpeg/Kconfig
rename to drivers/media/platform/samsung/s5p-jpeg/Kconfig

drivers/media/platform/samsung/s5p-jpeg/Makefile renamed from drivers/media/platform/s5p-jpeg/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/s5p-jpeg/Makefile
rename to drivers/media/platform/samsung/s5p-jpeg/Makefile

drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c renamed from drivers/media/platform/s5p-jpeg/jpeg-core.c +1 -1

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
@@ -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

drivers/media/platform/samsung/s5p-jpeg/jpeg-core.h renamed from drivers/media/platform/s5p-jpeg/jpeg-core.h +1 -1

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
@@ -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

drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.c renamed from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.c +0 -0

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

drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos3250.h renamed from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos3250.h +1 -1

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
@@ -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

drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.c renamed from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c +0 -0

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

drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-exynos4.h renamed from drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h +0 -0

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

drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.c renamed from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c +1 -1

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
@@ -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

drivers/media/platform/samsung/s5p-jpeg/jpeg-hw-s5p.h renamed from drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h +1 -1

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
@@ -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

drivers/media/platform/samsung/s5p-jpeg/jpeg-regs.h renamed from drivers/media/platform/s5p-jpeg/jpeg-regs.h +1 -1

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
@@ -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
   *

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #23 lore raw

PATCH 16/24 media: platform: rename s5p-mfc/ to samsung/s5p-mfc/

In reply to Mauro Carvalho Chehab

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 <[email protected]>

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index dfd490369d48..7711a5ea125e 100644
@@ -2641,7 +2641,7 @@ M:	Andrzej Hajda <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 L:	[email protected]
 S:	Maintained
-F:	drivers/media/platform/s5p-mfc/
+F:	drivers/media/platform/samsung/s5p-mfc/
 
 ARM/SHMOBILE ARM ARCHITECTURE
 M:	Geert Uytterhoeven <[email protected]>

drivers/media/platform/Kconfig +1 -1

index 0af01626c008..c3594807f8d7 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index 94bdd5d94bb2..6a766acfbe37 100644
@@ -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/

drivers/media/platform/samsung/s5p-mfc/Kconfig renamed from drivers/media/platform/s5p-mfc/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/s5p-mfc/Kconfig
rename to drivers/media/platform/samsung/s5p-mfc/Kconfig

drivers/media/platform/samsung/s5p-mfc/Makefile renamed from drivers/media/platform/s5p-mfc/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/s5p-mfc/Makefile
rename to drivers/media/platform/samsung/s5p-mfc/Makefile

drivers/media/platform/samsung/s5p-mfc/regs-mfc-v10.h renamed from drivers/media/platform/s5p-mfc/regs-mfc-v10.h +0 -0

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

drivers/media/platform/samsung/s5p-mfc/regs-mfc-v6.h renamed from drivers/media/platform/s5p-mfc/regs-mfc-v6.h +0 -0

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

drivers/media/platform/samsung/s5p-mfc/regs-mfc-v7.h renamed from drivers/media/platform/s5p-mfc/regs-mfc-v7.h +0 -0

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

drivers/media/platform/samsung/s5p-mfc/regs-mfc-v8.h renamed from drivers/media/platform/s5p-mfc/regs-mfc-v8.h +0 -0

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

drivers/media/platform/samsung/s5p-mfc/regs-mfc.h renamed from drivers/media/platform/s5p-mfc/regs-mfc.h +0 -0

similarity index 100%
rename from drivers/media/platform/s5p-mfc/regs-mfc.h
rename to drivers/media/platform/samsung/s5p-mfc/regs-mfc.h

drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c renamed from drivers/media/platform/s5p-mfc/s5p_mfc.c +0 -0

similarity index 100%
rename from drivers/media/platform/s5p-mfc/s5p_mfc.c
rename to drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.c renamed from drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c +1 -1

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
@@ -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/

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd.h renamed from drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h +1 -1

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
@@ -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/

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.c renamed from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c +1 -1

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
@@ -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/

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v5.h renamed from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h +1 -1

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
@@ -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/

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.c renamed from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c +1 -1

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
@@ -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/

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_cmd_v6.h renamed from drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h +1 -1

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
@@ -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/

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_common.h renamed from drivers/media/platform/s5p-mfc/s5p_mfc_common.h +0 -0

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

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.c renamed from drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +1 -1

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
@@ -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/

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_ctrl.h renamed from drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h +1 -1

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
@@ -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/

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_debug.h renamed from drivers/media/platform/s5p-mfc/s5p_mfc_debug.h +1 -1

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
@@ -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

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c renamed from drivers/media/platform/s5p-mfc/s5p_mfc_dec.c +1 -1

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
@@ -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/

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.h renamed from drivers/media/platform/s5p-mfc/s5p_mfc_dec.h +1 -1

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
@@ -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/

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c renamed from drivers/media/platform/s5p-mfc/s5p_mfc_enc.c +1 -1

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
@@ -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/

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.h renamed from drivers/media/platform/s5p-mfc/s5p_mfc_enc.h +1 -1

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
@@ -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/

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.c renamed from drivers/media/platform/s5p-mfc/s5p_mfc_intr.c +0 -0

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

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_intr.h renamed from drivers/media/platform/s5p-mfc/s5p_mfc_intr.h +0 -0

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

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_iommu.h renamed from drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h +0 -0

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

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.c renamed from drivers/media/platform/s5p-mfc/s5p_mfc_opr.c +1 -1

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
@@ -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.

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr.h renamed from drivers/media/platform/s5p-mfc/s5p_mfc_opr.h +1 -1

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
@@ -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.

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.c renamed from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c +0 -0

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

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v5.h renamed from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h +0 -0

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

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.c renamed from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c +1 -1

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
@@ -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.

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_opr_v6.h renamed from drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h +1 -1

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
@@ -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.

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.c renamed from drivers/media/platform/s5p-mfc/s5p_mfc_pm.c +1 -1

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
@@ -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/

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_pm.h renamed from drivers/media/platform/s5p-mfc/s5p_mfc_pm.h +1 -1

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
@@ -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/

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #24 lore raw

PATCH 17/24 media: platform: rename stm32/ to sti/stm32/

In reply to Mauro Carvalho Chehab

As the end goal is to have platform drivers split by vendor, rename stm32/ to sti/stm32/.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index 7711a5ea125e..620705e0f043 100644
@@ -12046,7 +12046,7 @@ L:	[email protected]
 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 <[email protected]>

drivers/media/platform/Kconfig +1 -1

index c3594807f8d7..cf373bfbca1b 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index 6a766acfbe37..e3dd2331003a 100644
@@ -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/

drivers/media/platform/sti/stm32/Kconfig renamed from drivers/media/platform/stm32/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/Kconfig
rename to drivers/media/platform/sti/stm32/Kconfig

drivers/media/platform/sti/stm32/Makefile renamed from drivers/media/platform/stm32/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/Makefile
rename to drivers/media/platform/sti/stm32/Makefile

drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c renamed from drivers/media/platform/stm32/dma2d/dma2d-hw.c +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c
rename to drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c

drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h renamed from drivers/media/platform/stm32/dma2d/dma2d-regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h
rename to drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h

drivers/media/platform/sti/stm32/dma2d/dma2d.c renamed from drivers/media/platform/stm32/dma2d/dma2d.c +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d.c
rename to drivers/media/platform/sti/stm32/dma2d/dma2d.c

drivers/media/platform/sti/stm32/dma2d/dma2d.h renamed from drivers/media/platform/stm32/dma2d/dma2d.h +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d.h
rename to drivers/media/platform/sti/stm32/dma2d/dma2d.h

drivers/media/platform/sti/stm32/stm32-dcmi.c renamed from drivers/media/platform/stm32/stm32-dcmi.c +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/stm32-dcmi.c
rename to drivers/media/platform/sti/stm32/stm32-dcmi.c

Signature · 1 line

2.35.1

Alain Volmat

2022-03-14 08:41 UTC #25 lore raw

Re: [PATCH 17/24] media: platform: rename stm32/ to sti/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

Quoted 98 lines · Mauro Carvalho Chehab

As the end goal is to have platform drivers split by vendor, rename stm32/ to sti/stm32/.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index 7711a5ea125e..620705e0f043 100644
@@ -12046,7 +12046,7 @@ L:	[email protected]
 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 <[email protected]>

drivers/media/platform/Kconfig +1 -1

index c3594807f8d7..cf373bfbca1b 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index 6a766acfbe37..e3dd2331003a 100644
@@ -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/

drivers/media/platform/sti/stm32/Kconfig renamed from drivers/media/platform/stm32/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/Kconfig
rename to drivers/media/platform/sti/stm32/Kconfig

drivers/media/platform/sti/stm32/Makefile renamed from drivers/media/platform/stm32/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/Makefile
rename to drivers/media/platform/sti/stm32/Makefile

drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c renamed from drivers/media/platform/stm32/dma2d/dma2d-hw.c +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c
rename to drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c

drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h renamed from drivers/media/platform/stm32/dma2d/dma2d-regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h
rename to drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h

drivers/media/platform/sti/stm32/dma2d/dma2d.c renamed from drivers/media/platform/stm32/dma2d/dma2d.c +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d.c
rename to drivers/media/platform/sti/stm32/dma2d/dma2d.c

drivers/media/platform/sti/stm32/dma2d/dma2d.h renamed from drivers/media/platform/stm32/dma2d/dma2d.h +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d.h
rename to drivers/media/platform/sti/stm32/dma2d/dma2d.h

drivers/media/platform/sti/stm32/stm32-dcmi.c renamed from drivers/media/platform/stm32/stm32-dcmi.c +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/stm32-dcmi.c
rename to drivers/media/platform/sti/stm32/stm32-dcmi.c

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-14 11:15 UTC #26 lore raw

Re: [PATCH 17/24] media: platform: rename stm32/ to sti/stm32/

Hi Alain,

Em Mon, 14 Mar 2022 09:39:42 +0100
Alain Volmat <[email protected]> escreveu:

Quoted 8 lines

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.

Quoted 94 lines

Alain

Quoted 90 lines · Mauro Carvalho Chehab

As the end goal is to have platform drivers split by vendor, rename stm32/ to sti/stm32/.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 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%)

MAINTAINERS +1 -1

index 7711a5ea125e..620705e0f043 100644
@@ -12046,7 +12046,7 @@ L:	[email protected]
 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 <[email protected]>

drivers/media/platform/Kconfig +1 -1

index c3594807f8d7..cf373bfbca1b 100644
@@ -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"

drivers/media/platform/Makefile +1 -1

index 6a766acfbe37..e3dd2331003a 100644
@@ -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/

drivers/media/platform/sti/stm32/Kconfig renamed from drivers/media/platform/stm32/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/Kconfig
rename to drivers/media/platform/sti/stm32/Kconfig

drivers/media/platform/sti/stm32/Makefile renamed from drivers/media/platform/stm32/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/Makefile
rename to drivers/media/platform/sti/stm32/Makefile

drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c renamed from drivers/media/platform/stm32/dma2d/dma2d-hw.c +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c
rename to drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c

drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h renamed from drivers/media/platform/stm32/dma2d/dma2d-regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h
rename to drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h

drivers/media/platform/sti/stm32/dma2d/dma2d.c renamed from drivers/media/platform/stm32/dma2d/dma2d.c +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d.c
rename to drivers/media/platform/sti/stm32/dma2d/dma2d.c

drivers/media/platform/sti/stm32/dma2d/dma2d.h renamed from drivers/media/platform/stm32/dma2d/dma2d.h +0 -0

similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d.h

Quoted 8 lines

Quoted 8 lines
rename to drivers/media/platform/sti/stm32/dma2d/dma2d.h
drivers/media/platform/sti/stm32/stm32-dcmi.c renamed from drivers/media/platform/stm32/stm32-dcmi.c +0 -0
similarity index 100%
rename from drivers/media/platform/stm32/stm32-dcmi.c
rename to drivers/media/platform/sti/stm32/stm32-dcmi.c
Signature · 1 line
2.35.1

Thanks,
Mauro

Hugues FRUCHET - FOSS

2022-03-14 11:36 UTC #27 lore raw

Re: [PATCH 17/24] media: platform: rename stm32/ to sti/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.

Quoted 131 lines · Mauro Carvalho Chehab

Hi Alain,
Em Mon, 14 Mar 2022 09:39:42 +0100
Alain Volmat <[email protected]> escreveu:
Quoted 8 lines
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.
Quoted 94 lines
Alain
Quoted 90 lines · Mauro Carvalho Chehab
As the end goal is to have platform drivers split by vendor, rename stm32/ to sti/stm32/.
Signed-off-by Mauro Carvalho Chehab <[email protected]>
---
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/[email protected]/
  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%)
MAINTAINERS +1 -1
index 7711a5ea125e..620705e0f043 100644
@@ -12046,7 +12046,7 @@ L:	[email protected]
  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 <[email protected]>
drivers/media/platform/Kconfig +1 -1
index c3594807f8d7..cf373bfbca1b 100644
@@ -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"
drivers/media/platform/Makefile +1 -1
index 6a766acfbe37..e3dd2331003a 100644
@@ -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/
drivers/media/platform/sti/stm32/Kconfig renamed from drivers/media/platform/stm32/Kconfig +0 -0
similarity index 100%
rename from drivers/media/platform/stm32/Kconfig
rename to drivers/media/platform/sti/stm32/Kconfig
drivers/media/platform/sti/stm32/Makefile renamed from drivers/media/platform/stm32/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/stm32/Makefile
rename to drivers/media/platform/sti/stm32/Makefile
drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c renamed from drivers/media/platform/stm32/dma2d/dma2d-hw.c +0 -0
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d-hw.c
rename to drivers/media/platform/sti/stm32/dma2d/dma2d-hw.c
drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h renamed from drivers/media/platform/stm32/dma2d/dma2d-regs.h +0 -0
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d-regs.h
rename to drivers/media/platform/sti/stm32/dma2d/dma2d-regs.h
drivers/media/platform/sti/stm32/dma2d/dma2d.c renamed from drivers/media/platform/stm32/dma2d/dma2d.c +0 -0
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d.c
rename to drivers/media/platform/sti/stm32/dma2d/dma2d.c
drivers/media/platform/sti/stm32/dma2d/dma2d.h renamed from drivers/media/platform/stm32/dma2d/dma2d.h +0 -0
similarity index 100%
rename from drivers/media/platform/stm32/dma2d/dma2d.h
Quoted 8 lines
Quoted 8 lines
rename to drivers/media/platform/sti/stm32/dma2d/dma2d.h
drivers/media/platform/sti/stm32/stm32-dcmi.c renamed from drivers/media/platform/stm32/stm32-dcmi.c +0 -0
similarity index 100%
rename from drivers/media/platform/stm32/stm32-dcmi.c
rename to drivers/media/platform/sti/stm32/stm32-dcmi.c
Signature · 1 line
2.35.1
Thanks,
Mauro

Mauro Carvalho Chehab

author maintainer

2022-03-14 13:10 UTC #28 lore raw

Re: [PATCH 17/24] media: platform: rename stm32/ to sti/stm32/

Em Mon, 14 Mar 2022 12:34:47 +0100
Hugues FRUCHET - FOSS <[email protected]> escreveu:

Quoted 14 lines

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/

Quoted 7 lines

./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

Hugues FRUCHET - FOSS

2022-03-15 09:04 UTC #29 lore raw

Re: [PATCH 17/24] media: platform: rename stm32/ to sti/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 <[email protected]>
M:    Alexandre Torgue <[email protected]>
L:    [email protected] (moderated for non-subscribers)
L:    [email protected] (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 <[email protected]>
L:    [email protected] (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":

Quoted 2 lines

	./drivers/media/platform/st/sti/
	./drivers/media/platform/st/stm32/

But one more time, our flavour is to stick to:

Quoted 2 lines

	./drivers/media/platform/sti/
	./drivers/media/platform/stm32/

Best regards,
Hugues.

Quoted 43 lines · Mauro Carvalho Chehab

Em Mon, 14 Mar 2022 12:34:47 +0100
Hugues FRUCHET - FOSS <[email protected]> escreveu:
Quoted 14 lines
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/
Quoted 7 lines
./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

Mauro Carvalho Chehab

author maintainer

2022-03-16 13:29 UTC #30 lore raw

Re: [PATCH 17/24] media: platform: rename stm32/ to sti/stm32/

Em Tue, 15 Mar 2022 10:02:53 +0100
Hugues FRUCHET - FOSS <[email protected]> escreveu:

Quoted 43 lines

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 <[email protected]>
M:    Alexandre Torgue <[email protected]>
L:    [email protected] (moderated for 
non-subscribers)
L:    [email protected] (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 <[email protected]>
L:    [email protected] (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

Quoted 8 lines

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.

Quoted 4 lines

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":
Quoted 2 lines
	./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

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #31 lore raw

PATCH 18/24 media: platform: rename am437x/ to ti/am437x/

In reply to Mauro Carvalho Chehab

As the end goal is to have platform drivers split by vendor, rename am437x/ to ti/am437x/.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 MAINTAINERS                                               | 2 +-
 drivers/media/platform/Kconfig                            | 2 +-
 drivers/media/platform/Makefile                           | 2 +-
 drivers/media/platform/{ => ti}/am437x/Kconfig            | 0
 drivers/media/platform/{ => ti}/am437x/Makefile           | 0
 drivers/media/platform/{ => ti}/am437x/am437x-vpfe.c      | 0
 drivers/media/platform/{ => ti}/am437x/am437x-vpfe.h      | 0
 drivers/media/platform/{ => ti}/am437x/am437x-vpfe_regs.h | 0
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename drivers/media/platform/{ => ti}/am437x/Kconfig (100%)
 rename drivers/media/platform/{ => ti}/am437x/Makefile (100%)
 rename drivers/media/platform/{ => ti}/am437x/am437x-vpfe.c (100%)
 rename drivers/media/platform/{ => ti}/am437x/am437x-vpfe.h (100%)
 rename drivers/media/platform/{ => ti}/am437x/am437x-vpfe_regs.h (100%)

MAINTAINERS +1 -1

index 620705e0f043..a8599cb4091e 100644
@@ -19262,7 +19262,7 @@ S:	Maintained
 W:	https://linuxtv.org
 Q:	http://patchwork.linuxtv.org/project/linux-media/list/
 T:	git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
-F:	drivers/media/platform/am437x/
+F:	drivers/media/platform/ti/am437x/
 
 TI BANDGAP AND THERMAL DRIVER
 M:	Eduardo Valentin <[email protected]>

drivers/media/platform/Kconfig +1 -1

index cf373bfbca1b..b3dde9c3cfc4 100644
@@ -67,7 +67,6 @@ config VIDEO_MUX
 
 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/aspeed/Kconfig"
 source "drivers/media/platform/atmel/Kconfig"

@@ -97,6 +96,7 @@ source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
 source "drivers/media/platform/sti/Kconfig"
 source "drivers/media/platform/sti/stm32/Kconfig"
 source "drivers/media/platform/ti-vpe/Kconfig"
+source "drivers/media/platform/ti/am437x/Kconfig"
 source "drivers/media/platform/via/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"

drivers/media/platform/Makefile +1 -1

index e3dd2331003a..a34278911145 100644
@@ -7,7 +7,6 @@
 # (e. g. LC_ALL=C sort Makefile)
 obj-y += allegro-dvt/
 obj-y += allwinner/
-obj-y += am437x/
 obj-y += amlogic/meson-ge2d/
 obj-y += aspeed/
 obj-y += atmel/

@@ -42,6 +41,7 @@ obj-y += sti/delta/
 obj-y += sti/hva/
 obj-y += sti/stm32/
 obj-y += ti-vpe/
+obj-y += ti/am437x/
 obj-y += via/
 obj-y += xilinx/

drivers/media/platform/ti/am437x/Kconfig renamed from drivers/media/platform/am437x/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/am437x/Kconfig
rename to drivers/media/platform/ti/am437x/Kconfig

drivers/media/platform/ti/am437x/Makefile renamed from drivers/media/platform/am437x/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/am437x/Makefile
rename to drivers/media/platform/ti/am437x/Makefile

drivers/media/platform/ti/am437x/am437x-vpfe.c renamed from drivers/media/platform/am437x/am437x-vpfe.c +0 -0

similarity index 100%
rename from drivers/media/platform/am437x/am437x-vpfe.c
rename to drivers/media/platform/ti/am437x/am437x-vpfe.c

drivers/media/platform/ti/am437x/am437x-vpfe.h renamed from drivers/media/platform/am437x/am437x-vpfe.h +0 -0

similarity index 100%
rename from drivers/media/platform/am437x/am437x-vpfe.h
rename to drivers/media/platform/ti/am437x/am437x-vpfe.h

drivers/media/platform/ti/am437x/am437x-vpfe_regs.h renamed from drivers/media/platform/am437x/am437x-vpfe_regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/am437x/am437x-vpfe_regs.h
rename to drivers/media/platform/ti/am437x/am437x-vpfe_regs.h

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #32 lore raw

PATCH 19/24 media: platform: rename davinci/ to ti/davinci/

In reply to Mauro Carvalho Chehab

As the end goal is to have platform drivers split by vendor, rename davinci/ to ti/davinci/.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 .../media/drivers/davinci-vpbe-devel.rst      | 20 +++++++++----------
 MAINTAINERS                                   |  2 +-
 drivers/media/platform/Kconfig                |  2 +-
 drivers/media/platform/Makefile               |  2 +-
 .../media/platform/{ => ti}/davinci/Kconfig   |  0
 .../media/platform/{ => ti}/davinci/Makefile  |  0
 .../{ => ti}/davinci/ccdc_hw_device.h         |  0
 .../platform/{ => ti}/davinci/dm355_ccdc.c    |  0
 .../{ => ti}/davinci/dm355_ccdc_regs.h        |  0
 .../platform/{ => ti}/davinci/dm644x_ccdc.c   |  0
 .../{ => ti}/davinci/dm644x_ccdc_regs.h       |  0
 .../media/platform/{ => ti}/davinci/isif.c    |  0
 .../platform/{ => ti}/davinci/isif_regs.h     |  0
 .../media/platform/{ => ti}/davinci/vpbe.c    |  0
 .../platform/{ => ti}/davinci/vpbe_display.c  |  0
 .../platform/{ => ti}/davinci/vpbe_osd.c      |  0
 .../platform/{ => ti}/davinci/vpbe_osd_regs.h |  0
 .../platform/{ => ti}/davinci/vpbe_venc.c     |  0
 .../{ => ti}/davinci/vpbe_venc_regs.h         |  0
 .../platform/{ => ti}/davinci/vpfe_capture.c  |  0
 .../media/platform/{ => ti}/davinci/vpif.c    |  0
 .../media/platform/{ => ti}/davinci/vpif.h    |  0
 .../platform/{ => ti}/davinci/vpif_capture.c  |  0
 .../platform/{ => ti}/davinci/vpif_capture.h  |  0
 .../platform/{ => ti}/davinci/vpif_display.c  |  0
 .../platform/{ => ti}/davinci/vpif_display.h  |  0
 .../media/platform/{ => ti}/davinci/vpss.c    |  0
 27 files changed, 13 insertions(+), 13 deletions(-)
 rename drivers/media/platform/{ => ti}/davinci/Kconfig (100%)
 rename drivers/media/platform/{ => ti}/davinci/Makefile (100%)
 rename drivers/media/platform/{ => ti}/davinci/ccdc_hw_device.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/dm355_ccdc.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/dm355_ccdc_regs.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/dm644x_ccdc.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/dm644x_ccdc_regs.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/isif.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/isif_regs.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpbe.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpbe_display.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpbe_osd.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpbe_osd_regs.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpbe_venc.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpbe_venc_regs.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpfe_capture.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpif.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpif.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpif_capture.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpif_capture.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpif_display.c (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpif_display.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/vpss.c (100%)

Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst +10 ~~-10~~

index f0961672e6a3..4e87bdbc7ae4 100644
@@ -7,22 +7,22 @@ File partitioning
 -----------------
 
  V4L2 display device driver
-         drivers/media/platform/davinci/vpbe_display.c
-         drivers/media/platform/davinci/vpbe_display.h
+         drivers/media/platform/ti/davinci/vpbe_display.c
+         drivers/media/platform/ti/davinci/vpbe_display.h
 
  VPBE display controller
-         drivers/media/platform/davinci/vpbe.c
-         drivers/media/platform/davinci/vpbe.h
+         drivers/media/platform/ti/davinci/vpbe.c
+         drivers/media/platform/ti/davinci/vpbe.h
 
  VPBE venc sub device driver
-         drivers/media/platform/davinci/vpbe_venc.c
-         drivers/media/platform/davinci/vpbe_venc.h
-         drivers/media/platform/davinci/vpbe_venc_regs.h
+         drivers/media/platform/ti/davinci/vpbe_venc.c
+         drivers/media/platform/ti/davinci/vpbe_venc.h
+         drivers/media/platform/ti/davinci/vpbe_venc_regs.h
 
  VPBE osd driver
-         drivers/media/platform/davinci/vpbe_osd.c
-         drivers/media/platform/davinci/vpbe_osd.h
-         drivers/media/platform/davinci/vpbe_osd_regs.h
+         drivers/media/platform/ti/davinci/vpbe_osd.c
+         drivers/media/platform/ti/davinci/vpbe_osd.h
+         drivers/media/platform/ti/davinci/vpbe_osd_regs.h
 
 To be done
 ----------

MAINTAINERS +1 -1

index a8599cb4091e..801391246c87 100644
@@ -19321,7 +19321,7 @@ S:	Maintained
 W:	https://linuxtv.org
 Q:	http://patchwork.linuxtv.org/project/linux-media/list/
 T:	git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
-F:	drivers/media/platform/davinci/
+F:	drivers/media/platform/ti/davinci/
 F:	include/media/davinci/
 
 TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER

drivers/media/platform/Kconfig +1 -1

index b3dde9c3cfc4..4d4d8e120731 100644
@@ -72,7 +72,6 @@ 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/davinci/Kconfig"
 source "drivers/media/platform/intel/Kconfig"
 source "drivers/media/platform/marvell/Kconfig"
 source "drivers/media/platform/mediatek/mtk-jpeg/Kconfig"

@@ -97,6 +96,7 @@ source "drivers/media/platform/sti/Kconfig"
 source "drivers/media/platform/sti/stm32/Kconfig"
 source "drivers/media/platform/ti-vpe/Kconfig"
 source "drivers/media/platform/ti/am437x/Kconfig"
+source "drivers/media/platform/ti/davinci/Kconfig"
 source "drivers/media/platform/via/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"

drivers/media/platform/Makefile +1 -1

index a34278911145..4e063935f061 100644
@@ -12,7 +12,6 @@ obj-y += aspeed/
 obj-y += atmel/
 obj-y += cadence/
 obj-y += chips-media/
-obj-y += davinci/
 obj-y += intel/
 obj-y += marvell/
 obj-y += mediatek/mtk-jpeg/

@@ -42,6 +41,7 @@ obj-y += sti/hva/
 obj-y += sti/stm32/
 obj-y += ti-vpe/
 obj-y += ti/am437x/
+obj-y += ti/davinci/
 obj-y += via/
 obj-y += xilinx/

drivers/media/platform/ti/davinci/Kconfig renamed from drivers/media/platform/davinci/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/Kconfig
rename to drivers/media/platform/ti/davinci/Kconfig

drivers/media/platform/ti/davinci/Makefile renamed from drivers/media/platform/davinci/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/Makefile
rename to drivers/media/platform/ti/davinci/Makefile

drivers/media/platform/ti/davinci/ccdc_hw_device.h renamed from drivers/media/platform/davinci/ccdc_hw_device.h +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/ccdc_hw_device.h
rename to drivers/media/platform/ti/davinci/ccdc_hw_device.h

drivers/media/platform/ti/davinci/dm355_ccdc.c renamed from drivers/media/platform/davinci/dm355_ccdc.c +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/dm355_ccdc.c
rename to drivers/media/platform/ti/davinci/dm355_ccdc.c

drivers/media/platform/ti/davinci/dm355_ccdc_regs.h renamed from drivers/media/platform/davinci/dm355_ccdc_regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/dm355_ccdc_regs.h
rename to drivers/media/platform/ti/davinci/dm355_ccdc_regs.h

drivers/media/platform/ti/davinci/dm644x_ccdc.c renamed from drivers/media/platform/davinci/dm644x_ccdc.c +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/dm644x_ccdc.c
rename to drivers/media/platform/ti/davinci/dm644x_ccdc.c

drivers/media/platform/ti/davinci/dm644x_ccdc_regs.h renamed from drivers/media/platform/davinci/dm644x_ccdc_regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/dm644x_ccdc_regs.h
rename to drivers/media/platform/ti/davinci/dm644x_ccdc_regs.h

drivers/media/platform/ti/davinci/isif.c renamed from drivers/media/platform/davinci/isif.c +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/isif.c
rename to drivers/media/platform/ti/davinci/isif.c

drivers/media/platform/ti/davinci/isif_regs.h renamed from drivers/media/platform/davinci/isif_regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/isif_regs.h
rename to drivers/media/platform/ti/davinci/isif_regs.h

drivers/media/platform/ti/davinci/vpbe.c renamed from drivers/media/platform/davinci/vpbe.c +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/vpbe.c
rename to drivers/media/platform/ti/davinci/vpbe.c

drivers/media/platform/ti/davinci/vpbe_display.c renamed from drivers/media/platform/davinci/vpbe_display.c +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/vpbe_display.c
rename to drivers/media/platform/ti/davinci/vpbe_display.c

drivers/media/platform/ti/davinci/vpbe_osd.c renamed from drivers/media/platform/davinci/vpbe_osd.c +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/vpbe_osd.c
rename to drivers/media/platform/ti/davinci/vpbe_osd.c

drivers/media/platform/ti/davinci/vpbe_osd_regs.h renamed from drivers/media/platform/davinci/vpbe_osd_regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/vpbe_osd_regs.h
rename to drivers/media/platform/ti/davinci/vpbe_osd_regs.h

drivers/media/platform/ti/davinci/vpbe_venc.c renamed from drivers/media/platform/davinci/vpbe_venc.c +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/vpbe_venc.c
rename to drivers/media/platform/ti/davinci/vpbe_venc.c

drivers/media/platform/ti/davinci/vpbe_venc_regs.h renamed from drivers/media/platform/davinci/vpbe_venc_regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/vpbe_venc_regs.h
rename to drivers/media/platform/ti/davinci/vpbe_venc_regs.h

drivers/media/platform/ti/davinci/vpfe_capture.c renamed from drivers/media/platform/davinci/vpfe_capture.c +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/vpfe_capture.c
rename to drivers/media/platform/ti/davinci/vpfe_capture.c

drivers/media/platform/ti/davinci/vpif.c renamed from drivers/media/platform/davinci/vpif.c +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/vpif.c
rename to drivers/media/platform/ti/davinci/vpif.c

drivers/media/platform/ti/davinci/vpif.h renamed from drivers/media/platform/davinci/vpif.h +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/vpif.h
rename to drivers/media/platform/ti/davinci/vpif.h

drivers/media/platform/ti/davinci/vpif_capture.c renamed from drivers/media/platform/davinci/vpif_capture.c +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/vpif_capture.c
rename to drivers/media/platform/ti/davinci/vpif_capture.c

drivers/media/platform/ti/davinci/vpif_capture.h renamed from drivers/media/platform/davinci/vpif_capture.h +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/vpif_capture.h
rename to drivers/media/platform/ti/davinci/vpif_capture.h

drivers/media/platform/ti/davinci/vpif_display.c renamed from drivers/media/platform/davinci/vpif_display.c +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/vpif_display.c
rename to drivers/media/platform/ti/davinci/vpif_display.c

drivers/media/platform/ti/davinci/vpif_display.h renamed from drivers/media/platform/davinci/vpif_display.h +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/vpif_display.h
rename to drivers/media/platform/ti/davinci/vpif_display.h

drivers/media/platform/ti/davinci/vpss.c renamed from drivers/media/platform/davinci/vpss.c +0 -0

similarity index 100%
rename from drivers/media/platform/davinci/vpss.c
rename to drivers/media/platform/ti/davinci/vpss.c

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #33 lore raw

PATCH 20/24 media: platform: rename omap3isp/ to ti/omap3isp/

In reply to Mauro Carvalho Chehab

As the end goal is to have platform drivers split by vendor, rename omap3isp/ to ti/omap3isp/.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 Documentation/admin-guide/media/omap3isp.rst                  | 2 +-
 Documentation/admin-guide/media/omap4_camera.rst              | 2 +-
 Documentation/driver-api/media/v4l2-event.rst                 | 2 +-
 MAINTAINERS                                                   | 2 +-
 drivers/media/platform/Kconfig                                | 2 +-
 drivers/media/platform/Makefile                               | 2 +-
 drivers/media/platform/{ => ti}/omap3isp/Kconfig              | 0
 drivers/media/platform/{ => ti}/omap3isp/Makefile             | 0
 drivers/media/platform/{ => ti}/omap3isp/cfa_coef_table.h     | 0
 drivers/media/platform/{ => ti}/omap3isp/gamma_table.h        | 0
 drivers/media/platform/{ => ti}/omap3isp/isp.c                | 0
 drivers/media/platform/{ => ti}/omap3isp/isp.h                | 0
 drivers/media/platform/{ => ti}/omap3isp/ispccdc.c            | 0
 drivers/media/platform/{ => ti}/omap3isp/ispccdc.h            | 0
 drivers/media/platform/{ => ti}/omap3isp/ispccp2.c            | 0
 drivers/media/platform/{ => ti}/omap3isp/ispccp2.h            | 0
 drivers/media/platform/{ => ti}/omap3isp/ispcsi2.c            | 0
 drivers/media/platform/{ => ti}/omap3isp/ispcsi2.h            | 0
 drivers/media/platform/{ => ti}/omap3isp/ispcsiphy.c          | 0
 drivers/media/platform/{ => ti}/omap3isp/ispcsiphy.h          | 0
 drivers/media/platform/{ => ti}/omap3isp/isph3a.h             | 0
 drivers/media/platform/{ => ti}/omap3isp/isph3a_aewb.c        | 0
 drivers/media/platform/{ => ti}/omap3isp/isph3a_af.c          | 0
 drivers/media/platform/{ => ti}/omap3isp/isphist.c            | 0
 drivers/media/platform/{ => ti}/omap3isp/isphist.h            | 0
 drivers/media/platform/{ => ti}/omap3isp/isppreview.c         | 0
 drivers/media/platform/{ => ti}/omap3isp/isppreview.h         | 0
 drivers/media/platform/{ => ti}/omap3isp/ispreg.h             | 0
 drivers/media/platform/{ => ti}/omap3isp/ispresizer.c         | 0
 drivers/media/platform/{ => ti}/omap3isp/ispresizer.h         | 0
 drivers/media/platform/{ => ti}/omap3isp/ispstat.c            | 0
 drivers/media/platform/{ => ti}/omap3isp/ispstat.h            | 0
 drivers/media/platform/{ => ti}/omap3isp/ispvideo.c           | 0
 drivers/media/platform/{ => ti}/omap3isp/ispvideo.h           | 0
 drivers/media/platform/{ => ti}/omap3isp/luma_enhance_table.h | 0
 drivers/media/platform/{ => ti}/omap3isp/noise_filter_table.h | 0
 drivers/media/platform/{ => ti}/omap3isp/omap3isp.h           | 0
 37 files changed, 6 insertions(+), 6 deletions(-)
 rename drivers/media/platform/{ => ti}/omap3isp/Kconfig (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/Makefile (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/cfa_coef_table.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/gamma_table.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isp.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isp.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispccdc.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispccdc.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispccp2.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispccp2.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispcsi2.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispcsi2.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispcsiphy.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispcsiphy.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isph3a.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isph3a_aewb.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isph3a_af.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isphist.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isphist.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isppreview.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/isppreview.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispreg.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispresizer.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispresizer.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispstat.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispstat.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispvideo.c (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/ispvideo.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/luma_enhance_table.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/noise_filter_table.h (100%)
 rename drivers/media/platform/{ => ti}/omap3isp/omap3isp.h (100%)

Documentation/admin-guide/media/omap3isp.rst +1 -1

index bc447bbec7ce..f32e7375a1a2 100644
@@ -17,7 +17,7 @@ Introduction
 ------------
 
 This file documents the Texas Instruments OMAP 3 Image Signal Processor (ISP)
-driver located under drivers/media/platform/omap3isp. The original driver was
+driver located under drivers/media/platform/ti/omap3isp. The original driver was
 written by Texas Instruments but since that it has been rewritten (twice) at
 Nokia.

Documentation/admin-guide/media/omap4_camera.rst +1 -1

index 24db4222d36d..2ada9b1e6897 100644
@@ -25,7 +25,7 @@ As of Revision AB, the ISS is described in detail in section 8.
 This driver is supporting **only** the CSI2-A/B interfaces for now.
 
 It makes use of the Media Controller framework [#f2]_, and inherited most of the
-code from OMAP3 ISP driver (found under drivers/media/platform/omap3isp/\*),
+code from OMAP3 ISP driver (found under drivers/media/platform/ti/omap3isp/\*),
 except that it doesn't need an IOMMU now for ISS buffers memory mapping.
 
 Supports usage of MMAP buffers only (for now).

Documentation/driver-api/media/v4l2-event.rst +1 -1

index 5b8254eba7da..52d4fbc5d819 100644
@@ -167,7 +167,7 @@ The first event type in the class is reserved for future use, so the first
 available event type is 'class base + 1'.
 
 An example on how the V4L2 events may be used can be found in the OMAP
-3 ISP driver (``drivers/media/platform/omap3isp``).
+3 ISP driver (``drivers/media/platform/ti/omap3isp``).
 
 A subdev can directly send an event to the :c:type:`v4l2_device` notify
 function with ``V4L2_DEVICE_NOTIFY_EVENT``. This allows the bridge to map

MAINTAINERS +1 -1

index 801391246c87..2a85c98a77e4 100644
@@ -14094,7 +14094,7 @@ M:	Laurent Pinchart <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	Documentation/devicetree/bindings/media/ti,omap3isp.txt
-F:	drivers/media/platform/omap3isp/
+F:	drivers/media/platform/ti/omap3isp/
 F:	drivers/staging/media/omap4iss/
 
 OMAP MMC SUPPORT

drivers/media/platform/Kconfig +1 -1

index 4d4d8e120731..7763bd455f21 100644
@@ -82,7 +82,6 @@ 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"
 source "drivers/media/platform/renesas/Kconfig"
 source "drivers/media/platform/rockchip/Kconfig"

@@ -97,6 +96,7 @@ source "drivers/media/platform/sti/stm32/Kconfig"
 source "drivers/media/platform/ti-vpe/Kconfig"
 source "drivers/media/platform/ti/am437x/Kconfig"
 source "drivers/media/platform/ti/davinci/Kconfig"
+source "drivers/media/platform/ti/omap3isp/Kconfig"
 source "drivers/media/platform/via/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"

drivers/media/platform/Makefile +1 -1

index 4e063935f061..ef6c00b2ed64 100644
@@ -22,7 +22,6 @@ obj-y += nvidia/tegra-vde/
 obj-y += nxp/
 obj-y += nxp/amphion/
 obj-y += omap/
-obj-y += omap3isp/
 obj-y += qcom/camss/
 obj-y += qcom/venus/
 obj-y += renesas/

@@ -42,6 +41,7 @@ obj-y += sti/stm32/
 obj-y += ti-vpe/
 obj-y += ti/am437x/
 obj-y += ti/davinci/
+obj-y += ti/omap3isp/
 obj-y += via/
 obj-y += xilinx/

drivers/media/platform/ti/omap3isp/Kconfig renamed from drivers/media/platform/omap3isp/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/Kconfig
rename to drivers/media/platform/ti/omap3isp/Kconfig

drivers/media/platform/ti/omap3isp/Makefile renamed from drivers/media/platform/omap3isp/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/Makefile
rename to drivers/media/platform/ti/omap3isp/Makefile

drivers/media/platform/ti/omap3isp/cfa_coef_table.h renamed from drivers/media/platform/omap3isp/cfa_coef_table.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/cfa_coef_table.h
rename to drivers/media/platform/ti/omap3isp/cfa_coef_table.h

drivers/media/platform/ti/omap3isp/gamma_table.h renamed from drivers/media/platform/omap3isp/gamma_table.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/gamma_table.h
rename to drivers/media/platform/ti/omap3isp/gamma_table.h

drivers/media/platform/ti/omap3isp/isp.c renamed from drivers/media/platform/omap3isp/isp.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/isp.c
rename to drivers/media/platform/ti/omap3isp/isp.c

drivers/media/platform/ti/omap3isp/isp.h renamed from drivers/media/platform/omap3isp/isp.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/isp.h
rename to drivers/media/platform/ti/omap3isp/isp.h

drivers/media/platform/ti/omap3isp/ispccdc.c renamed from drivers/media/platform/omap3isp/ispccdc.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispccdc.c
rename to drivers/media/platform/ti/omap3isp/ispccdc.c

drivers/media/platform/ti/omap3isp/ispccdc.h renamed from drivers/media/platform/omap3isp/ispccdc.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispccdc.h
rename to drivers/media/platform/ti/omap3isp/ispccdc.h

drivers/media/platform/ti/omap3isp/ispccp2.c renamed from drivers/media/platform/omap3isp/ispccp2.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispccp2.c
rename to drivers/media/platform/ti/omap3isp/ispccp2.c

drivers/media/platform/ti/omap3isp/ispccp2.h renamed from drivers/media/platform/omap3isp/ispccp2.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispccp2.h
rename to drivers/media/platform/ti/omap3isp/ispccp2.h

drivers/media/platform/ti/omap3isp/ispcsi2.c renamed from drivers/media/platform/omap3isp/ispcsi2.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispcsi2.c
rename to drivers/media/platform/ti/omap3isp/ispcsi2.c

drivers/media/platform/ti/omap3isp/ispcsi2.h renamed from drivers/media/platform/omap3isp/ispcsi2.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispcsi2.h
rename to drivers/media/platform/ti/omap3isp/ispcsi2.h

drivers/media/platform/ti/omap3isp/ispcsiphy.c renamed from drivers/media/platform/omap3isp/ispcsiphy.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispcsiphy.c
rename to drivers/media/platform/ti/omap3isp/ispcsiphy.c

drivers/media/platform/ti/omap3isp/ispcsiphy.h renamed from drivers/media/platform/omap3isp/ispcsiphy.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispcsiphy.h
rename to drivers/media/platform/ti/omap3isp/ispcsiphy.h

drivers/media/platform/ti/omap3isp/isph3a.h renamed from drivers/media/platform/omap3isp/isph3a.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/isph3a.h
rename to drivers/media/platform/ti/omap3isp/isph3a.h

drivers/media/platform/ti/omap3isp/isph3a_aewb.c renamed from drivers/media/platform/omap3isp/isph3a_aewb.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/isph3a_aewb.c
rename to drivers/media/platform/ti/omap3isp/isph3a_aewb.c

drivers/media/platform/ti/omap3isp/isph3a_af.c renamed from drivers/media/platform/omap3isp/isph3a_af.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/isph3a_af.c
rename to drivers/media/platform/ti/omap3isp/isph3a_af.c

drivers/media/platform/ti/omap3isp/isphist.c renamed from drivers/media/platform/omap3isp/isphist.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/isphist.c
rename to drivers/media/platform/ti/omap3isp/isphist.c

drivers/media/platform/ti/omap3isp/isphist.h renamed from drivers/media/platform/omap3isp/isphist.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/isphist.h
rename to drivers/media/platform/ti/omap3isp/isphist.h

drivers/media/platform/ti/omap3isp/isppreview.c renamed from drivers/media/platform/omap3isp/isppreview.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/isppreview.c
rename to drivers/media/platform/ti/omap3isp/isppreview.c

drivers/media/platform/ti/omap3isp/isppreview.h renamed from drivers/media/platform/omap3isp/isppreview.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/isppreview.h
rename to drivers/media/platform/ti/omap3isp/isppreview.h

drivers/media/platform/ti/omap3isp/ispreg.h renamed from drivers/media/platform/omap3isp/ispreg.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispreg.h
rename to drivers/media/platform/ti/omap3isp/ispreg.h

drivers/media/platform/ti/omap3isp/ispresizer.c renamed from drivers/media/platform/omap3isp/ispresizer.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispresizer.c
rename to drivers/media/platform/ti/omap3isp/ispresizer.c

drivers/media/platform/ti/omap3isp/ispresizer.h renamed from drivers/media/platform/omap3isp/ispresizer.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispresizer.h
rename to drivers/media/platform/ti/omap3isp/ispresizer.h

drivers/media/platform/ti/omap3isp/ispstat.c renamed from drivers/media/platform/omap3isp/ispstat.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispstat.c
rename to drivers/media/platform/ti/omap3isp/ispstat.c

drivers/media/platform/ti/omap3isp/ispstat.h renamed from drivers/media/platform/omap3isp/ispstat.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispstat.h
rename to drivers/media/platform/ti/omap3isp/ispstat.h

drivers/media/platform/ti/omap3isp/ispvideo.c renamed from drivers/media/platform/omap3isp/ispvideo.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispvideo.c
rename to drivers/media/platform/ti/omap3isp/ispvideo.c

drivers/media/platform/ti/omap3isp/ispvideo.h renamed from drivers/media/platform/omap3isp/ispvideo.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/ispvideo.h
rename to drivers/media/platform/ti/omap3isp/ispvideo.h

drivers/media/platform/ti/omap3isp/luma_enhance_table.h renamed from drivers/media/platform/omap3isp/luma_enhance_table.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/luma_enhance_table.h
rename to drivers/media/platform/ti/omap3isp/luma_enhance_table.h

drivers/media/platform/ti/omap3isp/noise_filter_table.h renamed from drivers/media/platform/omap3isp/noise_filter_table.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/noise_filter_table.h
rename to drivers/media/platform/ti/omap3isp/noise_filter_table.h

drivers/media/platform/ti/omap3isp/omap3isp.h renamed from drivers/media/platform/omap3isp/omap3isp.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap3isp/omap3isp.h
rename to drivers/media/platform/ti/omap3isp/omap3isp.h

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #34 lore raw

PATCH 21/24 media: platform: rename omap/ to ti/omap/

In reply to Mauro Carvalho Chehab

As the end goal is to have platform drivers split by vendor, rename omap/ to ti/omap/.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 drivers/media/platform/Kconfig                        | 2 +-
 drivers/media/platform/Makefile                       | 2 +-
 drivers/media/platform/{ => ti}/omap/Kconfig          | 0
 drivers/media/platform/{ => ti}/omap/Makefile         | 0
 drivers/media/platform/{ => ti}/omap/omap_vout.c      | 0
 drivers/media/platform/{ => ti}/omap/omap_vout_vrfb.c | 0
 drivers/media/platform/{ => ti}/omap/omap_vout_vrfb.h | 0
 drivers/media/platform/{ => ti}/omap/omap_voutdef.h   | 0
 drivers/media/platform/{ => ti}/omap/omap_voutlib.c   | 0
 drivers/media/platform/{ => ti}/omap/omap_voutlib.h   | 0
 10 files changed, 2 insertions(+), 2 deletions(-)
 rename drivers/media/platform/{ => ti}/omap/Kconfig (100%)
 rename drivers/media/platform/{ => ti}/omap/Makefile (100%)
 rename drivers/media/platform/{ => ti}/omap/omap_vout.c (100%)
 rename drivers/media/platform/{ => ti}/omap/omap_vout_vrfb.c (100%)
 rename drivers/media/platform/{ => ti}/omap/omap_vout_vrfb.h (100%)
 rename drivers/media/platform/{ => ti}/omap/omap_voutdef.h (100%)
 rename drivers/media/platform/{ => ti}/omap/omap_voutlib.c (100%)
 rename drivers/media/platform/{ => ti}/omap/omap_voutlib.h (100%)

drivers/media/platform/Kconfig +1 -1

index 7763bd455f21..366a0fa5e519 100644
@@ -81,7 +81,6 @@ 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/qcom/Kconfig"
 source "drivers/media/platform/renesas/Kconfig"
 source "drivers/media/platform/rockchip/Kconfig"

@@ -96,6 +95,7 @@ source "drivers/media/platform/sti/stm32/Kconfig"
 source "drivers/media/platform/ti-vpe/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/via/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"

drivers/media/platform/Makefile +1 -1

index ef6c00b2ed64..a9740f6021d2 100644
@@ -21,7 +21,6 @@ obj-y += mediatek/mtk-vpu/
 obj-y += nvidia/tegra-vde/
 obj-y += nxp/
 obj-y += nxp/amphion/
-obj-y += omap/
 obj-y += qcom/camss/
 obj-y += qcom/venus/
 obj-y += renesas/

@@ -41,6 +40,7 @@ obj-y += sti/stm32/
 obj-y += ti-vpe/
 obj-y += ti/am437x/
 obj-y += ti/davinci/
+obj-y += ti/omap/
 obj-y += ti/omap3isp/
 obj-y += via/
 obj-y += xilinx/

drivers/media/platform/ti/omap/Kconfig renamed from drivers/media/platform/omap/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/omap/Kconfig
rename to drivers/media/platform/ti/omap/Kconfig

drivers/media/platform/ti/omap/Makefile renamed from drivers/media/platform/omap/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/omap/Makefile
rename to drivers/media/platform/ti/omap/Makefile

drivers/media/platform/ti/omap/omap_vout.c renamed from drivers/media/platform/omap/omap_vout.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap/omap_vout.c
rename to drivers/media/platform/ti/omap/omap_vout.c

drivers/media/platform/ti/omap/omap_vout_vrfb.c renamed from drivers/media/platform/omap/omap_vout_vrfb.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap/omap_vout_vrfb.c
rename to drivers/media/platform/ti/omap/omap_vout_vrfb.c

drivers/media/platform/ti/omap/omap_vout_vrfb.h renamed from drivers/media/platform/omap/omap_vout_vrfb.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap/omap_vout_vrfb.h
rename to drivers/media/platform/ti/omap/omap_vout_vrfb.h

drivers/media/platform/ti/omap/omap_voutdef.h renamed from drivers/media/platform/omap/omap_voutdef.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap/omap_voutdef.h
rename to drivers/media/platform/ti/omap/omap_voutdef.h

drivers/media/platform/ti/omap/omap_voutlib.c renamed from drivers/media/platform/omap/omap_voutlib.c +0 -0

similarity index 100%
rename from drivers/media/platform/omap/omap_voutlib.c
rename to drivers/media/platform/ti/omap/omap_voutlib.c

drivers/media/platform/ti/omap/omap_voutlib.h renamed from drivers/media/platform/omap/omap_voutlib.h +0 -0

similarity index 100%
rename from drivers/media/platform/omap/omap_voutlib.h
rename to drivers/media/platform/ti/omap/omap_voutlib.h

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:54 UTC #35 lore raw

PATCH 22/24 media: platform: rename ti-vpe/ to ti/vpe/

In reply to Mauro Carvalho Chehab

As the end goal is to have platform drivers split by vendor, rename ti-vpe/ to ti/vpe/.

Signed-off-by Mauro Carvalho Chehab <[email protected]>

---

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/[email protected]/

 MAINTAINERS                                              | 2 +-
 drivers/media/platform/Kconfig                           | 2 +-
 drivers/media/platform/Makefile                          | 2 +-
 drivers/media/platform/{ti-vpe => ti/vpe}/Kconfig        | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/Makefile       | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/cal-camerarx.c | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/cal-video.c    | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/cal.c          | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/cal.h          | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/cal_regs.h     | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/csc.c          | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/csc.h          | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/sc.c           | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/sc.h           | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/sc_coeff.h     | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/vpdma.c        | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/vpdma.h        | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/vpdma_priv.h   | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/vpe.c          | 0
 drivers/media/platform/{ti-vpe => ti/vpe}/vpe_regs.h     | 0
 20 files changed, 3 insertions(+), 3 deletions(-)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/Kconfig (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/Makefile (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/cal-camerarx.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/cal-video.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/cal.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/cal.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/cal_regs.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/csc.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/csc.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/sc.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/sc.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/sc_coeff.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/vpdma.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/vpdma.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/vpdma_priv.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/vpe.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/vpe}/vpe_regs.h (100%)

MAINTAINERS +1 -1

index 2a85c98a77e4..031cb2cbecba 100644
@@ -19407,7 +19407,7 @@ W:	http://linuxtv.org/
 Q:	http://patchwork.linuxtv.org/project/linux-media/list/
 F:	Documentation/devicetree/bindings/media/ti,cal.yaml
 F:	Documentation/devicetree/bindings/media/ti,vpe.yaml
-F:	drivers/media/platform/ti-vpe/
+F:	drivers/media/platform/ti/vpe/
 
 TI WILINK WIRELESS DRIVERS
 L:	[email protected]

drivers/media/platform/Kconfig +1 -1

index 366a0fa5e519..d9bd7a675c22 100644
@@ -92,11 +92,11 @@ 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/sti/stm32/Kconfig"
-source "drivers/media/platform/ti-vpe/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/via/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"

drivers/media/platform/Makefile +1 -1

index a9740f6021d2..1e62a4009b6c 100644
@@ -37,11 +37,11 @@ obj-y += sti/c8sectpfe/
 obj-y += sti/delta/
 obj-y += sti/hva/
 obj-y += sti/stm32/
-obj-y += ti-vpe/
 obj-y += ti/am437x/
 obj-y += ti/davinci/
 obj-y += ti/omap/
 obj-y += ti/omap3isp/
+obj-y += ti/vpe/
 obj-y += via/
 obj-y += xilinx/

drivers/media/platform/ti/vpe/Kconfig renamed from drivers/media/platform/ti-vpe/Kconfig +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/Kconfig
rename to drivers/media/platform/ti/vpe/Kconfig

drivers/media/platform/ti/vpe/Makefile renamed from drivers/media/platform/ti-vpe/Makefile +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/Makefile
rename to drivers/media/platform/ti/vpe/Makefile

drivers/media/platform/ti/vpe/cal-camerarx.c renamed from drivers/media/platform/ti-vpe/cal-camerarx.c +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/cal-camerarx.c
rename to drivers/media/platform/ti/vpe/cal-camerarx.c

drivers/media/platform/ti/vpe/cal-video.c renamed from drivers/media/platform/ti-vpe/cal-video.c +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/cal-video.c
rename to drivers/media/platform/ti/vpe/cal-video.c

drivers/media/platform/ti/vpe/cal.c renamed from drivers/media/platform/ti-vpe/cal.c +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/cal.c
rename to drivers/media/platform/ti/vpe/cal.c

drivers/media/platform/ti/vpe/cal.h renamed from drivers/media/platform/ti-vpe/cal.h +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/cal.h
rename to drivers/media/platform/ti/vpe/cal.h

drivers/media/platform/ti/vpe/cal_regs.h renamed from drivers/media/platform/ti-vpe/cal_regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/cal_regs.h
rename to drivers/media/platform/ti/vpe/cal_regs.h

drivers/media/platform/ti/vpe/csc.c renamed from drivers/media/platform/ti-vpe/csc.c +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/csc.c
rename to drivers/media/platform/ti/vpe/csc.c

drivers/media/platform/ti/vpe/csc.h renamed from drivers/media/platform/ti-vpe/csc.h +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/csc.h
rename to drivers/media/platform/ti/vpe/csc.h

drivers/media/platform/ti/vpe/sc.c renamed from drivers/media/platform/ti-vpe/sc.c +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/sc.c
rename to drivers/media/platform/ti/vpe/sc.c

drivers/media/platform/ti/vpe/sc.h renamed from drivers/media/platform/ti-vpe/sc.h +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/sc.h
rename to drivers/media/platform/ti/vpe/sc.h

drivers/media/platform/ti/vpe/sc_coeff.h renamed from drivers/media/platform/ti-vpe/sc_coeff.h +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/sc_coeff.h
rename to drivers/media/platform/ti/vpe/sc_coeff.h

drivers/media/platform/ti/vpe/vpdma.c renamed from drivers/media/platform/ti-vpe/vpdma.c +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/vpdma.c
rename to drivers/media/platform/ti/vpe/vpdma.c

drivers/media/platform/ti/vpe/vpdma.h renamed from drivers/media/platform/ti-vpe/vpdma.h +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/vpdma.h
rename to drivers/media/platform/ti/vpe/vpdma.h

drivers/media/platform/ti/vpe/vpdma_priv.h renamed from drivers/media/platform/ti-vpe/vpdma_priv.h +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/vpdma_priv.h
rename to drivers/media/platform/ti/vpe/vpdma_priv.h

drivers/media/platform/ti/vpe/vpe.c renamed from drivers/media/platform/ti-vpe/vpe.c +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/vpe.c
rename to drivers/media/platform/ti/vpe/vpe.c

drivers/media/platform/ti/vpe/vpe_regs.h renamed from drivers/media/platform/ti-vpe/vpe_regs.h +0 -0

similarity index 100%
rename from drivers/media/platform/ti-vpe/vpe_regs.h
rename to drivers/media/platform/ti/vpe/vpe_regs.h

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:53 UTC #36 lore raw

PATCH 23/24 media: platform: Create vendor/{Makefile,Kconfig} files

In reply to Mauro Carvalho Chehab

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 <[email protected]>

---

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/[email protected]/

 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

drivers/media/platform/Kconfig +5 ~~-19~~

index d9bd7a675c22..4e7b2973fbc1 100644
@@ -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"

drivers/media/platform/Makefile +8 ~~-27~~

index 1e62a4009b6c..5b14b231140b 100644
@@ -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/

drivers/media/platform/amlogic/Kconfig new file +2 -0

new file mode 100644
index 000000000000..09fb145a0b30
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+source "drivers/media/platform/amlogic/meson-ge2d/Kconfig"

drivers/media/platform/amlogic/Makefile new file +2 -0

new file mode 100644
index 000000000000..ec387adbacdd
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y += meson-ge2d/

drivers/media/platform/mediatek/Kconfig new file +5 -0

new file mode 100644
index 000000000000..549abf1df7d9
@@ -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"

drivers/media/platform/mediatek/Makefile new file +5 -0

new file mode 100644
index 000000000000..ec7f58943576
@@ -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/

drivers/media/platform/nvidia/Kconfig new file +2 -0

new file mode 100644
index 000000000000..413005d8cd66
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0
+source "drivers/media/platform/nvidia/tegra-vde/Kconfig"

drivers/media/platform/nxp/Kconfig +1 -0

index af5cd4eb6bf3..e8c9d33cd3b7 100644
@@ -64,3 +64,4 @@ config VIDEO_MX2_EMMAPRP
 	    conversion.
 
 source "drivers/media/platform/nxp/imx-jpeg/Kconfig"
+source "drivers/media/platform/nxp/amphion/Kconfig"

drivers/media/platform/nxp/Makefile +1 -0

index a217cf7f109d..9ff13ce1391d 100644
@@ -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

drivers/media/platform/qcom/Makefile new file +3 -0

new file mode 100644
index 000000000000..98628912bc05
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y += camss/
+obj-y += venus/

drivers/media/platform/rockchip/Makefile new file +3 -0

new file mode 100644
index 000000000000..ef58d1a82fc6
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+obj-y += rga/
+obj-y += rkisp1/

drivers/media/platform/samsung/Kconfig new file +7 -0

new file mode 100644
index 000000000000..9e9e8acdccd3
@@ -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"

drivers/media/platform/samsung/Makefile new file +7 -0

new file mode 100644
index 000000000000..00a2d7e4daab
@@ -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/

drivers/media/platform/sti/Kconfig +1 -0

index 9fb5e78a92cf..d5423743d905 100644
@@ -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"

drivers/media/platform/sti/Makefile new file +6 -0

new file mode 100644
index 000000000000..a26dc89de577
@@ -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/

drivers/media/platform/ti/Kconfig new file +6 -0

new file mode 100644
index 000000000000..796acd229987
@@ -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"

drivers/media/platform/ti/Makefile new file +6 -0

new file mode 100644
index 000000000000..2e0f43ed2e25
@@ -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/

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 10:52 UTC #37 lore raw

PATCH 24/24 media: platform/*/Kconfig: make menus more uniform

In reply to Mauro Carvalho Chehab

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 <[email protected]>

---

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 at 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(-)

drivers/media/platform/allegro-dvt/Kconfig +3 -0

index c3f76a6fb6f8..735440369c5c 100644
@@ -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

drivers/media/platform/amlogic/Kconfig +3 -0

index 09fb145a0b30..bc8d99e12f96 100644
@@ -1,2 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
+
+comment "Amlogic drivers"
+
 source "drivers/media/platform/amlogic/meson-ge2d/Kconfig"

drivers/media/platform/aspeed/Kconfig +3 -0

index 810902c8a85a..af95b08adf46 100644
@@ -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

drivers/media/platform/atmel/Kconfig +3 -0

index abeb0ac595b3..ae0fa7f96f66 100644
@@ -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

drivers/media/platform/cadence/Kconfig +1 ~~-12~~

index acfa0ef6247e..1a0f2d9a6a28 100644
@@ -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

drivers/media/platform/chips-media/Kconfig +3 -0

index 22b654018f3c..ea49b3563320 100644
@@ -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

drivers/media/platform/intel/Kconfig +3 -0

index d47a2cf6f334..091e15f00ef5 100644
@@ -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

drivers/media/platform/marvell/Kconfig +3 -0

index 474795668930..d7275322fd92 100644
@@ -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

drivers/media/platform/mediatek/Kconfig +3 -0

index 549abf1df7d9..8e0770fb2dd3 100644
@@ -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"

drivers/media/platform/nvidia/Kconfig +3 -0

index 413005d8cd66..8fdb41e64308 100644
@@ -1,2 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
+
+comment "NVidia drivers"
+
 source "drivers/media/platform/nvidia/tegra-vde/Kconfig"

drivers/media/platform/nxp/Kconfig +6 ~~-18~~

index e8c9d33cd3b7..65357344d5e5 100644
@@ -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"

drivers/media/platform/qcom/Kconfig +3 -0

index aa2428f641d3..b19b4f319f6b 100644
@@ -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"

drivers/media/platform/renesas/Kconfig +2 -0

index 0c0de21584ba..8c707ab38d0a 100644
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+comment "Renesas drivers"
+
 # V4L drivers
 
 config VIDEO_RENESAS_CEU

drivers/media/platform/rockchip/Kconfig +3 -0

index c7ba06388780..558e3e4b5aa4 100644
@@ -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"

drivers/media/platform/samsung/Kconfig +3 -0

index 9e9e8acdccd3..8813b61b06f4 100644
@@ -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"

drivers/media/platform/sti/Kconfig +3 -0

index d5423743d905..a352087dba27 100644
@@ -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"

drivers/media/platform/ti/Kconfig +3 -0

index 796acd229987..9e63ea70b48f 100644
@@ -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"

drivers/media/platform/via/Kconfig +3 -0

index a289f5c81b7c..6077222eb274 100644
@@ -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

drivers/media/platform/xilinx/Kconfig +3 -4

index 439120c45eb1..0c772d070eb6 100644
@@ -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

Signature · 1 line

2.35.1

Mauro Carvalho Chehab

author maintainer

2022-03-13 11:00 UTC #38 lore raw

In reply to Mauro Carvalho Chehab

Em Sun, 13 Mar 2022 11:51:41 +0100
Mauro Carvalho Chehab <[email protected]> escreveu:

Quoted 28 lines

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/

Quoted 8 lines

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