Skip to contentSkip to conversation

media: Kconfig/Makefile reorg

PATCH In review Mauro Carvalho Chehab 6 participants 81 messages Mar 14, 2022 – Mar 17, 2022 Page 1 of 2

Subsystems (104)
lore
Share & tools
lore

Mauro Carvalho Chehab

author maintainer
#0 lore raw

v2 cover media: Kconfig/Makefile reorg

I opted to join two series and one separate patch on a single series, as they're related and one depends on the others. That's the second version of it.

It basically sorts the main media Makefile/Kconfig files and reorganizes drivers/media/platform building system. Now, the entries there are organized per-vendor, and each per-vendor directory under drivers/media/platform contains its own Kconfig/Makefile.

It should be noticed that I opted to not sort the manufacturer's Kconfig files on this series by purpose. After this series, the per-vendor Kconfig menus have only a few drivers (up to ~10 config symbols). That makes it a lot more manageable than what we had before when almost every platform driver config entry were on a single file.

My current understaning is that the driver maintainers knows best how to better organize their Kconfig files, considering that:

- the per-vendor driver order may not be in alphabetical order, as it may make sense to group drivers per type, platform and/or by its dependency chain;

- It is now easy to sort the per-vendor entries alphabetically, either per config title or per Kconfig symbol;

- Now that the main sort criteria is per-vendor, IMO it makes sense to define a per-vendor config space, like:

	config VIDEO_VNDR_bar
		...
	config VIDEO_VNDR_foo
		...
	config VIDEO_VNDR_foobar
		...

Regards,
Mauro

v2:
- ampion was moved out of nxp/;
- STMicroelectronics has a new dir (stm) with two subdirectories on it (sti and stm32);
- Mediatek's subdirectories were renamed;
- The other media Kconfig main directories were sorted as well;
- Simplified VIDEO_DEV dependencies at radio Kconfig;

Mauro Carvalho Chehab (66):
media: xc2028: rename the driver from tuner-xc2028
media: Makefiles: remove extra spaces
media: Makefiles: sort entries where it fits
media: platform: Makefile: reorganize its contents
media: platform: move platform menu dependencies to drivers
media: platform: place Aspeed driver on a separate dir
media: platform: place NXP drivers on a separate dir
media: platform: place Intel drivers on a separate dir
media: platform: place Via drivers on a separate dir
media: platform: place Renesas drivers on a separate dir
media: platform: allegro-dvt: move config to its own file
media: platform: amphion: move config to its own file
media: platform: coda: move config to its own file
media: platform: exynos-gsc: move config to its own file
media: platform: ge2d: move config to its own file
media: platform: mtk-jpeg: move config to its own file
media: platform: mtk-mdp: move config to its own file
media: platform: mtk-vcodec: move config to its own file
media: platform: mtk-vpu: move config to its own file
media: platform: omap3isp: move config to its own file
media: platform: camss: move config to its own file
media: platform: venus: move config to its own file
media: platform: rga: move config to its own file
media: platform: s3c-camif: move config to its own file
media: platform: s5p-g2d: move config to its own file
media: platform: hva: move config to its own file
media: platform: stm32: move config to its own file
media: platform: sun8i-di: move config to its own file
media: platform: sun8i-rotate: move config to its own file
media: platform: vde: move config to its own file
media: platform: ti-vpe: move config to its own file
media: platform: rkisp1: move config to its own file
media: platform: delta: move config to its own file
media: platform: bdisp: move config to its own file
media: platform: s5p-mfc: move config to its own file
media: platform: s5p-jpeg: move config to its own file
media: platform: Kconfig: sort entries
media: platform: move some manufacturer entries
media: platform: Kconfig: place platform drivers on a submenu
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 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 stm/stm32/
media: platform: rename sti/ to stm/sti/
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: ti/Kconfig: move VPE/CAL entries to it
media: platform: Create vendor/{Makefile,Kconfig} files
media: platform/*/Kconfig: make manufacturer menus more uniform
media: Kconfig: cleanup VIDEO_DEV dependencies
media: media/*/Kconfig: sort entries
media: platform: rename mediatek/mtk-jpeg/ to mediatek/jpeg/

Pratyush Yadav (1):
media: platform: re-structure TI drivers

 Documentation/admin-guide/media/fimc.rst      |   2 +-
 .../admin-guide/media/i2c-cardlist.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                                   |  79 +-
 drivers/input/rmi4/Kconfig                    |   2 +-
 drivers/input/touchscreen/Kconfig             |   4 +-
 drivers/media/Kconfig                         |  11 +-
 drivers/media/Makefile                        |   4 +-
 drivers/media/cec/platform/Makefile           |  16 +-
 drivers/media/common/Kconfig                  |  16 +-
 drivers/media/common/Makefile                 |   7 +-
 drivers/media/common/saa7146/Kconfig          |   2 +-
 drivers/media/common/videobuf2/Makefile       |   8 +-
 drivers/media/dvb-core/Kconfig                |   2 +-
 drivers/media/dvb-frontends/Kconfig           | 761 ++++++++--------
 drivers/media/dvb-frontends/Makefile          | 193 ++--
 drivers/media/firewire/Makefile               |   2 +-
 drivers/media/i2c/Kconfig                     | 832 +++++++++---------
 drivers/media/i2c/Makefile                    | 192 ++--
 drivers/media/i2c/ccs/Kconfig                 |   2 +-
 drivers/media/i2c/cx25840/Kconfig             |   2 +-
 drivers/media/i2c/et8ek8/Kconfig              |   2 +-
 drivers/media/i2c/m5mols/Kconfig              |   2 +-
 drivers/media/mmc/Kconfig                     |   1 +
 drivers/media/pci/Kconfig                     |  31 +-
 drivers/media/pci/Makefile                    |  22 +-
 drivers/media/pci/bt8xx/Kconfig               |   2 +-
 drivers/media/pci/cobalt/Kconfig              |   2 +-
 drivers/media/pci/cx18/Kconfig                |   2 +-
 drivers/media/pci/cx18/cx18-driver.c          |   2 +-
 drivers/media/pci/cx18/cx18-dvb.c             |   2 +-
 drivers/media/pci/cx18/cx18-gpio.c            |   2 +-
 drivers/media/pci/cx23885/cx23885-cards.c     |   2 +-
 drivers/media/pci/cx23885/cx23885-dvb.c       |   2 +-
 drivers/media/pci/cx23885/cx23885-video.c     |   2 +-
 drivers/media/pci/cx88/cx88.h                 |   2 +-
 drivers/media/pci/dt3155/Kconfig              |   2 +-
 drivers/media/pci/intel/ipu3/Kconfig          |   2 +-
 drivers/media/pci/ivtv/Kconfig                |   2 +-
 drivers/media/pci/ivtv/ivtv-driver.c          |   2 +-
 drivers/media/pci/ivtv/ivtv-gpio.c            |   2 +-
 drivers/media/pci/meye/Kconfig                |   2 +-
 drivers/media/pci/saa7134/saa7134-cards.c     |   2 +-
 drivers/media/pci/saa7134/saa7134-dvb.c       |   2 +-
 drivers/media/pci/saa7146/Kconfig             |   6 +-
 drivers/media/pci/sta2x11/Kconfig             |   2 +-
 drivers/media/pci/tw5864/Kconfig              |   2 +-
 drivers/media/pci/tw68/Kconfig                |   2 +-
 drivers/media/pci/tw686x/Kconfig              |   2 +-
 drivers/media/platform/Kconfig                | 741 ++--------------
 drivers/media/platform/Makefile               | 114 +--
 drivers/media/platform/allegro-dvt/Kconfig    |  19 +
 drivers/media/platform/allwinner/Kconfig      |   6 +
 .../platform/{sunxi => allwinner}/Makefile    |   0
 .../{sunxi => allwinner}/sun4i-csi/Kconfig    |   3 +-
 .../{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    |   3 +-
 .../{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
 .../media/platform/allwinner/sun8i-di/Kconfig |  14 +
 .../{sunxi => allwinner}/sun8i-di/Makefile    |   0
 .../{sunxi => allwinner}/sun8i-di/sun8i-di.c  |   0
 .../{sunxi => allwinner}/sun8i-di/sun8i-di.h  |   0
 .../platform/allwinner/sun8i-rotate/Kconfig   |  14 +
 .../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 +
 .../media/platform/amlogic/meson-ge2d/Kconfig |  14 +
 .../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/amphion/Kconfig        |  22 +
 drivers/media/platform/aspeed/Kconfig         |  13 +
 drivers/media/platform/aspeed/Makefile        |   2 +
 .../platform/{ => aspeed}/aspeed-video.c      |   0
 drivers/media/platform/atmel/Kconfig          |  15 +-
 drivers/media/platform/cadence/Kconfig        |  16 +-
 drivers/media/platform/chips-media/Kconfig    |  20 +
 .../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/imx/Kconfig            |  24 -
 drivers/media/platform/imx/Makefile           |   1 -
 drivers/media/platform/intel/Kconfig          |  14 +
 drivers/media/platform/intel/Makefile         |   2 +
 .../media/platform/{ => intel}/pxa_camera.c   |   0
 .../{marvell-ccic => marvell}/Kconfig         |   9 +-
 .../{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 +
 drivers/media/platform/mediatek/jpeg/Kconfig  |  16 +
 .../{mtk-jpeg => mediatek/jpeg}/Makefile      |   0
 .../jpeg}/mtk_jpeg_core.c                     |   0
 .../jpeg}/mtk_jpeg_core.h                     |   0
 .../jpeg}/mtk_jpeg_dec_hw.c                   |   0
 .../jpeg}/mtk_jpeg_dec_hw.h                   |   0
 .../jpeg}/mtk_jpeg_dec_parse.c                |   0
 .../jpeg}/mtk_jpeg_dec_parse.h                |   0
 .../jpeg}/mtk_jpeg_dec_reg.h                  |   0
 .../jpeg}/mtk_jpeg_enc_hw.c                   |   0
 .../jpeg}/mtk_jpeg_enc_hw.h                   |   0
 drivers/media/platform/mediatek/mdp/Kconfig   |  17 +
 .../{mtk-mdp => mediatek/mdp}/Makefile        |   2 +-
 .../{mtk-mdp => mediatek/mdp}/mtk_mdp_comp.c  |   0
 .../{mtk-mdp => mediatek/mdp}/mtk_mdp_comp.h  |   0
 .../{mtk-mdp => mediatek/mdp}/mtk_mdp_core.c  |   0
 .../{mtk-mdp => mediatek/mdp}/mtk_mdp_core.h  |   0
 .../{mtk-mdp => mediatek/mdp}/mtk_mdp_ipi.h   |   0
 .../{mtk-mdp => mediatek/mdp}/mtk_mdp_m2m.c   |   0
 .../{mtk-mdp => mediatek/mdp}/mtk_mdp_m2m.h   |   0
 .../{mtk-mdp => mediatek/mdp}/mtk_mdp_regs.c  |   0
 .../{mtk-mdp => mediatek/mdp}/mtk_mdp_regs.h  |   0
 .../{mtk-mdp => mediatek/mdp}/mtk_mdp_vpu.c   |   0
 .../{mtk-mdp => mediatek/mdp}/mtk_mdp_vpu.h   |   0
 .../media/platform/mediatek/vcodec/Kconfig    |  36 +
 .../{mtk-vcodec => mediatek/vcodec}/Makefile  |   0
 .../vcodec}/mtk_vcodec_dec.c                  |   0
 .../vcodec}/mtk_vcodec_dec.h                  |   0
 .../vcodec}/mtk_vcodec_dec_drv.c              |   0
 .../vcodec}/mtk_vcodec_dec_hw.c               |   0
 .../vcodec}/mtk_vcodec_dec_hw.h               |   0
 .../vcodec}/mtk_vcodec_dec_pm.c               |   0
 .../vcodec}/mtk_vcodec_dec_pm.h               |   0
 .../vcodec}/mtk_vcodec_dec_stateful.c         |   0
 .../vcodec}/mtk_vcodec_dec_stateless.c        |   0
 .../vcodec}/mtk_vcodec_drv.h                  |   0
 .../vcodec}/mtk_vcodec_enc.c                  |   0
 .../vcodec}/mtk_vcodec_enc.h                  |   0
 .../vcodec}/mtk_vcodec_enc_drv.c              |   0
 .../vcodec}/mtk_vcodec_enc_pm.c               |   0
 .../vcodec}/mtk_vcodec_enc_pm.h               |   0
 .../vcodec}/mtk_vcodec_fw.c                   |   0
 .../vcodec}/mtk_vcodec_fw.h                   |   2 +-
 .../vcodec}/mtk_vcodec_fw_priv.h              |   0
 .../vcodec}/mtk_vcodec_fw_scp.c               |   0
 .../vcodec}/mtk_vcodec_fw_vpu.c               |   0
 .../vcodec}/mtk_vcodec_intr.c                 |   0
 .../vcodec}/mtk_vcodec_intr.h                 |   0
 .../vcodec}/mtk_vcodec_util.c                 |   0
 .../vcodec}/mtk_vcodec_util.h                 |   0
 .../vcodec}/vdec/vdec_h264_if.c               |   0
 .../vcodec}/vdec/vdec_h264_req_if.c           |   0
 .../vcodec}/vdec/vdec_vp8_if.c                |   0
 .../vcodec}/vdec/vdec_vp9_if.c                |   0
 .../vcodec}/vdec_drv_base.h                   |   0
 .../vcodec}/vdec_drv_if.c                     |   0
 .../vcodec}/vdec_drv_if.h                     |   0
 .../vcodec}/vdec_ipi_msg.h                    |   0
 .../vcodec}/vdec_msg_queue.c                  |   0
 .../vcodec}/vdec_msg_queue.h                  |   0
 .../vcodec}/vdec_vpu_if.c                     |   0
 .../vcodec}/vdec_vpu_if.h                     |   0
 .../vcodec}/venc/venc_h264_if.c               |   0
 .../vcodec}/venc/venc_vp8_if.c                |   0
 .../vcodec}/venc_drv_base.h                   |   0
 .../vcodec}/venc_drv_if.c                     |   0
 .../vcodec}/venc_drv_if.h                     |   0
 .../vcodec}/venc_ipi_msg.h                    |   0
 .../vcodec}/venc_vpu_if.c                     |   0
 .../vcodec}/venc_vpu_if.h                     |   0
 drivers/media/platform/mediatek/vpu/Kconfig   |  15 +
 .../{mtk-vpu => mediatek/vpu}/Makefile        |   0
 .../{mtk-vpu => mediatek/vpu}/mtk_vpu.c       |   0
 .../{mtk-vpu => mediatek/vpu}/mtk_vpu.h       |   0
 drivers/media/platform/nvidia/Kconfig         |   5 +
 drivers/media/platform/nvidia/Makefile        |   3 +
 .../media/platform/nvidia/tegra-vde/Kconfig   |  17 +
 .../{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            |  54 ++
 drivers/media/platform/nxp/Makefile           |   8 +
 drivers/media/platform/{ => nxp}/fsl-viu.c    |   0
 .../media/platform/{ => nxp}/imx-jpeg/Kconfig |   3 +-
 .../platform/{ => nxp}/imx-jpeg/Makefile      |   0
 .../platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.c |   0
 .../platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.h |   0
 .../platform/{ => nxp}/imx-jpeg/mxc-jpeg.c    |   2 +-
 .../platform/{ => nxp}/imx-jpeg/mxc-jpeg.h    |   0
 .../platform/{imx => nxp}/imx-mipi-csis.c     |   0
 drivers/media/platform/{ => nxp}/imx-pxp.c    |   0
 drivers/media/platform/{ => nxp}/imx-pxp.h    |   0
 .../media/platform/{ => nxp}/mx2_emmaprp.c    |   0
 drivers/media/platform/qcom/Kconfig           |   6 +
 drivers/media/platform/qcom/Makefile          |   3 +
 drivers/media/platform/qcom/camss/Kconfig     |   9 +
 drivers/media/platform/qcom/venus/Kconfig     |  14 +
 drivers/media/platform/renesas/Kconfig        | 121 +++
 drivers/media/platform/renesas/Makefile       |  15 +
 .../media/platform/{ => renesas}/rcar-fcp.c   |   0
 .../media/platform/{ => renesas}/rcar-isp.c   |   0
 .../platform/{ => renesas}/rcar-vin/Kconfig   |   6 +-
 .../platform/{ => renesas}/rcar-vin/Makefile  |   0
 .../{ => renesas}/rcar-vin/rcar-core.c        |   0
 .../{ => renesas}/rcar-vin/rcar-csi2.c        |   0
 .../{ => renesas}/rcar-vin/rcar-dma.c         |   0
 .../{ => renesas}/rcar-vin/rcar-v4l2.c        |   0
 .../{ => renesas}/rcar-vin/rcar-vin.h         |   0
 .../media/platform/{ => renesas}/rcar_drif.c  |   0
 .../media/platform/{ => renesas}/rcar_fdp1.c  |   0
 .../media/platform/{ => renesas}/rcar_jpu.c   |   2 +-
 .../platform/{ => renesas}/renesas-ceu.c      |   0
 drivers/media/platform/{ => renesas}/sh_vou.c |   0
 .../platform/{ => renesas}/vsp1/Makefile      |   0
 .../media/platform/{ => renesas}/vsp1/vsp1.h  |   0
 .../platform/{ => renesas}/vsp1/vsp1_brx.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_brx.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_clu.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_clu.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_dl.c     |   0
 .../platform/{ => renesas}/vsp1/vsp1_dl.h     |   0
 .../platform/{ => renesas}/vsp1/vsp1_drm.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_drm.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_drv.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_entity.c |   0
 .../platform/{ => renesas}/vsp1/vsp1_entity.h |   0
 .../platform/{ => renesas}/vsp1/vsp1_hgo.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_hgo.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_hgt.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_hgt.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_histo.c  |   0
 .../platform/{ => renesas}/vsp1/vsp1_histo.h  |   0
 .../platform/{ => renesas}/vsp1/vsp1_hsit.c   |   0
 .../platform/{ => renesas}/vsp1/vsp1_hsit.h   |   0
 .../platform/{ => renesas}/vsp1/vsp1_lif.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_lif.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_lut.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_lut.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_pipe.c   |   0
 .../platform/{ => renesas}/vsp1/vsp1_pipe.h   |   0
 .../platform/{ => renesas}/vsp1/vsp1_regs.h   |   0
 .../platform/{ => renesas}/vsp1/vsp1_rpf.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_rwpf.c   |   0
 .../platform/{ => renesas}/vsp1/vsp1_rwpf.h   |   0
 .../platform/{ => renesas}/vsp1/vsp1_sru.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_sru.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_uds.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_uds.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_uif.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_uif.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_video.c  |   0
 .../platform/{ => renesas}/vsp1/vsp1_video.h  |   0
 .../platform/{ => renesas}/vsp1/vsp1_wpf.c    |   0
 drivers/media/platform/rockchip/Kconfig       |   6 +
 drivers/media/platform/rockchip/Makefile      |   3 +
 drivers/media/platform/rockchip/rga/Kconfig   |  14 +
 .../media/platform/rockchip/rkisp1/Kconfig    |  19 +
 drivers/media/platform/samsung/Kconfig        |  10 +
 drivers/media/platform/samsung/Makefile       |   7 +
 .../media/platform/samsung/exynos-gsc/Kconfig |  10 +
 .../{ => 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 |   3 +-
 .../{ => 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
 .../media/platform/samsung/s3c-camif/Kconfig  |  15 +
 .../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
 .../media/platform/samsung/s5p-g2d/Kconfig    |  11 +
 .../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
 .../media/platform/samsung/s5p-jpeg/Kconfig   |  12 +
 .../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 +-
 .../media/platform/samsung/s5p-mfc/Kconfig    |   9 +
 .../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/stm/Kconfig            |   6 +
 drivers/media/platform/stm/Makefile           |   7 +
 drivers/media/platform/stm/sti/Kconfig        |   5 +
 drivers/media/platform/stm/sti/Makefile       |   6 +
 drivers/media/platform/stm/sti/bdisp/Kconfig  |  10 +
 .../platform/{ => stm}/sti/bdisp/Makefile     |   0
 .../{ => stm}/sti/bdisp/bdisp-debug.c         |   0
 .../{ => stm}/sti/bdisp/bdisp-filter.h        |   0
 .../platform/{ => stm}/sti/bdisp/bdisp-hw.c   |   0
 .../platform/{ => stm}/sti/bdisp/bdisp-reg.h  |   0
 .../platform/{ => stm}/sti/bdisp/bdisp-v4l2.c |   0
 .../platform/{ => stm}/sti/bdisp/bdisp.h      |   0
 .../platform/{ => stm}/sti/c8sectpfe/Kconfig  |   1 +
 .../platform/{ => stm}/sti/c8sectpfe/Makefile |   0
 .../sti/c8sectpfe/c8sectpfe-common.c          |   0
 .../sti/c8sectpfe/c8sectpfe-common.h          |   0
 .../{ => stm}/sti/c8sectpfe/c8sectpfe-core.c  |   0
 .../{ => stm}/sti/c8sectpfe/c8sectpfe-core.h  |   0
 .../sti/c8sectpfe/c8sectpfe-debugfs.c         |   0
 .../sti/c8sectpfe/c8sectpfe-debugfs.h         |   0
 .../{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.c   |   0
 .../{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.h   |   0
 drivers/media/platform/stm/sti/delta/Kconfig  |  36 +
 .../platform/{ => stm}/sti/delta/Makefile     |   0
 .../platform/{ => stm}/sti/delta/delta-cfg.h  |   0
 .../{ => stm}/sti/delta/delta-debug.c         |   0
 .../{ => stm}/sti/delta/delta-debug.h         |   0
 .../platform/{ => stm}/sti/delta/delta-ipc.c  |   0
 .../platform/{ => stm}/sti/delta/delta-ipc.h  |   0
 .../platform/{ => stm}/sti/delta/delta-mem.c  |   0
 .../platform/{ => stm}/sti/delta/delta-mem.h  |   0
 .../{ => stm}/sti/delta/delta-mjpeg-dec.c     |   0
 .../{ => stm}/sti/delta/delta-mjpeg-fw.h      |   0
 .../{ => stm}/sti/delta/delta-mjpeg-hdr.c     |   0
 .../{ => stm}/sti/delta/delta-mjpeg.h         |   0
 .../platform/{ => stm}/sti/delta/delta-v4l2.c |   0
 .../platform/{ => stm}/sti/delta/delta.h      |   0
 drivers/media/platform/stm/sti/hva/Kconfig    |  26 +
 .../media/platform/{ => stm}/sti/hva/Makefile |   0
 .../platform/{ => stm}/sti/hva/hva-debugfs.c  |   0
 .../platform/{ => stm}/sti/hva/hva-h264.c     |   0
 .../media/platform/{ => stm}/sti/hva/hva-hw.c |   0
 .../media/platform/{ => stm}/sti/hva/hva-hw.h |   0
 .../platform/{ => stm}/sti/hva/hva-mem.c      |   0
 .../platform/{ => stm}/sti/hva/hva-mem.h      |   0
 .../platform/{ => stm}/sti/hva/hva-v4l2.c     |   0
 .../media/platform/{ => stm}/sti/hva/hva.h    |   0
 drivers/media/platform/stm/stm32/Kconfig      |  31 +
 .../media/platform/{ => stm}/stm32/Makefile   |   0
 .../platform/{ => stm}/stm32/dma2d/dma2d-hw.c |   0
 .../{ => stm}/stm32/dma2d/dma2d-regs.h        |   0
 .../platform/{ => stm}/stm32/dma2d/dma2d.c    |   0
 .../platform/{ => stm}/stm32/dma2d/dma2d.h    |   0
 .../platform/{ => stm}/stm32/stm32-dcmi.c     |   0
 drivers/media/platform/sunxi/Kconfig          |   4 -
 drivers/media/platform/ti/Kconfig             |  69 ++
 drivers/media/platform/ti/Makefile            |   7 +
 .../media/platform/{ => ti}/am437x/Kconfig    |   3 +-
 .../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
 drivers/media/platform/ti/cal/Makefile        |   3 +
 .../{ti-vpe => ti/cal}/cal-camerarx.c         |   0
 .../platform/{ti-vpe => ti/cal}/cal-video.c   |   0
 .../media/platform/{ti-vpe => ti/cal}/cal.c   |   0
 .../media/platform/{ti-vpe => ti/cal}/cal.h   |   0
 .../platform/{ti-vpe => ti/cal}/cal_regs.h    |   0
 .../media/platform/{ => ti}/davinci/Kconfig   |  18 +-
 .../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  |   3 +-
 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
 drivers/media/platform/ti/omap3isp/Kconfig    |  21 +
 .../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
 .../platform/{ti-vpe => ti/vpe}/Makefile      |   4 -
 .../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            |  14 +
 drivers/media/platform/via/Makefile           |   2 +
 drivers/media/platform/{ => via}/via-camera.c |   0
 drivers/media/platform/{ => via}/via-camera.h |   0
 drivers/media/platform/xilinx/Kconfig         |  10 +-
 drivers/media/radio/Kconfig                   | 362 ++++----
 drivers/media/radio/Makefile                  |  43 +-
 drivers/media/radio/si470x/Kconfig            |   2 +-
 drivers/media/radio/wl128x/Kconfig            |   2 +-
 drivers/media/rc/Kconfig                      | 382 ++++----
 drivers/media/rc/Makefile                     |  47 +-
 drivers/media/rc/keymaps/Makefile             |  34 +-
 drivers/media/spi/Kconfig                     |   4 +-
 drivers/media/spi/Makefile                    |   7 +-
 drivers/media/test-drivers/Kconfig            |   8 +-
 drivers/media/test-drivers/Makefile           |  14 +-
 drivers/media/test-drivers/vicodec/Kconfig    |   2 +-
 drivers/media/test-drivers/vidtv/Kconfig      |   1 -
 drivers/media/test-drivers/vimc/Kconfig       |   2 +-
 drivers/media/test-drivers/vivid/Kconfig      |   2 +-
 drivers/media/tuners/Kconfig                  | 407 ++++-----
 drivers/media/tuners/Makefile                 |  66 +-
 drivers/media/tuners/e4000.c                  |   6 +-
 drivers/media/tuners/fc2580.c                 |   6 +-
 drivers/media/tuners/tuner-types.c            |   2 +-
 .../{tuner-xc2028-types.h => xc2028-types.h}  |   6 +-
 .../media/tuners/{tuner-xc2028.c => xc2028.c} |   6 +-
 .../media/tuners/{tuner-xc2028.h => xc2028.h} |   2 +-
 drivers/media/tuners/xc4000.c                 |   2 +-
 drivers/media/usb/Kconfig                     |  33 +-
 drivers/media/usb/Makefile                    |  40 +-
 drivers/media/usb/airspy/Kconfig              |   2 +-
 drivers/media/usb/au0828/Kconfig              |   6 +-
 drivers/media/usb/cpia2/Kconfig               |   2 +-
 drivers/media/usb/dvb-usb-v2/Kconfig          |  34 +-
 drivers/media/usb/dvb-usb/Kconfig             | 392 +++++----
 drivers/media/usb/dvb-usb/cxusb.c             |   2 +-
 drivers/media/usb/dvb-usb/dib0700_devices.c   |   2 +-
 drivers/media/usb/em28xx/em28xx-i2c.c         |   2 +-
 drivers/media/usb/em28xx/em28xx.h             |   2 +-
 drivers/media/usb/gspca/Kconfig               | 121 ++-
 drivers/media/usb/gspca/Makefile              |  88 +-
 drivers/media/usb/gspca/gl860/Kconfig         |   2 +-
 drivers/media/usb/gspca/m5602/Kconfig         |   2 +-
 drivers/media/usb/hackrf/Kconfig              |   2 +-
 drivers/media/usb/hdpvr/Kconfig               |   2 +-
 drivers/media/usb/msi2500/Kconfig             |   2 +-
 drivers/media/usb/pvrusb2/Kconfig             |   2 +-
 drivers/media/usb/pwc/Kconfig                 |   2 +-
 drivers/media/usb/s2255/Kconfig               |   2 +-
 drivers/media/usb/stkwebcam/Kconfig           |   2 +-
 drivers/media/usb/tm6000/tm6000-cards.c       |   2 +-
 drivers/media/usb/tm6000/tm6000-dvb.c         |   2 +-
 drivers/media/usb/tm6000/tm6000-i2c.c         |   2 +-
 drivers/media/usb/usbtv/Kconfig               |   2 +-
 drivers/media/usb/uvc/Kconfig                 |   2 +-
 drivers/media/usb/zr364xx/Kconfig             |   2 +-
 drivers/media/v4l2-core/Kconfig               |  12 +-
 drivers/media/v4l2-core/Makefile              |  34 +-
 drivers/media/v4l2-core/tuner-core.c          |   2 +-
 drivers/staging/media/atomisp/Kconfig         |   2 +-
 drivers/staging/media/atomisp/i2c/Kconfig     |  14 +-
 drivers/staging/media/hantro/Kconfig          |   2 +-
 drivers/staging/media/imx/Kconfig             |   2 +-
 drivers/staging/media/ipu3/Kconfig            |   2 +-
 drivers/staging/media/max96712/Kconfig        |   2 +-
 drivers/staging/media/meson/vdec/Kconfig      |   2 +-
 drivers/staging/media/omap4iss/Kconfig        |   2 +-
 drivers/staging/media/rkvdec/Kconfig          |   2 +-
 drivers/staging/media/sunxi/cedrus/Kconfig    |   2 +-
 drivers/staging/media/tegra-video/Kconfig     |   2 +-
 drivers/staging/media/zoran/Kconfig           |   2 +-
 drivers/staging/most/video/Kconfig            |   2 +-
 .../vc04_services/bcm2835-camera/Kconfig      |   2 +-
 drivers/usb/gadget/Kconfig                    |   2 +-
 drivers/usb/gadget/legacy/Kconfig             |   2 +-
 sound/pci/Kconfig                             |   4 +-
 601 files changed, 3334 insertions(+), 3123 deletions(-)
 create mode 100644 drivers/media/platform/allegro-dvt/Kconfig
 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 (83%)
 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 (81%)
 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%)
 create mode 100644 drivers/media/platform/allwinner/sun8i-di/Kconfig
 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%)
 create mode 100644 drivers/media/platform/allwinner/sun8i-rotate/Kconfig
 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
 create mode 100644 drivers/media/platform/amlogic/meson-ge2d/Kconfig
 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%)
 create mode 100644 drivers/media/platform/amphion/Kconfig
 create mode 100644 drivers/media/platform/aspeed/Kconfig
 create mode 100644 drivers/media/platform/aspeed/Makefile
 rename drivers/media/platform/{ => aspeed}/aspeed-video.c (100%)
 create mode 100644 drivers/media/platform/chips-media/Kconfig
 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%)
 delete mode 100644 drivers/media/platform/imx/Kconfig
 delete mode 100644 drivers/media/platform/imx/Makefile
 create mode 100644 drivers/media/platform/intel/Kconfig
 create mode 100644 drivers/media/platform/intel/Makefile
 rename drivers/media/platform/{ => intel}/pxa_camera.c (100%)
 rename drivers/media/platform/{marvell-ccic => marvell}/Kconfig (85%)
 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
 create mode 100644 drivers/media/platform/mediatek/jpeg/Kconfig
 rename drivers/media/platform/{mtk-jpeg => mediatek/jpeg}/Makefile (100%)
 rename drivers/media/platform/{mtk-jpeg => mediatek/jpeg}/mtk_jpeg_core.c (100%)
 rename drivers/media/platform/{mtk-jpeg => mediatek/jpeg}/mtk_jpeg_core.h (100%)
 rename drivers/media/platform/{mtk-jpeg => mediatek/jpeg}/mtk_jpeg_dec_hw.c (100%)
 rename drivers/media/platform/{mtk-jpeg => mediatek/jpeg}/mtk_jpeg_dec_hw.h (100%)
 rename drivers/media/platform/{mtk-jpeg => mediatek/jpeg}/mtk_jpeg_dec_parse.c (100%)
 rename drivers/media/platform/{mtk-jpeg => mediatek/jpeg}/mtk_jpeg_dec_parse.h (100%)
 rename drivers/media/platform/{mtk-jpeg => mediatek/jpeg}/mtk_jpeg_dec_reg.h (100%)
 rename drivers/media/platform/{mtk-jpeg => mediatek/jpeg}/mtk_jpeg_enc_hw.c (100%)
 rename drivers/media/platform/{mtk-jpeg => mediatek/jpeg}/mtk_jpeg_enc_hw.h (100%)
 create mode 100644 drivers/media/platform/mediatek/mdp/Kconfig
 rename drivers/media/platform/{mtk-mdp => mediatek/mdp}/Makefile (78%)
 rename drivers/media/platform/{mtk-mdp => mediatek/mdp}/mtk_mdp_comp.c (100%)
 rename drivers/media/platform/{mtk-mdp => mediatek/mdp}/mtk_mdp_comp.h (100%)
 rename drivers/media/platform/{mtk-mdp => mediatek/mdp}/mtk_mdp_core.c (100%)
 rename drivers/media/platform/{mtk-mdp => mediatek/mdp}/mtk_mdp_core.h (100%)
 rename drivers/media/platform/{mtk-mdp => mediatek/mdp}/mtk_mdp_ipi.h (100%)
 rename drivers/media/platform/{mtk-mdp => mediatek/mdp}/mtk_mdp_m2m.c (100%)
 rename drivers/media/platform/{mtk-mdp => mediatek/mdp}/mtk_mdp_m2m.h (100%)
 rename drivers/media/platform/{mtk-mdp => mediatek/mdp}/mtk_mdp_regs.c (100%)
 rename drivers/media/platform/{mtk-mdp => mediatek/mdp}/mtk_mdp_regs.h (100%)
 rename drivers/media/platform/{mtk-mdp => mediatek/mdp}/mtk_mdp_vpu.c (100%)
 rename drivers/media/platform/{mtk-mdp => mediatek/mdp}/mtk_mdp_vpu.h (100%)
 create mode 100644 drivers/media/platform/mediatek/vcodec/Kconfig
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/Makefile (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_dec.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_dec.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_dec_drv.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_dec_hw.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_dec_hw.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_dec_pm.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_dec_pm.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_dec_stateful.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_dec_stateless.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_drv.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_enc.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_enc.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_enc_drv.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_enc_pm.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_enc_pm.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_fw.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_fw.h (97%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_fw_priv.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_fw_scp.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_fw_vpu.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_intr.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_intr.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_util.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/mtk_vcodec_util.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/vdec/vdec_h264_if.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/vdec/vdec_h264_req_if.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/vdec/vdec_vp8_if.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/vdec/vdec_vp9_if.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/vdec_drv_base.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/vdec_drv_if.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/vdec_drv_if.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/vdec_ipi_msg.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/vdec_msg_queue.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/vdec_msg_queue.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/vdec_vpu_if.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/vdec_vpu_if.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/venc/venc_h264_if.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/venc/venc_vp8_if.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/venc_drv_base.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/venc_drv_if.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/venc_drv_if.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/venc_ipi_msg.h (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/venc_vpu_if.c (100%)
 rename drivers/media/platform/{mtk-vcodec => mediatek/vcodec}/venc_vpu_if.h (100%)
 create mode 100644 drivers/media/platform/mediatek/vpu/Kconfig
 rename drivers/media/platform/{mtk-vpu => mediatek/vpu}/Makefile (100%)
 rename drivers/media/platform/{mtk-vpu => mediatek/vpu}/mtk_vpu.c (100%)
 rename drivers/media/platform/{mtk-vpu => mediatek/vpu}/mtk_vpu.h (100%)
 create mode 100644 drivers/media/platform/nvidia/Kconfig
 create mode 100644 drivers/media/platform/nvidia/Makefile
 create mode 100644 drivers/media/platform/nvidia/tegra-vde/Kconfig
 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%)
 create mode 100644 drivers/media/platform/nxp/Kconfig
 create mode 100644 drivers/media/platform/nxp/Makefile
 rename drivers/media/platform/{ => nxp}/fsl-viu.c (100%)
 rename drivers/media/platform/{ => nxp}/imx-jpeg/Kconfig (85%)
 rename drivers/media/platform/{ => nxp}/imx-jpeg/Makefile (100%)
 rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.c (100%)
 rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.h (100%)
 rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg.c (99%)
 rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg.h (100%)
 rename drivers/media/platform/{imx => nxp}/imx-mipi-csis.c (100%)
 rename drivers/media/platform/{ => nxp}/imx-pxp.c (100%)
 rename drivers/media/platform/{ => nxp}/imx-pxp.h (100%)
 rename drivers/media/platform/{ => nxp}/mx2_emmaprp.c (100%)
 create mode 100644 drivers/media/platform/qcom/Kconfig
 create mode 100644 drivers/media/platform/qcom/Makefile
 create mode 100644 drivers/media/platform/qcom/camss/Kconfig
 create mode 100644 drivers/media/platform/qcom/venus/Kconfig
 create mode 100644 drivers/media/platform/renesas/Kconfig
 create mode 100644 drivers/media/platform/renesas/Makefile
 rename drivers/media/platform/{ => renesas}/rcar-fcp.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar-isp.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar-vin/Kconfig (87%)
 rename drivers/media/platform/{ => renesas}/rcar-vin/Makefile (100%)
 rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-core.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-csi2.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-dma.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-v4l2.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-vin.h (100%)
 rename drivers/media/platform/{ => renesas}/rcar_drif.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar_fdp1.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar_jpu.c (99%)
 rename drivers/media/platform/{ => renesas}/renesas-ceu.c (100%)
 rename drivers/media/platform/{ => renesas}/sh_vou.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/Makefile (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_brx.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_brx.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_clu.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_clu.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_dl.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_dl.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_drm.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_drm.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_drv.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_entity.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_entity.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_hgo.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_hgo.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_hgt.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_hgt.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_histo.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_histo.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_hsit.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_hsit.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_lif.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_lif.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_lut.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_lut.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_pipe.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_pipe.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_regs.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_rpf.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_rwpf.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_rwpf.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_sru.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_sru.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_uds.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_uds.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_uif.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_uif.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_video.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_video.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_wpf.c (100%)
 create mode 100644 drivers/media/platform/rockchip/Kconfig
 create mode 100644 drivers/media/platform/rockchip/Makefile
 create mode 100644 drivers/media/platform/rockchip/rga/Kconfig
 create mode 100644 drivers/media/platform/rockchip/rkisp1/Kconfig
 create mode 100644 drivers/media/platform/samsung/Kconfig
 create mode 100644 drivers/media/platform/samsung/Makefile
 create mode 100644 drivers/media/platform/samsung/exynos-gsc/Kconfig
 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 (96%)
 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%)
 create mode 100644 drivers/media/platform/samsung/s3c-camif/Kconfig
 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%)
 create mode 100644 drivers/media/platform/samsung/s5p-g2d/Kconfig
 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%)
 create mode 100644 drivers/media/platform/samsung/s5p-jpeg/Kconfig
 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%)
 create mode 100644 drivers/media/platform/samsung/s5p-mfc/Kconfig
 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/stm/Kconfig
 create mode 100644 drivers/media/platform/stm/Makefile
 create mode 100644 drivers/media/platform/stm/sti/Kconfig
 create mode 100644 drivers/media/platform/stm/sti/Makefile
 create mode 100644 drivers/media/platform/stm/sti/bdisp/Kconfig
 rename drivers/media/platform/{ => stm}/sti/bdisp/Makefile (100%)
 rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-debug.c (100%)
 rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-filter.h (100%)
 rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-hw.c (100%)
 rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-reg.h (100%)
 rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-v4l2.c (100%)
 rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp.h (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/Kconfig (96%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/Makefile (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-common.c (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-common.h (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-core.c (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-core.h (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-debugfs.c (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-debugfs.h (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.c (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.h (100%)
 create mode 100644 drivers/media/platform/stm/sti/delta/Kconfig
 rename drivers/media/platform/{ => stm}/sti/delta/Makefile (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-cfg.h (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-debug.c (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-debug.h (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-ipc.c (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-ipc.h (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-mem.c (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-mem.h (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg-dec.c (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg-fw.h (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg-hdr.c (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg.h (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-v4l2.c (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta.h (100%)
 create mode 100644 drivers/media/platform/stm/sti/hva/Kconfig
 rename drivers/media/platform/{ => stm}/sti/hva/Makefile (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva-debugfs.c (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva-h264.c (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva-hw.c (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva-hw.h (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva-mem.c (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva-mem.h (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva-v4l2.c (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva.h (100%)
 create mode 100644 drivers/media/platform/stm/stm32/Kconfig
 rename drivers/media/platform/{ => stm}/stm32/Makefile (100%)
 rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d-hw.c (100%)
 rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d-regs.h (100%)
 rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d.c (100%)
 rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d.h (100%)
 rename drivers/media/platform/{ => stm}/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 (88%)
 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%)
 create mode 100644 drivers/media/platform/ti/cal/Makefile
 rename drivers/media/platform/{ti-vpe => ti/cal}/cal-camerarx.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/cal}/cal-video.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/cal}/cal.c (100%)
 rename drivers/media/platform/{ti-vpe => ti/cal}/cal.h (100%)
 rename drivers/media/platform/{ti-vpe => ti/cal}/cal_regs.h (100%)
 rename drivers/media/platform/{ => ti}/davinci/Kconfig (90%)
 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 (89%)
 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%)
 create mode 100644 drivers/media/platform/ti/omap3isp/Kconfig
 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}/Makefile (78%)
 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%)
 create mode 100644 drivers/media/platform/via/Kconfig
 create mode 100644 drivers/media/platform/via/Makefile
 rename drivers/media/platform/{ => via}/via-camera.c (100%)
 rename drivers/media/platform/{ => via}/via-camera.h (100%)
 rename drivers/media/tuners/{tuner-xc2028-types.h => xc2028-types.h} (96%)
 rename drivers/media/tuners/{tuner-xc2028.c => xc2028.c} (99%)
 rename drivers/media/tuners/{tuner-xc2028.h => xc2028.h} (99%)
Signature · 1 line
2.35.1
author maintainer
#1 lore raw

PATCH v2 1/67 media: xc2028: rename the driver from tuner-xc2028

This is the only tuner driver that has "tuner-" on its name.

Rename it, in order to match all the other tuner drivers.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 Documentation/admin-guide/media/i2c-cardlist.rst            | 2 +-
 MAINTAINERS                                                 | 2 +-
 drivers/media/pci/cx18/cx18-driver.c                        | 2 +-
 drivers/media/pci/cx18/cx18-dvb.c                           | 2 +-
 drivers/media/pci/cx18/cx18-gpio.c                          | 2 +-
 drivers/media/pci/cx23885/cx23885-cards.c                   | 2 +-
 drivers/media/pci/cx23885/cx23885-dvb.c                     | 2 +-
 drivers/media/pci/cx23885/cx23885-video.c                   | 2 +-
 drivers/media/pci/cx88/cx88.h                               | 2 +-
 drivers/media/pci/ivtv/ivtv-driver.c                        | 2 +-
 drivers/media/pci/ivtv/ivtv-gpio.c                          | 2 +-
 drivers/media/pci/saa7134/saa7134-cards.c                   | 2 +-
 drivers/media/pci/saa7134/saa7134-dvb.c                     | 2 +-
 drivers/media/tuners/Makefile                               | 2 +-
 drivers/media/tuners/tuner-types.c                          | 2 +-
 .../media/tuners/{tuner-xc2028-types.h => xc2028-types.h}   | 6 +++---
 drivers/media/tuners/{tuner-xc2028.c => xc2028.c}           | 6 +++---
 drivers/media/tuners/{tuner-xc2028.h => xc2028.h}           | 2 +-
 drivers/media/tuners/xc4000.c                               | 2 +-
 drivers/media/usb/dvb-usb/cxusb.c                           | 2 +-
 drivers/media/usb/dvb-usb/dib0700_devices.c                 | 2 +-
 drivers/media/usb/em28xx/em28xx-i2c.c                       | 2 +-
 drivers/media/usb/em28xx/em28xx.h                           | 2 +-
 drivers/media/usb/tm6000/tm6000-cards.c                     | 2 +-
 drivers/media/usb/tm6000/tm6000-dvb.c                       | 2 +-
 drivers/media/usb/tm6000/tm6000-i2c.c                       | 2 +-
 drivers/media/v4l2-core/tuner-core.c                        | 2 +-
 27 files changed, 31 insertions(+), 31 deletions(-)
 rename drivers/media/tuners/{tuner-xc2028-types.h => xc2028-types.h} (96%)
 rename drivers/media/tuners/{tuner-xc2028.c => xc2028.c} (99%)
 rename drivers/media/tuners/{tuner-xc2028.h => xc2028.h} (99%)
Documentation/admin-guide/media/i2c-cardlist.rst +1 -1
index db17f39b56cf..ef3b5fff3b01 100644
@@ -284,7 +284,7 @@ tda9887       TDA 9885/6/7 analog IF demodulator
 tea5761       TEA 5761 radio tuner
 tea5767       TEA 5767 radio tuner
 tua9001       Infineon TUA9001 silicon tuner
-tuner-xc2028  XCeive xc2028/xc3028 tuners
+xc2028        XCeive xc2028/xc3028 tuners
 xc4000        Xceive XC4000 silicon tuner
 xc5000        Xceive XC5000 silicon tuner
 ============  ==================================================
MAINTAINERS +1 -1
index ae55cd558d95..1a9fb0615925 100644
@@ -21049,7 +21049,7 @@ L:	[email protected]
 S:	Maintained
 W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
-F:	drivers/media/tuners/tuner-xc2028.*
+F:	drivers/media/tuners/xc2028.*
 
 XDP (eXpress Data Path)
 M:	Alexei Starovoitov <[email protected]>
drivers/media/pci/cx18/cx18-driver.c +1 -1
index 1be9672ae9d4..84260972c343 100644
@@ -23,7 +23,7 @@
 #include "cx18-mailbox.h"
 #include "cx18-ioctl.h"
 #include "cx18-controls.h"
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 #include <linux/dma-mapping.h>
 #include <media/tveeprom.h>
 
drivers/media/pci/cx18/cx18-dvb.c +1 -1
index 4c57a294b9fa..33e5a5b5fab4 100644
@@ -22,7 +22,7 @@
 #include <linux/firmware.h>
 #include "mt352.h"
 #include "mt352_priv.h"
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
drivers/media/pci/cx18/cx18-gpio.c +1 -1
index cf7cfda94107..160c8377e352 100644
@@ -12,7 +12,7 @@
 #include "cx18-io.h"
 #include "cx18-cards.h"
 #include "cx18-gpio.h"
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 
 /********************* GPIO stuffs *********************/
 
drivers/media/pci/cx23885/cx23885-cards.c +1 -1
index 0160f909f38c..9244b4320558 100644
@@ -15,7 +15,7 @@
 #include <linux/firmware.h>
 #include <misc/altera.h>
 
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 #include "netup-eeprom.h"
 #include "netup-init.h"
 #include "altera-ci.h"
drivers/media/pci/cx23885/cx23885-dvb.c +1 -1
index 45c2f4afceb8..8fd5b6ef2428 100644
@@ -28,7 +28,7 @@
 #include "xc5000.h"
 #include "max2165.h"
 #include "tda10048.h"
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 #include "tuner-simple.h"
 #include "dib7000p.h"
 #include "dib0070.h"
drivers/media/pci/cx23885/cx23885-video.c +1 -1
index a380e0920a21..3d03f5e95786 100644
@@ -24,7 +24,7 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-event.h>
 #include "cx23885-ioctl.h"
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 
 #include <media/drv-intf/cx25840.h>
 
drivers/media/pci/cx88/cx88.h +1 -1
index ce4acf6de6aa..2ff3226a52ec 100644
@@ -28,7 +28,7 @@
 #include <media/i2c/wm8775.h>
 
 #include "cx88-reg.h"
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 
 #include <linux/mutex.h>
 
drivers/media/pci/ivtv/ivtv-driver.c +1 -1
index 57d4d5485d7a..f5846c22c799 100644
@@ -57,7 +57,7 @@
 #include <linux/dma-mapping.h>
 #include <media/tveeprom.h>
 #include <media/i2c/saa7115.h>
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 #include <uapi/linux/sched/types.h>
 
 /* If you have already X v4l cards, then set this to X. This way
drivers/media/pci/ivtv/ivtv-gpio.c +1 -1
index 856e7ab7f33e..6434c0d03a6d 100644
@@ -10,7 +10,7 @@
 #include "ivtv-driver.h"
 #include "ivtv-cards.h"
 #include "ivtv-gpio.h"
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 #include <media/tuner.h>
 #include <media/v4l2-ctrls.h>
 
drivers/media/pci/saa7134/saa7134-cards.c +1 -1
index 0d82a4b27d5b..99be59af3560 100644
@@ -15,7 +15,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 #include <media/v4l2-common.h>
 #include <media/tveeprom.h>
 #include "tea5767.h"
drivers/media/pci/saa7134/saa7134-dvb.c +1 -1
index d17a1b15faee..9c6cfef03331 100644
@@ -26,7 +26,7 @@
 #include "mt352_priv.h" /* FIXME */
 #include "tda1004x.h"
 #include "nxt200x.h"
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 #include "xc5000.h"
 
 #include "tda10086.h"
drivers/media/tuners/Makefile +1 -1
index 7b4f8423501e..abcad519a4f9 100644
@@ -5,7 +5,7 @@
 
 tda18271-objs := tda18271-maps.o tda18271-common.o tda18271-fe.o
 
-obj-$(CONFIG_MEDIA_TUNER_XC2028) += tuner-xc2028.o
+obj-$(CONFIG_MEDIA_TUNER_XC2028) += xc2028.o
 obj-$(CONFIG_MEDIA_TUNER_SIMPLE) += tuner-simple.o
 # tuner-types will be merged into tuner-simple, in the future
 obj-$(CONFIG_MEDIA_TUNER_SIMPLE) += tuner-types.o
drivers/media/tuners/tuner-types.c +1 -1
index 0ed2c5bc082e..ff5a6c0acdd4 100644
@@ -1831,7 +1831,7 @@ struct tunertype tuners[] = {
 	},
 	[TUNER_XC2028] = { /* Xceive 2028 */
 		.name   = "Xceive xc2028/xc3028 tuner",
-		/* see tuner-xc2028.c for details */
+		/* see xc2028.c for details */
 	},
 	[TUNER_THOMSON_FE6600] = { /* Thomson PAL / DVB-T */
 		.name   = "Thomson FE6600",
drivers/media/tuners/xc2028-types.h renamed from drivers/media/tuners/tuner-xc2028-types.h +3 -3
similarity index 96%
rename from drivers/media/tuners/tuner-xc2028-types.h
rename to drivers/media/tuners/xc2028-types.h
index fcca39d3e006..63a03de1e97b 100644
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * tuner-xc2028_types
+ * xc2028_types
  *
- * This file includes internal tipes to be used inside tuner-xc2028.
- * Shouldn't be included outside tuner-xc2028
+ * This file includes internal tipes to be used inside xc2028.
+ * Shouldn't be included outside xc2028
  *
  * Copyright (c) 2007-2008 Mauro Carvalho Chehab <[email protected]>
  */
drivers/media/tuners/xc2028.c renamed from drivers/media/tuners/tuner-xc2028.c +3 -3
similarity index 99%
rename from drivers/media/tuners/tuner-xc2028.c
rename to drivers/media/tuners/xc2028.c
index 574c3bb135d7..69c2e1b99bf1 100644
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
-// tuner-xc2028
+// xc2028
 //
 // Copyright (c) 2007-2008 Mauro Carvalho Chehab <[email protected]>
 //
@@ -16,8 +16,8 @@
 #include <linux/slab.h>
 #include <asm/unaligned.h>
 #include "tuner-i2c.h"
-#include "tuner-xc2028.h"
-#include "tuner-xc2028-types.h"
+#include "xc2028.h"
+#include "xc2028-types.h"
 
 #include <linux/dvb/frontend.h>
 #include <media/dvb_frontend.h>
drivers/media/tuners/xc2028.h renamed from drivers/media/tuners/tuner-xc2028.h +1 -1
similarity index 99%
rename from drivers/media/tuners/tuner-xc2028.h
rename to drivers/media/tuners/xc2028.h
index 2dd45d0765d7..072faae7a954 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * tuner-xc2028
+ * xc2028
  *
  * Copyright (c) 2007-2008 Mauro Carvalho Chehab <[email protected]>
  */
drivers/media/tuners/xc4000.c +1 -1
index d9606738ce43..a04dfd5799f7 100644
@@ -22,7 +22,7 @@
 
 #include "xc4000.h"
 #include "tuner-i2c.h"
-#include "tuner-xc2028-types.h"
+#include "xc2028-types.h"
 
 static int debug;
 module_param(debug, int, 0644);
drivers/media/usb/dvb-usb/cxusb.c +1 -1
index 7707de7bae7c..265b960db499 100644
@@ -35,7 +35,7 @@
 #include "mt352.h"
 #include "mt352_priv.h"
 #include "zl10353.h"
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 #include "tuner-simple.h"
 #include "mxl5005s.h"
 #include "max2165.h"
drivers/media/usb/dvb-usb/dib0700_devices.c +1 -1
index 710c1afe3e85..08fcf120daf1 100644
@@ -12,7 +12,7 @@
 #include "dib9000.h"
 #include "mt2060.h"
 #include "mt2266.h"
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 #include "xc5000.h"
 #include "xc4000.h"
 #include "s5h1411.h"
drivers/media/usb/em28xx/em28xx-i2c.c +1 -1
index 255395959255..b9a8d3fbad1a 100644
@@ -26,7 +26,7 @@
 #include <linux/i2c.h>
 #include <linux/jiffies.h>
 
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
 
drivers/media/usb/em28xx/em28xx.h +1 -1
index ab167cd1f400..7fc0b68a4a22 100644
@@ -41,7 +41,7 @@
 #include <media/v4l2-fh.h>
 #include <media/i2c/ir-kbd-i2c.h>
 #include <media/rc-core.h>
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 #include "xc5000.h"
 #include "em28xx-reg.h"
 
drivers/media/usb/tm6000/tm6000-cards.c +1 -1
index 5358cd8c4603..98f4a63adc2a 100644
@@ -17,7 +17,7 @@
 
 #include "tm6000.h"
 #include "tm6000-regs.h"
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 #include "xc5000.h"
 
 #define TM6000_BOARD_UNKNOWN			0
drivers/media/usb/tm6000/tm6000-dvb.c +1 -1
index 4990fa886d7a..8c2725e4105b 100644
@@ -16,7 +16,7 @@
 
 #include <media/tuner.h>
 
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 #include "xc5000.h"
 
 MODULE_DESCRIPTION("DVB driver extension module for tm5600/6000/6010 based TV cards");
drivers/media/usb/tm6000/tm6000-i2c.c +1 -1
index b37782d6f79c..7554b93b82e6 100644
@@ -15,7 +15,7 @@
 #include "tm6000-regs.h"
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 
 
 /* ----------------------------------------------------------- */
drivers/media/v4l2-core/tuner-core.c +1 -1
index 12d1e0c33c3c..ad9224a18853 100644
@@ -35,7 +35,7 @@
 #include "tda8290.h"
 #include "tea5761.h"
 #include "tea5767.h"
-#include "tuner-xc2028.h"
+#include "xc2028.h"
 #include "tuner-simple.h"
 #include "tda9887.h"
 #include "xc5000.h"
Signature · 1 line
2.35.1
author maintainer
#2 lore raw

PATCH v2 2/67 media: Makefiles: remove extra spaces

In reply to Mauro Carvalho Chehab

It is hard to keep all those options aligned as newer config changes get added, and we really don't want to have patches adding new options also touching already existing entries.

So, drop the extra spaces.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/Makefile              |  4 +-
 drivers/media/cec/platform/Makefile | 16 ++---
 drivers/media/firewire/Makefile     |  2 +-
 drivers/media/i2c/Makefile          | 92 ++++++++++++++---------------
 drivers/media/test-drivers/Makefile | 10 ++--
 drivers/media/usb/Makefile          | 14 ++---
 drivers/media/usb/gspca/Makefile    | 88 +++++++++++++--------------
 7 files changed, 113 insertions(+), 113 deletions(-)
drivers/media/Makefile +2 -2
index d18357bf1346..20fac24e4f0f 100644
@@ -8,7 +8,7 @@
 # when compiled as builtin drivers
 #
 obj-y += i2c/ tuners/
-obj-$(CONFIG_DVB_CORE)  += dvb-frontends/
+obj-$(CONFIG_DVB_CORE) += dvb-frontends/
 
 #
 # Now, let's link-in the media controller core
@@ -18,7 +18,7 @@ ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
 endif
 
 obj-$(CONFIG_VIDEO_DEV) += v4l2-core/
-obj-$(CONFIG_DVB_CORE)  += dvb-core/
+obj-$(CONFIG_DVB_CORE) += dvb-core/
 
 # There are both core and drivers at RC subtree - merge before drivers
 obj-y += rc/
drivers/media/cec/platform/Makefile +8 -8
index ea6f8ee8161c..26d2bc778394 100644
@@ -4,12 +4,12 @@
 #
 
 # Please keep it in alphabetic order
-obj-$(CONFIG_CEC_CROS_EC)	+= cros-ec/
-obj-$(CONFIG_CEC_GPIO)		+= cec-gpio/
-obj-$(CONFIG_CEC_MESON_AO)	+= meson/
-obj-$(CONFIG_CEC_SAMSUNG_S5P)	+= s5p/
-obj-$(CONFIG_CEC_SECO)		+= seco/
-obj-$(CONFIG_CEC_STI)		+= sti/
-obj-$(CONFIG_CEC_STM32)		+= stm32/
-obj-$(CONFIG_CEC_TEGRA)		+= tegra/
+obj-$(CONFIG_CEC_CROS_EC) += cros-ec/
+obj-$(CONFIG_CEC_GPIO) += cec-gpio/
+obj-$(CONFIG_CEC_MESON_AO) += meson/
+obj-$(CONFIG_CEC_SAMSUNG_S5P) += s5p/
+obj-$(CONFIG_CEC_SECO) += seco/
+obj-$(CONFIG_CEC_STI) += sti/
+obj-$(CONFIG_CEC_STM32) += stm32/
+obj-$(CONFIG_CEC_TEGRA) += tegra/
 
drivers/media/firewire/Makefile +1 -1
index 3670c85af6f5..d5551e6389bf 100644
@@ -2,4 +2,4 @@
 obj-$(CONFIG_DVB_FIREDTV) += firedtv.o
 
 firedtv-y += firedtv-avc.o firedtv-ci.o firedtv-dvb.o firedtv-fe.o firedtv-fw.o
-firedtv-$(CONFIG_DVB_FIREDTV_INPUT)    += firedtv-rc.o
+firedtv-$(CONFIG_DVB_FIREDTV_INPUT) += firedtv-rc.o
drivers/media/i2c/Makefile +46 -46

116 lines not on this page · raw message

drivers/media/test-drivers/Makefile +5 -5
index 9f0e4ebb2efe..1e64e05c1f22 100644
@@ -3,8 +3,8 @@
 # Makefile for the test drivers.
 #
 
-obj-$(CONFIG_VIDEO_VIMC)		+= vimc/
-obj-$(CONFIG_VIDEO_VIVID)		+= vivid/
-obj-$(CONFIG_VIDEO_VIM2M)		+= vim2m.o
-obj-$(CONFIG_VIDEO_VICODEC)		+= vicodec/
-obj-$(CONFIG_DVB_VIDTV)			+= vidtv/
+obj-$(CONFIG_VIDEO_VIMC) += vimc/
+obj-$(CONFIG_VIDEO_VIVID) += vivid/
+obj-$(CONFIG_VIDEO_VIM2M) += vim2m.o
+obj-$(CONFIG_VIDEO_VICODEC) += vicodec/
+obj-$(CONFIG_DVB_VIDTV) += vidtv/
drivers/media/usb/Makefile +7 -7
index 3eaff3149ef4..65521f4921e3 100644
@@ -7,15 +7,15 @@
 obj-y += ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/
 obj-y += zr364xx/ stkwebcam/ s2255/
 
-obj-$(CONFIG_USB_VIDEO_CLASS)	+= uvc/
-obj-$(CONFIG_USB_GSPCA)         += gspca/
-obj-$(CONFIG_USB_PWC)           += pwc/
-obj-$(CONFIG_USB_AIRSPY)        += airspy/
-obj-$(CONFIG_USB_HACKRF)        += hackrf/
-obj-$(CONFIG_USB_MSI2500)       += msi2500/
+obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/
+obj-$(CONFIG_USB_GSPCA) += gspca/
+obj-$(CONFIG_USB_PWC) += pwc/
+obj-$(CONFIG_USB_AIRSPY) += airspy/
+obj-$(CONFIG_USB_HACKRF) += hackrf/
+obj-$(CONFIG_USB_MSI2500) += msi2500/
 obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
 obj-$(CONFIG_VIDEO_AU0828) += au0828/
-obj-$(CONFIG_VIDEO_HDPVR)	+= hdpvr/
+obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/
 obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
 obj-$(CONFIG_VIDEO_STK1160) += stk1160/
 obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
drivers/media/usb/gspca/Makefile +44 -44

101 lines not on this page · raw message

Signature · 1 line
2.35.1
author maintainer
#3 lore raw

PATCH v2 3/67 media: Makefiles: sort entries where it fits

In reply to Mauro Carvalho Chehab

Alphabetically sort entries at the Makefiles per group, in ASCII order, e. g., using the output of:

	$ LC_ALL=C sort Makefile |grep obj-y
	...
	$ LC_ALL=C sort Makefile |grep obj.*CONFIG
	...

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/common/Makefile           |   7 +-
 drivers/media/common/videobuf2/Makefile |   8 +-
 drivers/media/dvb-frontends/Makefile    | 193 ++++++++++++------------
 drivers/media/i2c/Makefile              | 184 +++++++++++-----------
 drivers/media/pci/Makefile              |  22 ++-
 drivers/media/radio/Makefile            |  43 +++---
 drivers/media/rc/Makefile               |  47 +++---
 drivers/media/rc/keymaps/Makefile       |  34 +++--
 drivers/media/spi/Makefile              |   7 +-
 drivers/media/test-drivers/Makefile     |  10 +-
 drivers/media/tuners/Makefile           |  66 ++++----
 drivers/media/usb/Makefile              |  32 ++--
 drivers/media/v4l2-core/Makefile        |  34 +++--
 13 files changed, 366 insertions(+), 321 deletions(-)
drivers/media/common/Makefile +5 -2
index 55b5a1900124..ad0b1e95fb12 100644
@@ -1,6 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-y += b2c2/ saa7146/ siano/ v4l2-tpg/ videobuf2/
-obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
-obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
+
+# Please keep it alphabetically sorted by Kconfig name
+# (e. g. LC_ALL=C sort Makefile)
 obj-$(CONFIG_CYPRESS_FIRMWARE) += cypress_firmware.o
 obj-$(CONFIG_TTPCI_EEPROM) += ttpci-eeprom.o
+obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
+obj-$(CONFIG_VIDEO_TVEEPROM) += tveeprom.o
drivers/media/common/videobuf2/Makefile +5 -3
index 54306f8d096c..a6fe3f304685 100644
@@ -6,10 +6,12 @@ ifeq ($(CONFIG_TRACEPOINTS),y)
   videobuf2-common-objs += vb2-trace.o
 endif
 
+# Please keep it alphabetically sorted by Kconfig name
+# (e. g. LC_ALL=C sort Makefile)
 obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-common.o
-obj-$(CONFIG_VIDEOBUF2_V4L2) += videobuf2-v4l2.o
-obj-$(CONFIG_VIDEOBUF2_MEMOPS) += videobuf2-memops.o
-obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o
 obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o
 obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o
 obj-$(CONFIG_VIDEOBUF2_DVB) += videobuf2-dvb.o
+obj-$(CONFIG_VIDEOBUF2_MEMOPS) += videobuf2-memops.o
+obj-$(CONFIG_VIDEOBUF2_V4L2) += videobuf2-v4l2.o
+obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o
drivers/media/dvb-frontends/Makefile +98 -95

224 lines not on this page · raw message

drivers/media/i2c/Makefile +92 -92

217 lines not on this page · raw message

drivers/media/pci/Makefile +14 -8
index 984fa247096d..551169a3e434 100644
@@ -3,6 +3,8 @@
 # Makefile for the kernel multimedia device drivers.
 #
 
+# Please keep it alphabetically sorted by directory
+# (e. g. LC_ALL=C sort Makefile)
 obj-y        +=	ttpci/		\
 		b2c2/		\
 		pluto2/		\
@@ -17,19 +19,23 @@ obj-y        +=	ttpci/		\
 		netup_unidvb/	\
 		intel/
 
-obj-$(CONFIG_VIDEO_IVTV) += ivtv/
+# Please keep it alphabetically sorted by Kconfig name
+# (e. g. LC_ALL=C sort Makefile)
+
+obj-$(CONFIG_STA2X11_VIP) += sta2x11/
+
+obj-$(CONFIG_VIDEO_BT848) += bt8xx/
+obj-$(CONFIG_VIDEO_COBALT) += cobalt/
 obj-$(CONFIG_VIDEO_CX18) += cx18/
 obj-$(CONFIG_VIDEO_CX23885) += cx23885/
 obj-$(CONFIG_VIDEO_CX25821) += cx25821/
 obj-$(CONFIG_VIDEO_CX88) += cx88/
-obj-$(CONFIG_VIDEO_BT848) += bt8xx/
-obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
-obj-$(CONFIG_VIDEO_SAA7164) += saa7164/
-obj-$(CONFIG_VIDEO_TW68) += tw68/
-obj-$(CONFIG_VIDEO_TW686X) += tw686x/
 obj-$(CONFIG_VIDEO_DT3155) += dt3155/
+obj-$(CONFIG_VIDEO_IVTV) += ivtv/
 obj-$(CONFIG_VIDEO_MEYE) += meye/
-obj-$(CONFIG_STA2X11_VIP) += sta2x11/
+obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
+obj-$(CONFIG_VIDEO_SAA7164) += saa7164/
 obj-$(CONFIG_VIDEO_SOLO6X10) += solo6x10/
-obj-$(CONFIG_VIDEO_COBALT) += cobalt/
 obj-$(CONFIG_VIDEO_TW5864) += tw5864/
+obj-$(CONFIG_VIDEO_TW686X) += tw686x/
+obj-$(CONFIG_VIDEO_TW68) += tw68/
drivers/media/radio/Makefile +23 -20

59 lines not on this page · raw message

drivers/media/rc/Makefile +26 -21

77 lines not on this page · raw message

drivers/media/rc/keymaps/Makefile +19 -15
index 5fe5c9e1a46d..f513ff5caf4e 100644
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
+
+# Please keep keymaps alphabetically sorted by directory name
+#(e. g. LC_ALL=C sort Makefile)
+obj-$(CONFIG_RC_MAP) += \
+			rc-adstech-dvb-t-pci.o \
 			rc-alink-dtu-m.o \
 			rc-anysee.o \
 			rc-apac-viewcomp.o \
@@ -9,17 +13,17 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
 			rc-ati-tv-wonder-hd-600.o \
 			rc-ati-x10.o \
 			rc-avermedia-a16d.o \
-			rc-avermedia.o \
 			rc-avermedia-cardbus.o \
 			rc-avermedia-dvbt.o \
 			rc-avermedia-m135a.o \
 			rc-avermedia-m733a-rm-k6.o \
+			rc-avermedia.o \
 			rc-avermedia-rm-ks.o \
 			rc-avertv-303.o \
 			rc-azurewave-ad-tu700.o \
 			rc-beelink-gs1.o \
-			rc-behold.o \
 			rc-behold-columbus.o \
+			rc-behold.o \
 			rc-budget-ci-old.o \
 			rc-cinergy-1400.o \
 			rc-cinergy.o \
@@ -39,8 +43,8 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
 			rc-dvico-portable.o \
 			rc-em-terratec.o \
 			rc-encore-enltv2.o \
-			rc-encore-enltv.o \
 			rc-encore-enltv-fm53.o \
+			rc-encore-enltv.o \
 			rc-evga-indtube.o \
 			rc-eztv.o \
 			rc-flydvb.o \
@@ -50,6 +54,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
 			rc-geekbox.o \
 			rc-genius-tvgo-a11mce.o \
 			rc-gotview7135.o \
+			rc-hauppauge.o \
 			rc-hisi-poplar.o \
 			rc-hisi-tv-demo.o \
 			rc-imon-mce.o \
@@ -67,14 +72,14 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
 			rc-leadtek-y04g0051.o \
 			rc-lme2510.o \
 			rc-manli.o \
-			rc-mecool-kii-pro.o \
 			rc-mecool-kiii-pro.o \
-			rc-medion-x10.o \
+			rc-mecool-kii-pro.o \
 			rc-medion-x10-digitainer.o \
+			rc-medion-x10.o \
 			rc-medion-x10-or2x.o \
 			rc-minix-neo.o \
-			rc-msi-digivox-ii.o \
 			rc-msi-digivox-iii.o \
+			rc-msi-digivox-ii.o \
 			rc-msi-tvanywhere.o \
 			rc-msi-tvanywhere-plus.o \
 			rc-nebula.o \
@@ -87,20 +92,20 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
 			rc-pinnacle-color.o \
 			rc-pinnacle-grey.o \
 			rc-pinnacle-pctv-hd.o \
-			rc-pixelview.o \
-			rc-pixelview-mk12.o \
 			rc-pixelview-002t.o \
+			rc-pixelview-mk12.o \
 			rc-pixelview-new.o \
+			rc-pixelview.o \
 			rc-powercolor-real-angel.o \
 			rc-proteus-2309.o \
 			rc-purpletv.o \
 			rc-pv951.o \
-			rc-hauppauge.o \
 			rc-rc6-mce.o \
 			rc-real-audio-220-32-keys.o \
 			rc-reddo.o \
 			rc-snapstream-firefly.o \
 			rc-streamzap.o \
+			rc-su3000.o \
 			rc-tanix-tx3mini.o \
 			rc-tanix-tx5max.o \
 			rc-tbs-nec.o \
@@ -109,16 +114,16 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
 			rc-terratec-cinergy-c-pci.o \
 			rc-terratec-cinergy-s2-hd.o \
 			rc-terratec-cinergy-xs.o \
-			rc-terratec-slim.o \
 			rc-terratec-slim-2.o \
+			rc-terratec-slim.o \
 			rc-tevii-nec.o \
 			rc-tivo.o \
-			rc-total-media-in-hand.o \
 			rc-total-media-in-hand-02.o \
+			rc-total-media-in-hand.o \
 			rc-trekstor.o \
 			rc-tt-1500.o \
-			rc-twinhan-dtv-cab-ci.o \
 			rc-twinhan1027.o \
+			rc-twinhan-dtv-cab-ci.o \
 			rc-vega-s9x.o \
 			rc-videomate-m1f.o \
 			rc-videomate-s350.o \
@@ -128,8 +133,7 @@ obj-$(CONFIG_RC_MAP) += rc-adstech-dvb-t-pci.o \
 			rc-wetek-play2.o \
 			rc-winfast.o \
 			rc-winfast-usbii-deluxe.o \
-			rc-su3000.o \
+			rc-x96max.o \
 			rc-xbox-360.o \
 			rc-xbox-dvd.o \
-			rc-x96max.o \
 			rc-zx-irdec.o
drivers/media/spi/Makefile +5 -2
index 9f45787d680d..6ac7adc64124 100644
@@ -1,5 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_VIDEO_GS1662) += gs1662.o
-obj-$(CONFIG_CXD2880_SPI_DRV) += cxd2880-spi.o
 
 ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/cxd2880
+
+# Please keep it alphabetically sorted by Kconfig name
+# (e. g. LC_ALL=C sort Makefile)
+obj-$(CONFIG_CXD2880_SPI_DRV) += cxd2880-spi.o
+obj-$(CONFIG_VIDEO_GS1662) += gs1662.o
drivers/media/test-drivers/Makefile +7 -3
index 1e64e05c1f22..ff390b687189 100644
@@ -3,8 +3,12 @@
 # Makefile for the test drivers.
 #
 
+# Please keep it alphabetically sorted by Kconfig name
+# (e. g. LC_ALL=C sort Makefile)
+
+obj-$(CONFIG_DVB_VIDTV) += vidtv/
+
+obj-$(CONFIG_VIDEO_VICODEC) += vicodec/
+obj-$(CONFIG_VIDEO_VIM2M) += vim2m.o
 obj-$(CONFIG_VIDEO_VIMC) += vimc/
 obj-$(CONFIG_VIDEO_VIVID) += vivid/
-obj-$(CONFIG_VIDEO_VIM2M) += vim2m.o
-obj-$(CONFIG_VIDEO_VICODEC) += vicodec/
-obj-$(CONFIG_DVB_VIDTV) += vidtv/
drivers/media/tuners/Makefile +33 -33

79 lines not on this page · raw message

drivers/media/usb/Makefile +21 -11
index 65521f4921e3..044bd46c799c 100644
@@ -3,24 +3,34 @@
 # Makefile for the USB media device drivers
 #
 
-# DVB USB-only drivers
-obj-y += ttusb-dec/ ttusb-budget/ dvb-usb/ dvb-usb-v2/ siano/ b2c2/
-obj-y += zr364xx/ stkwebcam/ s2255/
+# DVB USB-only drivers. Please keep it alphabetically sorted by directory name
+# (e. g. LC_ALL=C sort Makefile)
+obj-y += b2c2/
+obj-y += dvb-usb/
+obj-y += dvb-usb-v2/
+obj-y += s2255/
+obj-y += siano/
+obj-y += stkwebcam/
+obj-y += ttusb-budget/
+obj-y += ttusb-dec/
+obj-y += zr364xx/
 
-obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/
-obj-$(CONFIG_USB_GSPCA) += gspca/
-obj-$(CONFIG_USB_PWC) += pwc/
+# Please keep it alphabetically sorted by Kconfig name
+# (e. g. LC_ALL=C sort Makefile)
+obj-$(CONFIG_DVB_AS102) += as102/
 obj-$(CONFIG_USB_AIRSPY) += airspy/
+obj-$(CONFIG_USB_GSPCA) += gspca/
 obj-$(CONFIG_USB_HACKRF) += hackrf/
 obj-$(CONFIG_USB_MSI2500) += msi2500/
-obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
+obj-$(CONFIG_USB_PWC) += pwc/
+obj-$(CONFIG_USB_VIDEO_CLASS) += uvc/
 obj-$(CONFIG_VIDEO_AU0828) += au0828/
+obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
+obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
+obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
+obj-$(CONFIG_VIDEO_GO7007) += go7007/
 obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/
 obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
 obj-$(CONFIG_VIDEO_STK1160) += stk1160/
-obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
 obj-$(CONFIG_VIDEO_TM6000) += tm6000/
-obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
 obj-$(CONFIG_VIDEO_USBTV) += usbtv/
-obj-$(CONFIG_VIDEO_GO7007) += go7007/
-obj-$(CONFIG_DVB_AS102) += as102/
drivers/media/v4l2-core/Makefile +18 -16
index 83fac5c746f5..1ec7e9cae1fa 100644
@@ -3,37 +3,39 @@
 # Makefile for the V4L2 core
 #
 
+ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
+ccflags-y += -I$(srctree)/drivers/media/tuners
+
 tuner-objs	:=	tuner-core.o
 
 videodev-objs	:=	v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-fh.o \
 			v4l2-event.o v4l2-subdev.o v4l2-common.o \
 			v4l2-ctrls-core.o v4l2-ctrls-api.o \
 			v4l2-ctrls-request.o v4l2-ctrls-defs.o
+
+# Please keep it alphabetically sorted by Kconfig name
+# (e. g. LC_ALL=C sort Makefile)
 videodev-$(CONFIG_COMPAT) += v4l2-compat-ioctl32.o
-videodev-$(CONFIG_TRACEPOINTS) += v4l2-trace.o
 videodev-$(CONFIG_MEDIA_CONTROLLER) += v4l2-mc.o
 videodev-$(CONFIG_SPI) += v4l2-spi.o
+videodev-$(CONFIG_TRACEPOINTS) += v4l2-trace.o
 videodev-$(CONFIG_VIDEO_V4L2_I2C) += v4l2-i2c.o
 
-obj-$(CONFIG_VIDEO_V4L2) += videodev.o
-obj-$(CONFIG_V4L2_FWNODE) += v4l2-fwnode.o
+# Please keep it alphabetically sorted by Kconfig name
+# (e. g. LC_ALL=C sort Makefile)
+
 obj-$(CONFIG_V4L2_ASYNC) += v4l2-async.o
-obj-$(CONFIG_VIDEO_V4L2) += v4l2-dv-timings.o
-
-obj-$(CONFIG_VIDEO_TUNER) += tuner.o
-
-obj-$(CONFIG_V4L2_MEM2MEM_DEV) += v4l2-mem2mem.o
-obj-$(CONFIG_V4L2_H264) += v4l2-h264.o
-obj-$(CONFIG_V4L2_VP9) += v4l2-vp9.o
-
 obj-$(CONFIG_V4L2_FLASH_LED_CLASS) += v4l2-flash-led-class.o
-
+obj-$(CONFIG_V4L2_FWNODE) += v4l2-fwnode.o
+obj-$(CONFIG_V4L2_H264) += v4l2-h264.o
 obj-$(CONFIG_V4L2_JPEG_HELPER) += v4l2-jpeg.o
+obj-$(CONFIG_V4L2_MEM2MEM_DEV) += v4l2-mem2mem.o
+obj-$(CONFIG_V4L2_VP9) += v4l2-vp9.o
 
-obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
-obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
 obj-$(CONFIG_VIDEOBUF_DMA_CONTIG) += videobuf-dma-contig.o
+obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
+obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
 obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o
 
-ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
-ccflags-y += -I$(srctree)/drivers/media/tuners
+obj-$(CONFIG_VIDEO_TUNER) += tuner.o
+obj-$(CONFIG_VIDEO_V4L2) += v4l2-dv-timings.o videodev.o
Signature · 1 line
2.35.1
author maintainer
#4 lore raw

PATCH v2 4/67 media: platform: Makefile: reorganize its contents

In reply to Mauro Carvalho Chehab

There are lots of inconsistencies here: some directories are included as-is, and others included using one (or more) symbols that are inside it. Also, its entries are not sorted.

That makes it harder to maintain.

Reorganize it by placing everything on alphabetic order and providing some hints about how patches for such file is expected.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Makefile | 132 ++++++++++++--------------------
 1 file changed, 50 insertions(+), 82 deletions(-)
drivers/media/platform/Makefile +50 -82
index 4032816f8e8a..e319044c57e9 100644
@@ -3,94 +3,62 @@
 # Makefile for the video capture/playback device drivers.
 #
 
-obj-$(CONFIG_VIDEO_ALLEGRO_DVT)		+= allegro-dvt/
+# Place here, alphabetically sorted by directory
+# (e. g. LC_ALL=C sort Makefile)
+obj-y += allegro-dvt/
+obj-y += am437x/
+obj-y += amphion/
+obj-y += atmel/
+obj-y += cadence/
+obj-y += coda/
+obj-y += davinci/
+obj-y += exynos-gsc/
+obj-y += exynos4-is/
+obj-y += imx/
+obj-y += imx-jpeg/
+obj-y += marvell-ccic/
+obj-y += meson/ge2d/
+obj-y += mtk-jpeg/
+obj-y += mtk-mdp/
+obj-y += mtk-vcodec/
+obj-y += mtk-vpu/
+obj-y += omap/
+obj-y += omap3isp/
+obj-y += qcom/camss/
+obj-y += qcom/venus/
+obj-y += rcar-vin/
+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 += sti/bdisp/
+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 += vsp1/
+obj-y += xilinx/
+
+# 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_ASPEED)		+= aspeed-video.o
-obj-$(CONFIG_VIDEO_CADENCE)		+= cadence/
-obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
-obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/
-obj-$(CONFIG_VIDEO_MMP_CAMERA) += marvell-ccic/
-
-obj-$(CONFIG_VIDEO_OMAP3)	+= omap3isp/
-obj-$(CONFIG_VIDEO_PXA27x)	+= pxa_camera.o
-
-obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
-
-obj-y	+= ti-vpe/
-
-obj-$(CONFIG_VIDEO_MX2_EMMAPRP)		+= mx2_emmaprp.o
-obj-$(CONFIG_VIDEO_CODA)		+= coda/
-
-obj-$(CONFIG_VIDEO_IMX)			+= imx/
 obj-$(CONFIG_VIDEO_IMX_PXP)		+= imx-pxp.o
-obj-$(CONFIG_VIDEO_IMX8_JPEG)		+= imx-jpeg/
-
 obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE)	+= m2m-deinterlace.o
-
 obj-$(CONFIG_VIDEO_MUX)			+= video-mux.o
-
-obj-$(CONFIG_VIDEO_S3C_CAMIF)		+= s3c-camif/
-obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS)	+= exynos4-is/
-obj-$(CONFIG_VIDEO_SAMSUNG_S5P_JPEG)	+= s5p-jpeg/
-obj-$(CONFIG_VIDEO_SAMSUNG_S5P_MFC)	+= s5p-mfc/
-
-obj-$(CONFIG_VIDEO_SAMSUNG_S5P_G2D)	+= s5p-g2d/
-obj-$(CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC)	+= exynos-gsc/
-
-obj-$(CONFIG_VIDEO_STI_BDISP)		+= sti/bdisp/
-obj-$(CONFIG_VIDEO_STI_HVA)		+= sti/hva/
-obj-$(CONFIG_DVB_C8SECTPFE)		+= sti/c8sectpfe/
-
-obj-$(CONFIG_VIDEO_STI_DELTA)		+= sti/delta/
-
-obj-y					+= stm32/
-
-obj-y					+= davinci/
-
-obj-$(CONFIG_VIDEO_SH_VOU)		+= sh_vou.o
-
+obj-$(CONFIG_VIDEO_MX2_EMMAPRP)		+= mx2_emmaprp.o
+obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
 obj-$(CONFIG_VIDEO_RCAR_DRIF)		+= rcar_drif.o
+obj-$(CONFIG_VIDEO_RCAR_ISP)		+= rcar-isp.o
 obj-$(CONFIG_VIDEO_RENESAS_CEU)		+= renesas-ceu.o
 obj-$(CONFIG_VIDEO_RENESAS_FCP)		+= rcar-fcp.o
 obj-$(CONFIG_VIDEO_RENESAS_FDP1)	+= rcar_fdp1.o
 obj-$(CONFIG_VIDEO_RENESAS_JPU)		+= rcar_jpu.o
-obj-$(CONFIG_VIDEO_RENESAS_VSP1)	+= vsp1/
-
-obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1)	+= rockchip/rkisp1/
-obj-$(CONFIG_VIDEO_ROCKCHIP_RGA)	+= rockchip/rga/
-
-obj-y	+= omap/
-
-obj-$(CONFIG_VIDEO_AM437X_VPFE)		+= am437x/
-
-obj-$(CONFIG_VIDEO_XILINX)		+= xilinx/
-
-obj-$(CONFIG_VIDEO_RCAR_ISP)		+= rcar-isp.o
-obj-$(CONFIG_VIDEO_RCAR_VIN)		+= rcar-vin/
-
-obj-$(CONFIG_VIDEO_ATMEL_ISC)		+= atmel/
-obj-$(CONFIG_VIDEO_ATMEL_ISI)		+= atmel/
-obj-$(CONFIG_VIDEO_ATMEL_XISC)		+= atmel/
-obj-$(CONFIG_VIDEO_MICROCHIP_CSI2DC)	+= atmel/
-
-obj-$(CONFIG_VIDEO_STM32_DCMI)		+= stm32/
-obj-$(CONFIG_VIDEO_STM32_DMA2D)		+= stm32/
-
-obj-$(CONFIG_VIDEO_MEDIATEK_VPU)	+= mtk-vpu/
-
-obj-$(CONFIG_VIDEO_MEDIATEK_VCODEC)	+= mtk-vcodec/
-
-obj-$(CONFIG_VIDEO_MEDIATEK_MDP)	+= mtk-mdp/
-
-obj-$(CONFIG_VIDEO_MEDIATEK_JPEG)	+= mtk-jpeg/
-
-obj-$(CONFIG_VIDEO_QCOM_CAMSS)		+= qcom/camss/
-
-obj-$(CONFIG_VIDEO_QCOM_VENUS)		+= qcom/venus/
-
-obj-y					+= sunxi/
-
-obj-$(CONFIG_VIDEO_MESON_GE2D)		+= meson/ge2d/
-
-obj-$(CONFIG_VIDEO_TEGRA_VDE)		+= tegra/vde/
-
-obj-$(CONFIG_VIDEO_AMPHION_VPU)		+= amphion/
+obj-$(CONFIG_VIDEO_SH_VOU)		+= sh_vou.o
+obj-$(CONFIG_VIDEO_VIA_CAMERA)		+= via-camera.o
+obj-$(CONFIG_VIDEO_VIU)			+= fsl-viu.o
Signature · 1 line
2.35.1
author maintainer
#5 lore raw

PATCH v2 5/67 media: platform: move platform menu dependencies to drivers

In reply to Mauro Carvalho Chehab

Right now, platform dependencies are organized by the type of the platform driver. Yet, things tend to become very messy with time. The better seems to organize the drivers per manufacturer, as other Kernel subsystems are doing.

As a preparation for such purpose, get rid of menuconfigs, moving the per-menu dependencies to be at the driver-specifig config entires.

This shoud give flexibility to reorganize the platform drivers per manufacturer and re-sort them.

This patch removes all "if..endif" options from the platform Kconfig, converting them into depends on.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig                | 119 +++++++++++-------
 drivers/media/platform/am437x/Kconfig         |   1 +
 drivers/media/platform/atmel/Kconfig          |   4 +
 drivers/media/platform/cadence/Kconfig        |   1 +
 drivers/media/platform/davinci/Kconfig        |   6 +
 drivers/media/platform/exynos4-is/Kconfig     |   1 +
 drivers/media/platform/imx-jpeg/Kconfig       |   1 +
 drivers/media/platform/imx/Kconfig            |   1 +
 drivers/media/platform/marvell-ccic/Kconfig   |   2 +
 drivers/media/platform/omap/Kconfig           |   1 +
 drivers/media/platform/rcar-vin/Kconfig       |   2 +
 drivers/media/platform/sti/c8sectpfe/Kconfig  |   1 +
 .../media/platform/sunxi/sun4i-csi/Kconfig    |   1 +
 .../media/platform/sunxi/sun6i-csi/Kconfig    |   1 +
 drivers/media/platform/xilinx/Kconfig         |   1 +
 15 files changed, 98 insertions(+), 45 deletions(-)
drivers/media/platform/Kconfig +74 -45
index 4843fabb8bb2..1446a99159c5 100644
@@ -3,17 +3,39 @@
 # Platform drivers
 #	Most drivers here are currently for webcam support
 
-menuconfig V4L_PLATFORM_DRIVERS
+config V4L_PLATFORM_DRIVERS
 	bool "V4L platform devices"
 	help
 	  Say Y here to enable support for platform-specific V4L drivers.
 
-if V4L_PLATFORM_DRIVERS
+config SDR_PLATFORM_DRIVERS
+	bool "SDR platform devices"
+	depends on MEDIA_SDR_SUPPORT
+	help
+	  Say Y here to enable support for platform-specific SDR Drivers.
+
+config DVB_PLATFORM_DRIVERS
+	bool "DVB platform devices"
+	depends on MEDIA_DIGITAL_TV_SUPPORT
+	help
+	  Say Y here to enable support for platform-specific Digital TV drivers.
+
+config V4L_MEM2MEM_DRIVERS
+	bool "Memory-to-memory multimedia devices"
+	depends on VIDEO_V4L2
+	help
+	  Say Y here to enable selecting drivers for V4L devices that
+	  use system memory for both source and destination buffers, as opposed
+	  to capture and output drivers, which use memory buffers for just
+	  one of those.
+
+# V4L platform drivers
 
 source "drivers/media/platform/marvell-ccic/Kconfig"
 
 config VIDEO_VIA_CAMERA
 	tristate "VIAFB camera controller support"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on FB_VIA && VIDEO_V4L2
 	select VIDEOBUF2_DMA_SG
 	select VIDEO_OV7670
@@ -22,9 +44,6 @@ config VIDEO_VIA_CAMERA
 	   Chrome9 chipsets.  Currently only tested on OLPC xo-1.5 systems
 	   with ov7670 sensors.
 
-#
-# Platform multimedia device configuration
-#
 source "drivers/media/platform/cadence/Kconfig"
 
 source "drivers/media/platform/davinci/Kconfig"
@@ -33,6 +52,7 @@ source "drivers/media/platform/omap/Kconfig"
 
 config VIDEO_ASPEED
 	tristate "Aspeed AST2400 and AST2500 Video Engine driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2
 	select VIDEOBUF2_DMA_CONTIG
 	help
@@ -42,6 +62,7 @@ config VIDEO_ASPEED
 
 config VIDEO_SH_VOU
 	tristate "SuperH VOU video output driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_DEV && I2C
 	depends on ARCH_SHMOBILE || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -50,6 +71,7 @@ config VIDEO_SH_VOU
 
 config VIDEO_VIU
 	tristate "Freescale VIU Video Driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C
 	select VIDEOBUF_DMA_CONTIG
 	default y
@@ -62,6 +84,7 @@ config VIDEO_VIU
 
 config VIDEO_MUX
 	tristate "Video Multiplexer"
+	depends on V4L_PLATFORM_DRIVERS
 	select MULTIPLEXER
 	depends on VIDEO_V4L2 && OF
 	select MEDIA_CONTROLLER
@@ -73,6 +96,7 @@ config VIDEO_MUX
 
 config VIDEO_OMAP3
 	tristate "OMAP 3 Camera support"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && I2C
 	depends on (ARCH_OMAP3 && OMAP_IOMMU) || COMPILE_TEST
 	depends on COMMON_CLK && OF
@@ -93,6 +117,7 @@ config VIDEO_OMAP3_DEBUG
 
 config VIDEO_PXA27x
 	tristate "PXA27x Quick Capture Interface driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on PXA27x || COMPILE_TEST
 	select VIDEOBUF2_DMA_SG
@@ -103,6 +128,7 @@ config VIDEO_PXA27x
 
 config VIDEO_QCOM_CAMSS
 	tristate "Qualcomm V4L2 Camera Subsystem driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2
 	depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST
 	select MEDIA_CONTROLLER
@@ -112,6 +138,7 @@ config VIDEO_QCOM_CAMSS
 
 config VIDEO_S3C_CAMIF
 	tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && I2C && PM
 	depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST
 	select MEDIA_CONTROLLER
@@ -126,6 +153,7 @@ config VIDEO_S3C_CAMIF
 
 config VIDEO_STM32_DCMI
 	tristate "STM32 Digital Camera Memory Interface (DCMI) support"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && OF
 	depends on ARCH_STM32 || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -140,6 +168,7 @@ config VIDEO_STM32_DCMI
 
 config VIDEO_RENESAS_CEU
 	tristate "Renesas Capture Engine Unit (CEU) driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_SHMOBILE || ARCH_R7S72100 || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -149,6 +178,7 @@ config VIDEO_RENESAS_CEU
 
 config VIDEO_ROCKCHIP_ISP1
 	tristate "Rockchip Image Signal Processing v1 Unit driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && OF
 	depends on ARCH_ROCKCHIP || COMPILE_TEST
 	select MEDIA_CONTROLLER
@@ -175,6 +205,7 @@ source "drivers/media/platform/imx/Kconfig"
 
 config VIDEO_TI_CAL
 	tristate "TI CAL (Camera Adaptation Layer) driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	select MEDIA_CONTROLLER
 	select VIDEO_V4L2_SUBDEV_API
@@ -187,10 +218,9 @@ config VIDEO_TI_CAL
 	  In TI Technical Reference Manual this module is referred as
 	  Camera Interface Subsystem (CAMSS).
 
-if VIDEO_TI_CAL
-
 config VIDEO_TI_CAL_MC
 	bool "Media Controller centric mode by default"
+	depends on VIDEO_TI_CAL
 	default n
 	help
 	  Enables Media Controller centric mode by default.
@@ -199,10 +229,9 @@ config VIDEO_TI_CAL_MC
 	  default. Note that this behavior can be overridden via
 	  module parameter 'mc_api'.
 
-endif # VIDEO_TI_CAL
-
 config VIDEO_RCAR_ISP
 	tristate "R-Car Image Signal Processor (ISP)"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && OF
 	depends on ARCH_RENESAS || COMPILE_TEST
 	select MEDIA_CONTROLLER
@@ -217,21 +246,11 @@ config VIDEO_RCAR_ISP
 	  To compile this driver as a module, choose M here: the
 	  module will be called rcar-isp.
 
-endif # V4L_PLATFORM_DRIVERS
-
-menuconfig V4L_MEM2MEM_DRIVERS
-	bool "Memory-to-memory multimedia devices"
-	depends on VIDEO_V4L2
-	help
-	  Say Y here to enable selecting drivers for V4L devices that
-	  use system memory for both source and destination buffers, as opposed
-	  to capture and output drivers, which use memory buffers for just
-	  one of those.
-
-if V4L_MEM2MEM_DRIVERS
+# Mem2mem drivers
 
 config VIDEO_ALLEGRO_DVT
 	tristate "Allegro DVT Video IP Core"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_ZYNQMP || COMPILE_TEST
 	select V4L2_MEM2MEM_DEV
@@ -247,6 +266,7 @@ config VIDEO_ALLEGRO_DVT
 
 config VIDEO_CODA
 	tristate "Chips&Media Coda multi-standard codec IP"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2 && OF && (ARCH_MXC || COMPILE_TEST)
 	select SRAM
 	select VIDEOBUF2_DMA_CONTIG
@@ -263,6 +283,7 @@ config VIDEO_IMX_VDOA
 
 config VIDEO_IMX_PXP
 	tristate "i.MX Pixel Pipeline (PXP)"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST)
 	select VIDEOBUF2_DMA_CONTIG
 	select V4L2_MEM2MEM_DEV
@@ -274,6 +295,7 @@ source "drivers/media/platform/imx-jpeg/Kconfig"
 
 config VIDEO_MEDIATEK_JPEG
 	tristate "Mediatek JPEG Codec driver"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on MTK_IOMMU_V1 || MTK_IOMMU || COMPILE_TEST
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_MEDIATEK || COMPILE_TEST
@@ -289,6 +311,7 @@ config VIDEO_MEDIATEK_JPEG
 
 config VIDEO_MEDIATEK_VPU
 	tristate "Mediatek Video Processor Unit"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_MEDIATEK || COMPILE_TEST
 	help
@@ -302,6 +325,7 @@ config VIDEO_MEDIATEK_VPU
 
 config VIDEO_MEDIATEK_MDP
 	tristate "Mediatek MDP driver"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on MTK_IOMMU || COMPILE_TEST
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_MEDIATEK || COMPILE_TEST
@@ -318,6 +342,7 @@ config VIDEO_MEDIATEK_MDP
 
 config VIDEO_MEDIATEK_VCODEC
 	tristate "Mediatek Video Codec driver"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on MTK_IOMMU || COMPILE_TEST
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_MEDIATEK || COMPILE_TEST
@@ -353,6 +378,7 @@ config VIDEO_MEDIATEK_VCODEC_SCP
 
 config VIDEO_MEM2MEM_DEINTERLACE
 	tristate "Deinterlace support"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on HAS_DMA
 	select VIDEOBUF2_DMA_CONTIG
@@ -362,6 +388,7 @@ config VIDEO_MEM2MEM_DEINTERLACE
 
 config VIDEO_MESON_GE2D
 	tristate "Amlogic 2D Graphic Acceleration Unit"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_MESON || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -375,6 +402,7 @@ config VIDEO_MESON_GE2D
 
 config VIDEO_SAMSUNG_S5P_G2D
 	tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -385,6 +413,7 @@ config VIDEO_SAMSUNG_S5P_G2D
 
 config VIDEO_SAMSUNG_S5P_JPEG
 	tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -395,6 +424,7 @@ config VIDEO_SAMSUNG_S5P_JPEG
 
 config VIDEO_SAMSUNG_S5P_MFC
 	tristate "Samsung S5P MFC Video Codec"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -403,6 +433,7 @@ config VIDEO_SAMSUNG_S5P_MFC
 
 config VIDEO_MX2_EMMAPRP
 	tristate "MX2 eMMa-PrP support"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on SOC_IMX27 || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -414,6 +445,7 @@ config VIDEO_MX2_EMMAPRP
 
 config VIDEO_SAMSUNG_EXYNOS_GSC
 	tristate "Samsung Exynos G-Scaler driver"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_EXYNOS || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -423,6 +455,7 @@ config VIDEO_SAMSUNG_EXYNOS_GSC
 
 config VIDEO_STI_BDISP
 	tristate "STMicroelectronics BDISP 2D blitter driver"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_STI || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -432,6 +465,7 @@ config VIDEO_STI_BDISP
 
 config VIDEO_STI_HVA
 	tristate "STMicroelectronics HVA multi-format video encoder V4L2 driver"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_STI || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -446,6 +480,7 @@ config VIDEO_STI_HVA
 
 config VIDEO_STI_HVA_DEBUGFS
 	bool "Export STMicroelectronics HVA internals in debugfs"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_STI_HVA
 	depends on DEBUG_FS
 	help
@@ -457,6 +492,7 @@ config VIDEO_STI_HVA_DEBUGFS
 
 config VIDEO_STI_DELTA
 	tristate "STMicroelectronics DELTA multi-format video decoder V4L2 driver"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_STI || COMPILE_TEST
 	help
@@ -471,11 +507,10 @@ config VIDEO_STI_DELTA
 		Please notice that the driver will only be built if
 		at least one of the DELTA decoder below is selected.
 
-if VIDEO_STI_DELTA
-
 config VIDEO_STI_DELTA_MJPEG
 	bool "STMicroelectronics DELTA MJPEG support"
 	default y
+	depends on VIDEO_STI_DELTA
 	help
 		Enables DELTA MJPEG hardware support.
 
@@ -491,10 +526,9 @@ config VIDEO_STI_DELTA_DRIVER
 	select V4L2_MEM2MEM_DEV
 	select RPMSG
 
-endif # VIDEO_STI_DELTA
-
 config VIDEO_STM32_DMA2D
 	tristate "STM32 Chrom-Art Accelerator (DMA2D)"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_STM32 || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -507,6 +541,7 @@ config VIDEO_STM32_DMA2D
 
 config VIDEO_RENESAS_FDP1
 	tristate "Renesas Fine Display Processor"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_RENESAS || COMPILE_TEST
 	depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP
@@ -521,6 +556,7 @@ config VIDEO_RENESAS_FDP1
 
 config VIDEO_RENESAS_JPU
 	tristate "Renesas JPEG Processing Unit"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_RENESAS || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -533,6 +569,7 @@ config VIDEO_RENESAS_JPU
 
 config VIDEO_RENESAS_FCP
 	tristate "Renesas Frame Compression Processor"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on ARCH_RENESAS || COMPILE_TEST
 	depends on OF
 	help
@@ -546,6 +583,7 @@ config VIDEO_RENESAS_FCP
 
 config VIDEO_RENESAS_VSP1
 	tristate "Renesas VSP1 Video Processing Engine"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_V4L2
 	depends on ARCH_RENESAS || COMPILE_TEST
 	depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP
@@ -561,6 +599,7 @@ config VIDEO_RENESAS_VSP1
 
 config VIDEO_ROCKCHIP_RGA
 	tristate "Rockchip Raster 2d Graphic Acceleration Unit"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_ROCKCHIP || COMPILE_TEST
 	select VIDEOBUF2_DMA_SG
@@ -575,6 +614,7 @@ config VIDEO_ROCKCHIP_RGA
 
 config VIDEO_TI_VPE
 	tristate "TI VPE (Video Processing Engine) driver"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on SOC_DRA7XX || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -588,12 +628,14 @@ config VIDEO_TI_VPE
 
 config VIDEO_TI_VPE_DEBUG
 	bool "VPE debug messages"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_TI_VPE
 	help
 	  Enable debug messages on VPE driver.
 
 config VIDEO_QCOM_VENUS
 	tristate "Qualcomm Venus V4L2 encoder/decoder driver"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2 && QCOM_SMEM
 	depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST
 	select QCOM_MDT_LOADER if ARCH_QCOM
@@ -608,6 +650,7 @@ config VIDEO_QCOM_VENUS
 
 config VIDEO_SUN8I_DEINTERLACE
 	tristate "Allwinner Deinterlace driver"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_SUNXI || COMPILE_TEST
 	depends on COMMON_CLK && OF
@@ -621,6 +664,7 @@ config VIDEO_SUN8I_DEINTERLACE
 
 config VIDEO_SUN8I_ROTATE
 	tristate "Allwinner DE2 rotation driver"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on VIDEO_DEV && VIDEO_V4L2
 	depends on ARCH_SUNXI || COMPILE_TEST
 	depends on COMMON_CLK && OF
@@ -633,6 +677,7 @@ config VIDEO_SUN8I_ROTATE
 
 config VIDEO_TEGRA_VDE
 	tristate "NVIDIA Tegra Video Decoder Engine driver"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on ARCH_TEGRA || COMPILE_TEST
 	depends on VIDEO_DEV && VIDEO_V4L2
 	select DMA_SHARED_BUFFER
@@ -650,6 +695,7 @@ config VIDEO_TEGRA_VDE
 
 config VIDEO_AMPHION_VPU
 	tristate "Amphion VPU (Video Processing Unit) Codec IP"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on ARCH_MXC || COMPILE_TEST
 	depends on MEDIA_SUPPORT
 	depends on VIDEO_DEV
@@ -667,8 +713,6 @@ config VIDEO_AMPHION_VPU
 	  various NXP SoCs.
 	  To compile this driver as a module choose m here.
 
-endif # V4L_MEM2MEM_DRIVERS
-
 # TI VIDEO PORT Helper Modules
 # These will be selected by VPE and VIP
 config VIDEO_TI_VPDMA
@@ -680,26 +724,13 @@ config VIDEO_TI_SC
 config VIDEO_TI_CSC
 	tristate
 
-menuconfig DVB_PLATFORM_DRIVERS
-	bool "DVB platform devices"
-	depends on MEDIA_DIGITAL_TV_SUPPORT
-	help
-	  Say Y here to enable support for platform-specific Digital TV drivers.
-
-if DVB_PLATFORM_DRIVERS
+# DVB platform drivers
 source "drivers/media/platform/sti/c8sectpfe/Kconfig"
-endif #DVB_PLATFORM_DRIVERS
-
-menuconfig SDR_PLATFORM_DRIVERS
-	bool "SDR platform devices"
-	depends on MEDIA_SDR_SUPPORT
-	help
-	  Say Y here to enable support for platform-specific SDR Drivers.
-
-if SDR_PLATFORM_DRIVERS
 
+# SDR platform drivers
 config VIDEO_RCAR_DRIF
 	tristate "Renesas Digital Radio Interface (DRIF)"
+	depends on SDR_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2
 	depends on ARCH_RENESAS || COMPILE_TEST
 	select VIDEOBUF2_VMALLOC
@@ -712,5 +743,3 @@ config VIDEO_RCAR_DRIF
 
 	  To compile this driver as a module, choose M here; the module
 	  will be called rcar_drif.
-
-endif # SDR_PLATFORM_DRIVERS
drivers/media/platform/am437x/Kconfig +1 -0
index 9ef898f512de..619cefca7590 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_AM437X_VPFE
 	tristate "TI AM437x VPFE video capture driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2
 	depends on SOC_AM43XX || COMPILE_TEST
 	select MEDIA_CONTROLLER
drivers/media/platform/atmel/Kconfig +4 -0
index f83bee373d82..5122290729ae 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_ATMEL_ISC
 	tristate "ATMEL Image Sensor Controller (ISC) support"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && COMMON_CLK
 	depends on ARCH_AT91 || COMPILE_TEST
 	select MEDIA_CONTROLLER
@@ -15,6 +16,7 @@ config VIDEO_ATMEL_ISC
 
 config VIDEO_ATMEL_XISC
 	tristate "ATMEL eXtended Image Sensor Controller (XISC) support"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && COMMON_CLK && VIDEO_V4L2_SUBDEV_API
 	depends on ARCH_AT91 || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -33,6 +35,7 @@ config VIDEO_ATMEL_ISC_BASE
 
 config VIDEO_ATMEL_ISI
 	tristate "ATMEL Image Sensor Interface (ISI) support"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && OF
 	depends on ARCH_AT91 || COMPILE_TEST
 	select VIDEOBUF2_DMA_CONTIG
@@ -43,6 +46,7 @@ config VIDEO_ATMEL_ISI
 
 config VIDEO_MICROCHIP_CSI2DC
 	tristate "Microchip CSI2 Demux Controller"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && COMMON_CLK && OF
 	depends on ARCH_AT91 || COMPILE_TEST
 	select MEDIA_CONTROLLER
drivers/media/platform/cadence/Kconfig +1 -0
index 80cf601323ce..79a7e9fb2575 100644
@@ -1,6 +1,7 @@
 # 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.
 
drivers/media/platform/davinci/Kconfig +6 -0
index 9d2a9eeb3499..7e5f92b0082a 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_DAVINCI_VPIF_DISPLAY
 	tristate "TI DaVinci VPIF V4L2-Display driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2
 	depends on ARCH_DAVINCI || COMPILE_TEST
 	depends on I2C
@@ -17,6 +18,7 @@ config VIDEO_DAVINCI_VPIF_DISPLAY
 
 config VIDEO_DAVINCI_VPIF_CAPTURE
 	tristate "TI DaVinci VPIF video capture driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2
 	depends on ARCH_DAVINCI || COMPILE_TEST
 	depends on I2C
@@ -32,6 +34,7 @@ config VIDEO_DAVINCI_VPIF_CAPTURE
 
 config VIDEO_DM6446_CCDC
 	tristate "TI DM6446 CCDC video capture driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2
 	depends on ARCH_DAVINCI || COMPILE_TEST
 	depends on I2C
@@ -48,6 +51,7 @@ config VIDEO_DM6446_CCDC
 
 config VIDEO_DM355_CCDC
 	tristate "TI DM355 CCDC video capture driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2
 	depends on ARCH_DAVINCI || COMPILE_TEST
 	depends on I2C
@@ -64,6 +68,7 @@ config VIDEO_DM355_CCDC
 
 config VIDEO_DM365_ISIF
 	tristate "TI DM365 ISIF video capture driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2
 	depends on ARCH_DAVINCI || COMPILE_TEST
 	depends on I2C
@@ -78,6 +83,7 @@ config VIDEO_DM365_ISIF
 
 config VIDEO_DAVINCI_VPBE_DISPLAY
 	tristate "TI DaVinci VPBE V4L2-Display driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2
 	depends on ARCH_DAVINCI || COMPILE_TEST
 	depends on I2C
drivers/media/platform/exynos4-is/Kconfig +1 -0
index 136d3b2a0fbb..868bb86c7699 100644
@@ -2,6 +2,7 @@
 
 config VIDEO_SAMSUNG_EXYNOS4_IS
 	tristate "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && OF && COMMON_CLK
 	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
 	select MEDIA_CONTROLLER
drivers/media/platform/imx-jpeg/Kconfig +1 -0
index 2fdd648cda80..cbf6101a8b1d 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 config VIDEO_IMX8_JPEG
 	tristate "IMX8 JPEG Encoder/Decoder"
+	depends on V4L_MEM2MEM_DRIVERS
 	depends on ARCH_MXC || COMPILE_TEST
 	depends on VIDEO_DEV && VIDEO_V4L2
 	select VIDEOBUF2_DMA_CONTIG
drivers/media/platform/imx/Kconfig +1 -0
index 683863572c20..7cd0617c9b1b 100644
@@ -2,6 +2,7 @@
 
 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 && VIDEO_V4L2
 	help
drivers/media/platform/marvell-ccic/Kconfig +2 -0
index 3e3f86264762..bfe655b2cedd 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_CAFE_CCIC
 	tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on PCI && I2C && VIDEO_V4L2
 	depends on COMMON_CLK
 	select VIDEO_OV7670
@@ -14,6 +15,7 @@ config VIDEO_CAFE_CCIC
 
 config VIDEO_MMP_CAMERA
 	tristate "Marvell Armada 610 integrated camera controller support"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on I2C && VIDEO_V4L2
 	depends on ARCH_MMP || COMPILE_TEST
 	depends on COMMON_CLK
drivers/media/platform/omap/Kconfig +1 -0
index de16de46c0f4..789d5e5686c7 100644
@@ -6,6 +6,7 @@ config VIDEO_OMAP2_VOUT_VRFB
 
 config VIDEO_OMAP2_VOUT
 	tristate "OMAP2/OMAP3 V4L2-Display driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on MMU
 	depends on FB_OMAP2 || (COMPILE_TEST && FB_OMAP2=n)
 	depends on ARCH_OMAP2 || ARCH_OMAP3 || COMPILE_TEST
drivers/media/platform/rcar-vin/Kconfig +2 -0
index 030312d862e7..34b7ea6f1246 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 config VIDEO_RCAR_CSI2
 	tristate "R-Car MIPI CSI-2 Receiver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && OF
 	depends on ARCH_RENESAS || COMPILE_TEST
 	select MEDIA_CONTROLLER
@@ -16,6 +17,7 @@ config VIDEO_RCAR_CSI2
 
 config VIDEO_RCAR_VIN
 	tristate "R-Car Video Input (VIN) Driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && OF
 	depends on ARCH_RENESAS || COMPILE_TEST
 	select MEDIA_CONTROLLER
drivers/media/platform/sti/c8sectpfe/Kconfig +1 -0
index 369509e03071..702b910509c9 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config DVB_C8SECTPFE
 	tristate "STMicroelectronics C8SECTPFE DVB support"
+	depends on DVB_PLATFORM_DRIVERS
 	depends on PINCTRL && DVB_CORE && I2C
 	depends on ARCH_STI || ARCH_MULTIPLATFORM || COMPILE_TEST
 	select FW_LOADER
drivers/media/platform/sunxi/sun4i-csi/Kconfig +1 -0
index 903c6152f6e8..43ad2dd7da5d 100644
@@ -2,6 +2,7 @@
 
 config VIDEO_SUN4I_CSI
 	tristate "Allwinner A10 CMOS Sensor Interface Support"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && COMMON_CLK  && HAS_DMA
 	depends on ARCH_SUNXI || COMPILE_TEST
 	select MEDIA_CONTROLLER
drivers/media/platform/sunxi/sun6i-csi/Kconfig +1 -0
index 586e3fb3a80d..6d9cf1963c41 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 config VIDEO_SUN6I_CSI
 	tristate "Allwinner V3s Camera Sensor Interface driver"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2 && COMMON_CLK  && HAS_DMA
 	depends on ARCH_SUNXI || COMPILE_TEST
 	select MEDIA_CONTROLLER
drivers/media/platform/xilinx/Kconfig +1 -0
index 44587dccacf1..a9531d5efd50 100644
@@ -2,6 +2,7 @@
 
 config VIDEO_XILINX
 	tristate "Xilinx Video IP (EXPERIMENTAL)"
+	depends on V4L_PLATFORM_DRIVERS
 	depends on VIDEO_V4L2  && OF && HAS_DMA
 	select MEDIA_CONTROLLER
 	select VIDEO_V4L2_SUBDEV_API
Signature · 1 line
2.35.1
author maintainer
#6 lore raw

PATCH v2 6/67 media: platform: place Aspeed driver on a separate dir

In reply to Mauro Carvalho Chehab

In order to cleanup the main platform media directory, move Aspeed driver to its own directory.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.1647274406.git.mchehab at kernel.org/

 MAINTAINERS                                        |  2 +-
 drivers/media/platform/Kconfig                     | 10 +---------
 drivers/media/platform/Makefile                    |  2 +-
 drivers/media/platform/aspeed/Kconfig              | 10 ++++++++++
 drivers/media/platform/aspeed/Makefile             |  2 ++
 drivers/media/platform/{ => aspeed}/aspeed-video.c |  0
 6 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 drivers/media/platform/aspeed/Kconfig
 create mode 100644 drivers/media/platform/aspeed/Makefile
 rename drivers/media/platform/{ => aspeed}/aspeed-video.c (100%)
MAINTAINERS +1 -1
index 1a9fb0615925..1b6f48a660de 100644
@@ -3026,7 +3026,7 @@ L:	linux-media at vger.kernel.org
 L:	openbmc at lists.ozlabs.org (moderated for non-subscribers)
 S:	Maintained
 F:	Documentation/devicetree/bindings/media/aspeed-video.txt
-F:	drivers/media/platform/aspeed-video.c
+F:	drivers/media/platform/aspeed/
 
 ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS
 M:	Corentin Chary <[email protected]>
drivers/media/platform/Kconfig +1 -9
index 1446a99159c5..10f453ff2717 100644
@@ -50,15 +50,7 @@ source "drivers/media/platform/davinci/Kconfig"
 
 source "drivers/media/platform/omap/Kconfig"
 
-config VIDEO_ASPEED
-	tristate "Aspeed AST2400 and AST2500 Video Engine driver"
-	depends on V4L_PLATFORM_DRIVERS
-	depends on VIDEO_V4L2
-	select VIDEOBUF2_DMA_CONTIG
-	help
-	  Support for the Aspeed Video Engine (VE) embedded in the Aspeed
-	  AST2400 and AST2500 SOCs. The VE can capture and compress video data
-	  from digital or analog sources.
+source "drivers/media/platform/aspeed/Kconfig"
 
 config VIDEO_SH_VOU
 	tristate "SuperH VOU video output driver"
drivers/media/platform/Makefile +1 -1
index e319044c57e9..18ec3d208483 100644
@@ -6,6 +6,7 @@
 # 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 += atmel/
@@ -47,7 +48,6 @@ obj-y += xilinx/
 # 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_ASPEED)		+= aspeed-video.o
 obj-$(CONFIG_VIDEO_IMX_PXP)		+= imx-pxp.o
 obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE)	+= m2m-deinterlace.o
 obj-$(CONFIG_VIDEO_MUX)			+= video-mux.o
drivers/media/platform/aspeed/Kconfig new file +10 -0
new file mode 100644
index 000000000000..5025e892844c
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_ASPEED
+	tristate "Aspeed AST2400 and AST2500 Video Engine driver"
+	depends on V4L_PLATFORM_DRIVERS
+	depends on VIDEO_V4L2
+	select VIDEOBUF2_DMA_CONTIG
+	help
+	  Support for the Aspeed Video Engine (VE) embedded in the Aspeed
+	  AST2400 and AST2500 SOCs. The VE can capture and compress video data
+	  from digital or analog sources.
drivers/media/platform/aspeed/Makefile new file +2 -0
new file mode 100644
index 000000000000..1979af63dadd
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_VIDEO_ASPEED) += aspeed-video.o
drivers/media/platform/aspeed/aspeed-video.c renamed from drivers/media/platform/aspeed-video.c +0 -0
similarity index 100%
rename from drivers/media/platform/aspeed-video.c
rename to drivers/media/platform/aspeed/aspeed-video.c
Signature · 1 line
2.35.1
author maintainer
#7 lore raw

PATCH v2 7/67 media: platform: place NXP drivers on a separate dir

In reply to Mauro Carvalho Chehab

In order to cleanup the main platform media directory, move NXP drivers to their own directory.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 MAINTAINERS                                   |  2 +-
 drivers/media/platform/Kconfig                | 40 +----------
 drivers/media/platform/Makefile               |  6 +-
 drivers/media/platform/imx/Kconfig            | 25 -------
 drivers/media/platform/imx/Makefile           |  1 -
 drivers/media/platform/nxp/Kconfig            | 66 +++++++++++++++++++
 drivers/media/platform/nxp/Makefile           |  8 +++
 drivers/media/platform/{ => nxp}/fsl-viu.c    |  0
 .../media/platform/{ => nxp}/imx-jpeg/Kconfig |  0
 .../platform/{ => nxp}/imx-jpeg/Makefile      |  0
 .../platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.c |  0
 .../platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.h |  0
 .../platform/{ => nxp}/imx-jpeg/mxc-jpeg.c    |  0
 .../platform/{ => nxp}/imx-jpeg/mxc-jpeg.h    |  0
 .../platform/{imx => nxp}/imx-mipi-csis.c     |  0
 drivers/media/platform/{ => nxp}/imx-pxp.c    |  0
 drivers/media/platform/{ => nxp}/imx-pxp.h    |  0
 .../media/platform/{ => nxp}/mx2_emmaprp.c    |  0
 18 files changed, 78 insertions(+), 70 deletions(-)
 delete mode 100644 drivers/media/platform/imx/Kconfig
 delete mode 100644 drivers/media/platform/imx/Makefile
 create mode 100644 drivers/media/platform/nxp/Kconfig
 create mode 100644 drivers/media/platform/nxp/Makefile
 rename drivers/media/platform/{ => nxp}/fsl-viu.c (100%)
 rename drivers/media/platform/{ => nxp}/imx-jpeg/Kconfig (100%)
 rename drivers/media/platform/{ => nxp}/imx-jpeg/Makefile (100%)
 rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.c (100%)
 rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg-hw.h (100%)
 rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg.c (100%)
 rename drivers/media/platform/{ => nxp}/imx-jpeg/mxc-jpeg.h (100%)
 rename drivers/media/platform/{imx => nxp}/imx-mipi-csis.c (100%)
 rename drivers/media/platform/{ => nxp}/imx-pxp.c (100%)
 rename drivers/media/platform/{ => nxp}/imx-pxp.h (100%)
 rename drivers/media/platform/{ => nxp}/mx2_emmaprp.c (100%)
MAINTAINERS +1 -1
index 1b6f48a660de..780ef2ef3362 100644
@@ -11841,7 +11841,7 @@ M:	Philipp Zabel <[email protected]>
 L:	[email protected]
 S:	Maintained
 T:	git git://linuxtv.org/media_tree.git
-F:	drivers/media/platform/imx-pxp.[ch]
+F:	drivers/media/platform/nxp/imx-pxp.[ch]
 
 MEDIA DRIVERS FOR ASCOT2E
 M:	Sergey Kozlov <[email protected]>
drivers/media/platform/Kconfig +2 -38
index 10f453ff2717..711b6ab9370b 100644
@@ -29,6 +29,8 @@ config V4L_MEM2MEM_DRIVERS
 	  to capture and output drivers, which use memory buffers for just
 	  one of those.
 
+source "drivers/media/platform/nxp/Kconfig"
+
 # V4L platform drivers
 
 source "drivers/media/platform/marvell-ccic/Kconfig"
@@ -61,19 +63,6 @@ config VIDEO_SH_VOU
 	help
 	  Support for the Video Output Unit (VOU) on SuperH SoCs.
 
-config VIDEO_VIU
-	tristate "Freescale VIU Video Driver"
-	depends on V4L_PLATFORM_DRIVERS
-	depends on VIDEO_V4L2 && (PPC_MPC512x || COMPILE_TEST) && I2C
-	select VIDEOBUF_DMA_CONTIG
-	default y
-	help
-	  Support for Freescale VIU video driver. This device captures
-	  video data, or overlays video on DIU frame buffer.
-
-	  Say Y here if you want to enable VIU device on MPC5121e Rev2+.
-	  In doubt, say N.
-
 config VIDEO_MUX
 	tristate "Video Multiplexer"
 	depends on V4L_PLATFORM_DRIVERS
@@ -193,7 +182,6 @@ source "drivers/media/platform/xilinx/Kconfig"
 source "drivers/media/platform/rcar-vin/Kconfig"
 source "drivers/media/platform/atmel/Kconfig"
 source "drivers/media/platform/sunxi/Kconfig"
-source "drivers/media/platform/imx/Kconfig"
 
 config VIDEO_TI_CAL
 	tristate "TI CAL (Camera Adaptation Layer) driver"
@@ -273,18 +261,6 @@ config VIDEO_CODA
 config VIDEO_IMX_VDOA
 	def_tristate VIDEO_CODA if SOC_IMX6Q || COMPILE_TEST
 
-config VIDEO_IMX_PXP
-	tristate "i.MX Pixel Pipeline (PXP)"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST)
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	  The i.MX Pixel Pipeline is a memory-to-memory engine for scaling,
-	  color space conversion, and rotation.
-
-source "drivers/media/platform/imx-jpeg/Kconfig"
-
 config VIDEO_MEDIATEK_JPEG
 	tristate "Mediatek JPEG Codec driver"
 	depends on V4L_MEM2MEM_DRIVERS
@@ -423,18 +399,6 @@ config VIDEO_SAMSUNG_S5P_MFC
 	help
 	    MFC 5.1 and 6.x driver for V4L2
 
-config VIDEO_MX2_EMMAPRP
-	tristate "MX2 eMMa-PrP support"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on SOC_IMX27 || COMPILE_TEST
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	    MX2X chips have a PrP that can be used to process buffers from
-	    memory to memory. Operations include resizing and format
-	    conversion.
-
 config VIDEO_SAMSUNG_EXYNOS_GSC
 	tristate "Samsung Exynos G-Scaler driver"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/Makefile +1 -5
index 18ec3d208483..4458690c1965 100644
@@ -15,14 +15,13 @@ obj-y += coda/
 obj-y += davinci/
 obj-y += exynos-gsc/
 obj-y += exynos4-is/
-obj-y += imx/
-obj-y += imx-jpeg/
 obj-y += marvell-ccic/
 obj-y += meson/ge2d/
 obj-y += mtk-jpeg/
 obj-y += mtk-mdp/
 obj-y += mtk-vcodec/
 obj-y += mtk-vpu/
+obj-y += nxp/
 obj-y += omap/
 obj-y += omap3isp/
 obj-y += qcom/camss/
@@ -48,10 +47,8 @@ obj-y += xilinx/
 # 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_IMX_PXP)		+= imx-pxp.o
 obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE)	+= m2m-deinterlace.o
 obj-$(CONFIG_VIDEO_MUX)			+= video-mux.o
-obj-$(CONFIG_VIDEO_MX2_EMMAPRP)		+= mx2_emmaprp.o
 obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
 obj-$(CONFIG_VIDEO_RCAR_DRIF)		+= rcar_drif.o
 obj-$(CONFIG_VIDEO_RCAR_ISP)		+= rcar-isp.o
@@ -61,4 +58,3 @@ obj-$(CONFIG_VIDEO_RENESAS_FDP1)	+= rcar_fdp1.o
 obj-$(CONFIG_VIDEO_RENESAS_JPU)		+= rcar_jpu.o
 obj-$(CONFIG_VIDEO_SH_VOU)		+= sh_vou.o
 obj-$(CONFIG_VIDEO_VIA_CAMERA)		+= via-camera.o
-obj-$(CONFIG_VIDEO_VIU)			+= fsl-viu.o
drivers/media/platform/imx/Kconfig deleted +0 -25
deleted file mode 100644
index 7cd0617c9b1b..000000000000
@@ -1,25 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-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 && VIDEO_V4L2
-	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
-
-config VIDEO_IMX_MIPI_CSIS
-	tristate "MIPI CSI-2 CSIS receiver found on i.MX7 and i.MX8 models"
-	select MEDIA_CONTROLLER
-	select V4L2_FWNODE
-	select VIDEO_V4L2_SUBDEV_API
-	default n
-	help
-	  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
drivers/media/platform/imx/Makefile deleted +0 -1
deleted file mode 100644
index f72bdbe8e6ef..000000000000
@@ -1 +0,0 @@
-obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o
drivers/media/platform/nxp/Kconfig new file +66 -0

66 lines not on this page · raw message

drivers/media/platform/nxp/Makefile new file +8 -0
new file mode 100644
index 000000000000..efc38c6578ce
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-y += imx-jpeg/
+
+obj-$(CONFIG_VIDEO_IMX_MIPI_CSIS) += imx-mipi-csis.o
+obj-$(CONFIG_VIDEO_IMX_PXP) += imx-pxp.o
+obj-$(CONFIG_VIDEO_MX2_EMMAPRP) += mx2_emmaprp.o
+obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
drivers/media/platform/nxp/fsl-viu.c renamed from drivers/media/platform/fsl-viu.c +0 -0
similarity index 100%
rename from drivers/media/platform/fsl-viu.c
rename to drivers/media/platform/nxp/fsl-viu.c
drivers/media/platform/nxp/imx-jpeg/Kconfig renamed from drivers/media/platform/imx-jpeg/Kconfig +0 -0
similarity index 100%
rename from drivers/media/platform/imx-jpeg/Kconfig
rename to drivers/media/platform/nxp/imx-jpeg/Kconfig
drivers/media/platform/nxp/imx-jpeg/Makefile renamed from drivers/media/platform/imx-jpeg/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/imx-jpeg/Makefile
rename to drivers/media/platform/nxp/imx-jpeg/Makefile
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c renamed from drivers/media/platform/imx-jpeg/mxc-jpeg-hw.c +0 -0
similarity index 100%
rename from drivers/media/platform/imx-jpeg/mxc-jpeg-hw.c
rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.c
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h renamed from drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h +0 -0
similarity index 100%
rename from drivers/media/platform/imx-jpeg/mxc-jpeg-hw.h
rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c renamed from drivers/media/platform/imx-jpeg/mxc-jpeg.c +0 -0
similarity index 100%
rename from drivers/media/platform/imx-jpeg/mxc-jpeg.c
rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c
drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h renamed from drivers/media/platform/imx-jpeg/mxc-jpeg.h +0 -0
similarity index 100%
rename from drivers/media/platform/imx-jpeg/mxc-jpeg.h
rename to drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h
drivers/media/platform/nxp/imx-mipi-csis.c renamed from drivers/media/platform/imx/imx-mipi-csis.c +0 -0
similarity index 100%
rename from drivers/media/platform/imx/imx-mipi-csis.c
rename to drivers/media/platform/nxp/imx-mipi-csis.c
drivers/media/platform/nxp/imx-pxp.c renamed from drivers/media/platform/imx-pxp.c +0 -0
similarity index 100%
rename from drivers/media/platform/imx-pxp.c
rename to drivers/media/platform/nxp/imx-pxp.c
drivers/media/platform/nxp/imx-pxp.h renamed from drivers/media/platform/imx-pxp.h +0 -0
similarity index 100%
rename from drivers/media/platform/imx-pxp.h
rename to drivers/media/platform/nxp/imx-pxp.h
drivers/media/platform/nxp/mx2_emmaprp.c renamed from drivers/media/platform/mx2_emmaprp.c +0 -0
similarity index 100%
rename from drivers/media/platform/mx2_emmaprp.c
rename to drivers/media/platform/nxp/mx2_emmaprp.c
Signature · 1 line
2.35.1
author maintainer
#8 lore raw

PATCH v2 8/67 media: platform: place Intel drivers on a separate dir

In reply to Mauro Carvalho Chehab

In order to cleanup the main platform media directory, move Intel driver to its own directory.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig                  | 11 +----------
 drivers/media/platform/Makefile                 |  2 +-
 drivers/media/platform/intel/Kconfig            | 11 +++++++++++
 drivers/media/platform/intel/Makefile           |  2 ++
 drivers/media/platform/{ => intel}/pxa_camera.c |  0
 5 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 drivers/media/platform/intel/Kconfig
 create mode 100644 drivers/media/platform/intel/Makefile
 rename drivers/media/platform/{ => intel}/pxa_camera.c (100%)
drivers/media/platform/Kconfig +1 -10
index 711b6ab9370b..0cfbc0c2aa7a 100644
@@ -96,16 +96,7 @@ config VIDEO_OMAP3_DEBUG
 	help
 	  Enable debug messages on OMAP 3 camera controller driver.
 
-config VIDEO_PXA27x
-	tristate "PXA27x Quick Capture Interface driver"
-	depends on V4L_PLATFORM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on PXA27x || COMPILE_TEST
-	select VIDEOBUF2_DMA_SG
-	select SG_SPLIT
-	select V4L2_FWNODE
-	help
-	  This is a v4l2 driver for the PXA27x Quick Capture Interface
+source "drivers/media/platform/intel/Kconfig"
 
 config VIDEO_QCOM_CAMSS
 	tristate "Qualcomm V4L2 Camera Subsystem driver"
drivers/media/platform/Makefile +1 -1
index 4458690c1965..78ac0fa4dd57 100644
@@ -15,6 +15,7 @@ obj-y += coda/
 obj-y += davinci/
 obj-y += exynos-gsc/
 obj-y += exynos4-is/
+obj-y += intel/
 obj-y += marvell-ccic/
 obj-y += meson/ge2d/
 obj-y += mtk-jpeg/
@@ -49,7 +50,6 @@ obj-y += xilinx/
 # (e. g. LC_ALL=C sort Makefile)
 obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE)	+= m2m-deinterlace.o
 obj-$(CONFIG_VIDEO_MUX)			+= video-mux.o
-obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
 obj-$(CONFIG_VIDEO_RCAR_DRIF)		+= rcar_drif.o
 obj-$(CONFIG_VIDEO_RCAR_ISP)		+= rcar-isp.o
 obj-$(CONFIG_VIDEO_RENESAS_CEU)		+= renesas-ceu.o
drivers/media/platform/intel/Kconfig new file +11 -0
new file mode 100644
index 000000000000..aeda421f7248
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_PXA27x
+	tristate "PXA27x Quick Capture Interface driver"
+	depends on V4L_PLATFORM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on PXA27x || COMPILE_TEST
+	select VIDEOBUF2_DMA_SG
+	select SG_SPLIT
+	select V4L2_FWNODE
+	help
+	  This is a v4l2 driver for the PXA27x Quick Capture Interface
drivers/media/platform/intel/Makefile new file +2 -0
new file mode 100644
index 000000000000..7e8889cbd2df
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o
drivers/media/platform/intel/pxa_camera.c renamed from drivers/media/platform/pxa_camera.c +0 -0
similarity index 100%
rename from drivers/media/platform/pxa_camera.c
rename to drivers/media/platform/intel/pxa_camera.c
Signature · 1 line
2.35.1
author maintainer
#9 lore raw

PATCH v2 9/67 media: platform: place Via drivers on a separate dir

In reply to Mauro Carvalho Chehab

In order to cleanup the main platform media directory, move Via driver to its own directory.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig                | 11 +----------
 drivers/media/platform/Makefile               |  2 +-
 drivers/media/platform/via/Kconfig            | 11 +++++++++++
 drivers/media/platform/via/Makefile           |  2 ++
 drivers/media/platform/{ => via}/via-camera.c |  0
 drivers/media/platform/{ => via}/via-camera.h |  0
 6 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 drivers/media/platform/via/Kconfig
 create mode 100644 drivers/media/platform/via/Makefile
 rename drivers/media/platform/{ => via}/via-camera.c (100%)
 rename drivers/media/platform/{ => via}/via-camera.h (100%)
drivers/media/platform/Kconfig +1 -10
index 0cfbc0c2aa7a..83a496327325 100644
@@ -35,16 +35,7 @@ source "drivers/media/platform/nxp/Kconfig"
 
 source "drivers/media/platform/marvell-ccic/Kconfig"
 
-config VIDEO_VIA_CAMERA
-	tristate "VIAFB camera controller support"
-	depends on V4L_PLATFORM_DRIVERS
-	depends on FB_VIA && VIDEO_V4L2
-	select VIDEOBUF2_DMA_SG
-	select VIDEO_OV7670
-	help
-	   Driver support for the integrated camera controller in VIA
-	   Chrome9 chipsets.  Currently only tested on OLPC xo-1.5 systems
-	   with ov7670 sensors.
+source "drivers/media/platform/via/Kconfig"
 
 source "drivers/media/platform/cadence/Kconfig"
 
drivers/media/platform/Makefile +1 -1
index 78ac0fa4dd57..4742b18fd8d8 100644
@@ -42,6 +42,7 @@ obj-y += stm32/
 obj-y += sunxi/
 obj-y += tegra/vde/
 obj-y += ti-vpe/
+obj-y += via/
 obj-y += vsp1/
 obj-y += xilinx/
 
@@ -57,4 +58,3 @@ obj-$(CONFIG_VIDEO_RENESAS_FCP)		+= rcar-fcp.o
 obj-$(CONFIG_VIDEO_RENESAS_FDP1)	+= rcar_fdp1.o
 obj-$(CONFIG_VIDEO_RENESAS_JPU)		+= rcar_jpu.o
 obj-$(CONFIG_VIDEO_SH_VOU)		+= sh_vou.o
-obj-$(CONFIG_VIDEO_VIA_CAMERA)		+= via-camera.o
drivers/media/platform/via/Kconfig new file +11 -0
new file mode 100644
index 000000000000..1dcf789dce96
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_VIA_CAMERA
+	tristate "VIAFB camera controller support"
+	depends on V4L_PLATFORM_DRIVERS
+	depends on FB_VIA && VIDEO_V4L2
+	select VIDEOBUF2_DMA_SG
+	select VIDEO_OV7670
+	help
+	   Driver support for the integrated camera controller in VIA
+	   Chrome9 chipsets.  Currently only tested on OLPC xo-1.5 systems
+	   with ov7670 sensors.
drivers/media/platform/via/Makefile new file +2 -0
new file mode 100644
index 000000000000..80f747f3fffc
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
drivers/media/platform/via/via-camera.c renamed from drivers/media/platform/via-camera.c +0 -0
similarity index 100%
rename from drivers/media/platform/via-camera.c
rename to drivers/media/platform/via/via-camera.c
drivers/media/platform/via/via-camera.h renamed from drivers/media/platform/via-camera.h +0 -0
similarity index 100%
rename from drivers/media/platform/via-camera.h
rename to drivers/media/platform/via/via-camera.h
Signature · 1 line
2.35.1
author maintainer
#10 lore raw

PATCH v2 10/67 media: platform: place Renesas drivers on a separate dir

In reply to Mauro Carvalho Chehab

In order to cleanup the main platform media directory, move Renesas driver to its own directory.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 MAINTAINERS                                   |  18 +--
 drivers/media/platform/Kconfig                | 113 +----------------
 drivers/media/platform/Makefile               |  10 +-
 drivers/media/platform/renesas/Kconfig        | 119 ++++++++++++++++++
 drivers/media/platform/renesas/Makefile       |  15 +++
 .../media/platform/{ => renesas}/rcar-fcp.c   |   0
 .../media/platform/{ => renesas}/rcar-isp.c   |   0
 .../platform/{ => renesas}/rcar-vin/Kconfig   |   0
 .../platform/{ => renesas}/rcar-vin/Makefile  |   0
 .../{ => renesas}/rcar-vin/rcar-core.c        |   0
 .../{ => renesas}/rcar-vin/rcar-csi2.c        |   0
 .../{ => renesas}/rcar-vin/rcar-dma.c         |   0
 .../{ => renesas}/rcar-vin/rcar-v4l2.c        |   0
 .../{ => renesas}/rcar-vin/rcar-vin.h         |   0
 .../media/platform/{ => renesas}/rcar_drif.c  |   0
 .../media/platform/{ => renesas}/rcar_fdp1.c  |   0
 .../media/platform/{ => renesas}/rcar_jpu.c   |   0
 .../platform/{ => renesas}/renesas-ceu.c      |   0
 drivers/media/platform/{ => renesas}/sh_vou.c |   0
 .../platform/{ => renesas}/vsp1/Makefile      |   0
 .../media/platform/{ => renesas}/vsp1/vsp1.h  |   0
 .../platform/{ => renesas}/vsp1/vsp1_brx.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_brx.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_clu.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_clu.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_dl.c     |   0
 .../platform/{ => renesas}/vsp1/vsp1_dl.h     |   0
 .../platform/{ => renesas}/vsp1/vsp1_drm.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_drm.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_drv.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_entity.c |   0
 .../platform/{ => renesas}/vsp1/vsp1_entity.h |   0
 .../platform/{ => renesas}/vsp1/vsp1_hgo.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_hgo.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_hgt.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_hgt.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_histo.c  |   0
 .../platform/{ => renesas}/vsp1/vsp1_histo.h  |   0
 .../platform/{ => renesas}/vsp1/vsp1_hsit.c   |   0
 .../platform/{ => renesas}/vsp1/vsp1_hsit.h   |   0
 .../platform/{ => renesas}/vsp1/vsp1_lif.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_lif.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_lut.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_lut.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_pipe.c   |   0
 .../platform/{ => renesas}/vsp1/vsp1_pipe.h   |   0
 .../platform/{ => renesas}/vsp1/vsp1_regs.h   |   0
 .../platform/{ => renesas}/vsp1/vsp1_rpf.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_rwpf.c   |   0
 .../platform/{ => renesas}/vsp1/vsp1_rwpf.h   |   0
 .../platform/{ => renesas}/vsp1/vsp1_sru.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_sru.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_uds.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_uds.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_uif.c    |   0
 .../platform/{ => renesas}/vsp1/vsp1_uif.h    |   0
 .../platform/{ => renesas}/vsp1/vsp1_video.c  |   0
 .../platform/{ => renesas}/vsp1/vsp1_video.h  |   0
 .../platform/{ => renesas}/vsp1/vsp1_wpf.c    |   0
 59 files changed, 146 insertions(+), 129 deletions(-)
 create mode 100644 drivers/media/platform/renesas/Kconfig
 create mode 100644 drivers/media/platform/renesas/Makefile
 rename drivers/media/platform/{ => renesas}/rcar-fcp.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar-isp.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar-vin/Kconfig (100%)
 rename drivers/media/platform/{ => renesas}/rcar-vin/Makefile (100%)
 rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-core.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-csi2.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-dma.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-v4l2.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar-vin/rcar-vin.h (100%)
 rename drivers/media/platform/{ => renesas}/rcar_drif.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar_fdp1.c (100%)
 rename drivers/media/platform/{ => renesas}/rcar_jpu.c (100%)
 rename drivers/media/platform/{ => renesas}/renesas-ceu.c (100%)
 rename drivers/media/platform/{ => renesas}/sh_vou.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/Makefile (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_brx.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_brx.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_clu.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_clu.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_dl.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_dl.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_drm.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_drm.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_drv.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_entity.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_entity.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_hgo.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_hgo.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_hgt.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_hgt.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_histo.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_histo.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_hsit.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_hsit.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_lif.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_lif.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_lut.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_lut.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_pipe.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_pipe.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_regs.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_rpf.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_rwpf.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_rwpf.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_sru.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_sru.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_uds.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_uds.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_uif.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_uif.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_video.c (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_video.h (100%)
 rename drivers/media/platform/{ => renesas}/vsp1/vsp1_wpf.c (100%)
MAINTAINERS +9 -9
index 780ef2ef3362..848640546398 100644
@@ -10322,7 +10322,7 @@ M:	Mikhail Ulyanov <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Maintained
-F:	drivers/media/platform/rcar_jpu.c
+F:	drivers/media/platform/renesas/rcar_jpu.c
 
 JSM Neo PCI based serial card
 L:	[email protected]
@@ -11973,7 +11973,7 @@ L:	[email protected]
 S:	Supported
 T:	git git://linuxtv.org/media_tree.git
 F:	Documentation/devicetree/bindings/media/renesas,ceu.yaml
-F:	drivers/media/platform/renesas-ceu.c
+F:	drivers/media/platform/renesas/renesas-ceu.c
 F:	include/media/drv-intf/renesas-ceu.h
 
 MEDIA DRIVERS FOR RENESAS - DRIF
@@ -11983,7 +11983,7 @@ L:	[email protected]
 S:	Supported
 T:	git git://linuxtv.org/media_tree.git
 F:	Documentation/devicetree/bindings/media/renesas,drif.yaml
-F:	drivers/media/platform/rcar_drif.c
+F:	drivers/media/platform/renesas/rcar_drif.c
 
 MEDIA DRIVERS FOR RENESAS - FCP
 M:	Laurent Pinchart <[email protected]>
@@ -11992,7 +11992,7 @@ L:	[email protected]
 S:	Supported
 T:	git git://linuxtv.org/media_tree.git
 F:	Documentation/devicetree/bindings/media/renesas,fcp.yaml
-F:	drivers/media/platform/rcar-fcp.c
+F:	drivers/media/platform/renesas/rcar-fcp.c
 F:	include/media/rcar-fcp.h
 
 MEDIA DRIVERS FOR RENESAS - FDP1
@@ -12002,7 +12002,7 @@ L:	[email protected]
 S:	Supported
 T:	git git://linuxtv.org/media_tree.git
 F:	Documentation/devicetree/bindings/media/renesas,fdp1.yaml
-F:	drivers/media/platform/rcar_fdp1.c
+F:	drivers/media/platform/renesas/rcar_fdp1.c
 
 MEDIA DRIVERS FOR RENESAS - VIN
 M:	Niklas Söderlund <[email protected]>
@@ -12013,8 +12013,8 @@ T:	git git://linuxtv.org/media_tree.git
 F:	Documentation/devicetree/bindings/media/renesas,csi2.yaml
 F:	Documentation/devicetree/bindings/media/renesas,isp.yaml
 F:	Documentation/devicetree/bindings/media/renesas,vin.yaml
-F:	drivers/media/platform/rcar-isp.c
-F:	drivers/media/platform/rcar-vin/
+F:	drivers/media/platform/renesas/rcar-isp.c
+F:	drivers/media/platform/renesas/rcar-vin/
 
 MEDIA DRIVERS FOR RENESAS - VSP1
 M:	Laurent Pinchart <[email protected]>
@@ -12024,7 +12024,7 @@ L:	[email protected]
 S:	Supported
 T:	git git://linuxtv.org/media_tree.git
 F:	Documentation/devicetree/bindings/media/renesas,vsp1.yaml
-F:	drivers/media/platform/vsp1/
+F:	drivers/media/platform/renesas/vsp1/
 
 MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs
 L:	[email protected]
@@ -17536,7 +17536,7 @@ F:	include/media/i2c/rj54n1cb0c.h
 SH_VOU V4L2 OUTPUT DRIVER
 L:	[email protected]
 S:	Orphan
-F:	drivers/media/platform/sh_vou.c
+F:	drivers/media/platform/renesas/sh_vou.c
 F:	include/media/drv-intf/sh_vou.h
 
 SI2157 MEDIA DRIVER
drivers/media/platform/Kconfig +2 -111

152 lines not on this page · raw message

drivers/media/platform/Makefile +1 -9
index 4742b18fd8d8..20b07ae3ebf1 100644
@@ -27,7 +27,7 @@ obj-y += omap/
 obj-y += omap3isp/
 obj-y += qcom/camss/
 obj-y += qcom/venus/
-obj-y += rcar-vin/
+obj-y += renesas/
 obj-y += rockchip/rga/
 obj-y += rockchip/rkisp1/
 obj-y += s3c-camif/
@@ -43,7 +43,6 @@ obj-y += sunxi/
 obj-y += tegra/vde/
 obj-y += ti-vpe/
 obj-y += via/
-obj-y += vsp1/
 obj-y += xilinx/
 
 # Please place here only ancillary drivers that aren't SoC-specific
@@ -51,10 +50,3 @@ obj-y += xilinx/
 # (e. g. LC_ALL=C sort Makefile)
 obj-$(CONFIG_VIDEO_MEM2MEM_DEINTERLACE)	+= m2m-deinterlace.o
 obj-$(CONFIG_VIDEO_MUX)			+= video-mux.o
-obj-$(CONFIG_VIDEO_RCAR_DRIF)		+= rcar_drif.o
-obj-$(CONFIG_VIDEO_RCAR_ISP)		+= rcar-isp.o
-obj-$(CONFIG_VIDEO_RENESAS_CEU)		+= renesas-ceu.o
-obj-$(CONFIG_VIDEO_RENESAS_FCP)		+= rcar-fcp.o
-obj-$(CONFIG_VIDEO_RENESAS_FDP1)	+= rcar_fdp1.o
-obj-$(CONFIG_VIDEO_RENESAS_JPU)		+= rcar_jpu.o
-obj-$(CONFIG_VIDEO_SH_VOU)		+= sh_vou.o
drivers/media/platform/renesas/Kconfig new file +119 -0

119 lines not on this page · raw message

drivers/media/platform/renesas/Makefile new file +15 -0
new file mode 100644
index 000000000000..3ec226ef5fd2
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Makefile for the Renesas capture/playback device drivers.
+#
+
+obj-y += rcar-vin/
+obj-y += vsp1/
+
+obj-$(CONFIG_VIDEO_RCAR_DRIF) += rcar_drif.o
+obj-$(CONFIG_VIDEO_RCAR_ISP) += rcar-isp.o
+obj-$(CONFIG_VIDEO_RENESAS_CEU) += renesas-ceu.o
+obj-$(CONFIG_VIDEO_RENESAS_FCP) += rcar-fcp.o
+obj-$(CONFIG_VIDEO_RENESAS_FDP1) += rcar_fdp1.o
+obj-$(CONFIG_VIDEO_RENESAS_JPU) += rcar_jpu.o
+obj-$(CONFIG_VIDEO_SH_VOU) += sh_vou.o
drivers/media/platform/renesas/rcar-fcp.c renamed from drivers/media/platform/rcar-fcp.c +0 -0
similarity index 100%
rename from drivers/media/platform/rcar-fcp.c
rename to drivers/media/platform/renesas/rcar-fcp.c
drivers/media/platform/renesas/rcar-isp.c renamed from drivers/media/platform/rcar-isp.c +0 -0
similarity index 100%
rename from drivers/media/platform/rcar-isp.c
rename to drivers/media/platform/renesas/rcar-isp.c
drivers/media/platform/renesas/rcar-vin/Kconfig renamed from drivers/media/platform/rcar-vin/Kconfig +0 -0
similarity index 100%
rename from drivers/media/platform/rcar-vin/Kconfig
rename to drivers/media/platform/renesas/rcar-vin/Kconfig
drivers/media/platform/renesas/rcar-vin/Makefile renamed from drivers/media/platform/rcar-vin/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/rcar-vin/Makefile
rename to drivers/media/platform/renesas/rcar-vin/Makefile
drivers/media/platform/renesas/rcar-vin/rcar-core.c renamed from drivers/media/platform/rcar-vin/rcar-core.c +0 -0
similarity index 100%
rename from drivers/media/platform/rcar-vin/rcar-core.c
rename to drivers/media/platform/renesas/rcar-vin/rcar-core.c
drivers/media/platform/renesas/rcar-vin/rcar-csi2.c renamed from drivers/media/platform/rcar-vin/rcar-csi2.c +0 -0
similarity index 100%
rename from drivers/media/platform/rcar-vin/rcar-csi2.c
rename to drivers/media/platform/renesas/rcar-vin/rcar-csi2.c
drivers/media/platform/renesas/rcar-vin/rcar-dma.c renamed from drivers/media/platform/rcar-vin/rcar-dma.c +0 -0
similarity index 100%
rename from drivers/media/platform/rcar-vin/rcar-dma.c
rename to drivers/media/platform/renesas/rcar-vin/rcar-dma.c
drivers/media/platform/renesas/rcar-vin/rcar-v4l2.c renamed from drivers/media/platform/rcar-vin/rcar-v4l2.c +0 -0
similarity index 100%
rename from drivers/media/platform/rcar-vin/rcar-v4l2.c
rename to drivers/media/platform/renesas/rcar-vin/rcar-v4l2.c
drivers/media/platform/renesas/rcar-vin/rcar-vin.h renamed from drivers/media/platform/rcar-vin/rcar-vin.h +0 -0
similarity index 100%
rename from drivers/media/platform/rcar-vin/rcar-vin.h
rename to drivers/media/platform/renesas/rcar-vin/rcar-vin.h
drivers/media/platform/renesas/rcar_drif.c renamed from drivers/media/platform/rcar_drif.c +0 -0
similarity index 100%
rename from drivers/media/platform/rcar_drif.c
rename to drivers/media/platform/renesas/rcar_drif.c
drivers/media/platform/renesas/rcar_fdp1.c renamed from drivers/media/platform/rcar_fdp1.c +0 -0
similarity index 100%
rename from drivers/media/platform/rcar_fdp1.c
rename to drivers/media/platform/renesas/rcar_fdp1.c
drivers/media/platform/renesas/rcar_jpu.c renamed from drivers/media/platform/rcar_jpu.c +0 -0
similarity index 100%
rename from drivers/media/platform/rcar_jpu.c
rename to drivers/media/platform/renesas/rcar_jpu.c
drivers/media/platform/renesas/renesas-ceu.c renamed from drivers/media/platform/renesas-ceu.c +0 -0
similarity index 100%
rename from drivers/media/platform/renesas-ceu.c
rename to drivers/media/platform/renesas/renesas-ceu.c
drivers/media/platform/renesas/sh_vou.c renamed from drivers/media/platform/sh_vou.c +0 -0
similarity index 100%
rename from drivers/media/platform/sh_vou.c
rename to drivers/media/platform/renesas/sh_vou.c
drivers/media/platform/renesas/vsp1/Makefile renamed from drivers/media/platform/vsp1/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/Makefile
rename to drivers/media/platform/renesas/vsp1/Makefile
drivers/media/platform/renesas/vsp1/vsp1.h renamed from drivers/media/platform/vsp1/vsp1.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1.h
rename to drivers/media/platform/renesas/vsp1/vsp1.h
drivers/media/platform/renesas/vsp1/vsp1_brx.c renamed from drivers/media/platform/vsp1/vsp1_brx.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_brx.c
rename to drivers/media/platform/renesas/vsp1/vsp1_brx.c
drivers/media/platform/renesas/vsp1/vsp1_brx.h renamed from drivers/media/platform/vsp1/vsp1_brx.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_brx.h
rename to drivers/media/platform/renesas/vsp1/vsp1_brx.h
drivers/media/platform/renesas/vsp1/vsp1_clu.c renamed from drivers/media/platform/vsp1/vsp1_clu.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_clu.c
rename to drivers/media/platform/renesas/vsp1/vsp1_clu.c
drivers/media/platform/renesas/vsp1/vsp1_clu.h renamed from drivers/media/platform/vsp1/vsp1_clu.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_clu.h
rename to drivers/media/platform/renesas/vsp1/vsp1_clu.h
drivers/media/platform/renesas/vsp1/vsp1_dl.c renamed from drivers/media/platform/vsp1/vsp1_dl.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_dl.c
rename to drivers/media/platform/renesas/vsp1/vsp1_dl.c
drivers/media/platform/renesas/vsp1/vsp1_dl.h renamed from drivers/media/platform/vsp1/vsp1_dl.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_dl.h
rename to drivers/media/platform/renesas/vsp1/vsp1_dl.h
drivers/media/platform/renesas/vsp1/vsp1_drm.c renamed from drivers/media/platform/vsp1/vsp1_drm.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_drm.c
rename to drivers/media/platform/renesas/vsp1/vsp1_drm.c
drivers/media/platform/renesas/vsp1/vsp1_drm.h renamed from drivers/media/platform/vsp1/vsp1_drm.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_drm.h
rename to drivers/media/platform/renesas/vsp1/vsp1_drm.h
drivers/media/platform/renesas/vsp1/vsp1_drv.c renamed from drivers/media/platform/vsp1/vsp1_drv.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_drv.c
rename to drivers/media/platform/renesas/vsp1/vsp1_drv.c
drivers/media/platform/renesas/vsp1/vsp1_entity.c renamed from drivers/media/platform/vsp1/vsp1_entity.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_entity.c
rename to drivers/media/platform/renesas/vsp1/vsp1_entity.c
drivers/media/platform/renesas/vsp1/vsp1_entity.h renamed from drivers/media/platform/vsp1/vsp1_entity.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_entity.h
rename to drivers/media/platform/renesas/vsp1/vsp1_entity.h
drivers/media/platform/renesas/vsp1/vsp1_hgo.c renamed from drivers/media/platform/vsp1/vsp1_hgo.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_hgo.c
rename to drivers/media/platform/renesas/vsp1/vsp1_hgo.c
drivers/media/platform/renesas/vsp1/vsp1_hgo.h renamed from drivers/media/platform/vsp1/vsp1_hgo.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_hgo.h
rename to drivers/media/platform/renesas/vsp1/vsp1_hgo.h
drivers/media/platform/renesas/vsp1/vsp1_hgt.c renamed from drivers/media/platform/vsp1/vsp1_hgt.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_hgt.c
rename to drivers/media/platform/renesas/vsp1/vsp1_hgt.c
drivers/media/platform/renesas/vsp1/vsp1_hgt.h renamed from drivers/media/platform/vsp1/vsp1_hgt.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_hgt.h
rename to drivers/media/platform/renesas/vsp1/vsp1_hgt.h
drivers/media/platform/renesas/vsp1/vsp1_histo.c renamed from drivers/media/platform/vsp1/vsp1_histo.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_histo.c
rename to drivers/media/platform/renesas/vsp1/vsp1_histo.c
drivers/media/platform/renesas/vsp1/vsp1_histo.h renamed from drivers/media/platform/vsp1/vsp1_histo.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_histo.h
rename to drivers/media/platform/renesas/vsp1/vsp1_histo.h
drivers/media/platform/renesas/vsp1/vsp1_hsit.c renamed from drivers/media/platform/vsp1/vsp1_hsit.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_hsit.c
rename to drivers/media/platform/renesas/vsp1/vsp1_hsit.c
drivers/media/platform/renesas/vsp1/vsp1_hsit.h renamed from drivers/media/platform/vsp1/vsp1_hsit.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_hsit.h
rename to drivers/media/platform/renesas/vsp1/vsp1_hsit.h
drivers/media/platform/renesas/vsp1/vsp1_lif.c renamed from drivers/media/platform/vsp1/vsp1_lif.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_lif.c
rename to drivers/media/platform/renesas/vsp1/vsp1_lif.c
drivers/media/platform/renesas/vsp1/vsp1_lif.h renamed from drivers/media/platform/vsp1/vsp1_lif.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_lif.h
rename to drivers/media/platform/renesas/vsp1/vsp1_lif.h
drivers/media/platform/renesas/vsp1/vsp1_lut.c renamed from drivers/media/platform/vsp1/vsp1_lut.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_lut.c
rename to drivers/media/platform/renesas/vsp1/vsp1_lut.c
drivers/media/platform/renesas/vsp1/vsp1_lut.h renamed from drivers/media/platform/vsp1/vsp1_lut.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_lut.h
rename to drivers/media/platform/renesas/vsp1/vsp1_lut.h
drivers/media/platform/renesas/vsp1/vsp1_pipe.c renamed from drivers/media/platform/vsp1/vsp1_pipe.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_pipe.c
rename to drivers/media/platform/renesas/vsp1/vsp1_pipe.c
drivers/media/platform/renesas/vsp1/vsp1_pipe.h renamed from drivers/media/platform/vsp1/vsp1_pipe.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_pipe.h
rename to drivers/media/platform/renesas/vsp1/vsp1_pipe.h
drivers/media/platform/renesas/vsp1/vsp1_regs.h renamed from drivers/media/platform/vsp1/vsp1_regs.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_regs.h
rename to drivers/media/platform/renesas/vsp1/vsp1_regs.h
drivers/media/platform/renesas/vsp1/vsp1_rpf.c renamed from drivers/media/platform/vsp1/vsp1_rpf.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_rpf.c
rename to drivers/media/platform/renesas/vsp1/vsp1_rpf.c
drivers/media/platform/renesas/vsp1/vsp1_rwpf.c renamed from drivers/media/platform/vsp1/vsp1_rwpf.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_rwpf.c
rename to drivers/media/platform/renesas/vsp1/vsp1_rwpf.c
drivers/media/platform/renesas/vsp1/vsp1_rwpf.h renamed from drivers/media/platform/vsp1/vsp1_rwpf.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_rwpf.h
rename to drivers/media/platform/renesas/vsp1/vsp1_rwpf.h
drivers/media/platform/renesas/vsp1/vsp1_sru.c renamed from drivers/media/platform/vsp1/vsp1_sru.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_sru.c
rename to drivers/media/platform/renesas/vsp1/vsp1_sru.c
drivers/media/platform/renesas/vsp1/vsp1_sru.h renamed from drivers/media/platform/vsp1/vsp1_sru.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_sru.h
rename to drivers/media/platform/renesas/vsp1/vsp1_sru.h
drivers/media/platform/renesas/vsp1/vsp1_uds.c renamed from drivers/media/platform/vsp1/vsp1_uds.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_uds.c
rename to drivers/media/platform/renesas/vsp1/vsp1_uds.c
drivers/media/platform/renesas/vsp1/vsp1_uds.h renamed from drivers/media/platform/vsp1/vsp1_uds.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_uds.h
rename to drivers/media/platform/renesas/vsp1/vsp1_uds.h
drivers/media/platform/renesas/vsp1/vsp1_uif.c renamed from drivers/media/platform/vsp1/vsp1_uif.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_uif.c
rename to drivers/media/platform/renesas/vsp1/vsp1_uif.c
drivers/media/platform/renesas/vsp1/vsp1_uif.h renamed from drivers/media/platform/vsp1/vsp1_uif.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_uif.h
rename to drivers/media/platform/renesas/vsp1/vsp1_uif.h
drivers/media/platform/renesas/vsp1/vsp1_video.c renamed from drivers/media/platform/vsp1/vsp1_video.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_video.c
rename to drivers/media/platform/renesas/vsp1/vsp1_video.c
drivers/media/platform/renesas/vsp1/vsp1_video.h renamed from drivers/media/platform/vsp1/vsp1_video.h +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_video.h
rename to drivers/media/platform/renesas/vsp1/vsp1_video.h
drivers/media/platform/renesas/vsp1/vsp1_wpf.c renamed from drivers/media/platform/vsp1/vsp1_wpf.c +0 -0
similarity index 100%
rename from drivers/media/platform/vsp1/vsp1_wpf.c
rename to drivers/media/platform/renesas/vsp1/vsp1_wpf.c
Signature · 1 line
2.35.1
author maintainer
#11 lore raw

PATCH v2 11/67 media: platform: allegro-dvt: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place allegro-dvt-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig             | 17 +----------------
 drivers/media/platform/allegro-dvt/Kconfig | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 drivers/media/platform/allegro-dvt/Kconfig
drivers/media/platform/Kconfig +1 -16
index b6650caecf45..25e5ae27210d 100644
@@ -29,6 +29,7 @@ config V4L_MEM2MEM_DRIVERS
 	  to capture and output drivers, which use memory buffers for just
 	  one of those.
 
+source "drivers/media/platform/allegro-dvt/Kconfig"
 source "drivers/media/platform/nxp/Kconfig"
 
 source "drivers/media/platform/renesas/Kconfig"
@@ -176,22 +177,6 @@ config VIDEO_TI_CAL_MC
 
 # Mem2mem drivers
 
-config VIDEO_ALLEGRO_DVT
-	tristate "Allegro DVT Video IP Core"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_ZYNQMP || COMPILE_TEST
-	select V4L2_MEM2MEM_DEV
-	select VIDEOBUF2_DMA_CONTIG
-	select REGMAP_MMIO
-	help
-	  Support for the encoder video IP core by Allegro DVT. This core is
-	  found for example on the Xilinx ZynqMP SoC in the EV family and is
-	  called VCU in the reference manual.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called allegro.
-
 config VIDEO_CODA
 	tristate "Chips&Media Coda multi-standard codec IP"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/allegro-dvt/Kconfig new file +16 -0
new file mode 100644
index 000000000000..dd528e9d0958
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_ALLEGRO_DVT
+	tristate "Allegro DVT Video IP Core"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_ZYNQMP || COMPILE_TEST
+	select V4L2_MEM2MEM_DEV
+	select VIDEOBUF2_DMA_CONTIG
+	select REGMAP_MMIO
+	help
+	  Support for the encoder video IP core by Allegro DVT. This core is
+	  found for example on the Xilinx ZynqMP SoC in the EV family and is
+	  called VCU in the reference manual.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called allegro.
Signature · 1 line
2.35.1
author maintainer
#12 lore raw

PATCH v2 12/67 media: platform: amphion: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place amphion-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig         | 21 +--------------------
 drivers/media/platform/amphion/Kconfig | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 drivers/media/platform/amphion/Kconfig
drivers/media/platform/Kconfig +1 -20
index 25e5ae27210d..060d6264dea4 100644
@@ -40,6 +40,7 @@ source "drivers/media/platform/marvell-ccic/Kconfig"
 
 source "drivers/media/platform/via/Kconfig"
 
+source "drivers/media/platform/amphion/Kconfig"
 source "drivers/media/platform/cadence/Kconfig"
 
 source "drivers/media/platform/davinci/Kconfig"
@@ -524,26 +525,6 @@ config VIDEO_TEGRA_VDE
 	   Support for the NVIDIA Tegra video decoder unit.
 	   To compile this driver as a module choose m here.
 
-config VIDEO_AMPHION_VPU
-	tristate "Amphion VPU (Video Processing Unit) Codec IP"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on ARCH_MXC || COMPILE_TEST
-	depends on MEDIA_SUPPORT
-	depends on VIDEO_DEV
-	depends on VIDEO_V4L2
-	select MEDIA_CONTROLLER
-	select V4L2_MEM2MEM_DEV
-	select VIDEOBUF2_DMA_CONTIG
-	select VIDEOBUF2_VMALLOC
-	help
-	  Amphion VPU Codec IP contains two parts: Windsor and Malone.
-	  Windsor is encoder that supports H.264, and Malone is decoder
-	  that supports H.264, HEVC, and other video formats.
-	  This is a V4L2 driver for NXP MXC 8Q video accelerator hardware.
-	  It accelerates encoding and decoding operations on
-	  various NXP SoCs.
-	  To compile this driver as a module choose m here.
-
 # TI VIDEO PORT Helper Modules
 # These will be selected by VPE and VIP
 config VIDEO_TI_VPDMA
drivers/media/platform/amphion/Kconfig new file +20 -0
new file mode 100644
index 000000000000..13899649f766
@@ -0,0 +1,20 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_AMPHION_VPU
+	tristate "Amphion VPU (Video Processing Unit) Codec IP"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on ARCH_MXC || COMPILE_TEST
+	depends on MEDIA_SUPPORT
+	depends on VIDEO_DEV
+	depends on VIDEO_V4L2
+	select MEDIA_CONTROLLER
+	select V4L2_MEM2MEM_DEV
+	select VIDEOBUF2_DMA_CONTIG
+	select VIDEOBUF2_VMALLOC
+	help
+	  Amphion VPU Codec IP contains two parts: Windsor and Malone.
+	  Windsor is encoder that supports H.264, and Malone is decoder
+	  that supports H.264, HEVC, and other video formats.
+	  This is a V4L2 driver for NXP MXC 8Q video accelerator hardware.
+	  It accelerates encoding and decoding operations on
+	  various NXP SoCs.
+	  To compile this driver as a module choose m here.
Signature · 1 line
2.35.1
author maintainer
#13 lore raw

PATCH v2 13/67 media: platform: coda: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place coda-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig      | 18 +-----------------
 drivers/media/platform/coda/Kconfig | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 drivers/media/platform/coda/Kconfig
drivers/media/platform/Kconfig +1 -17
index 060d6264dea4..0bf9dd5da845 100644
@@ -43,6 +43,7 @@ source "drivers/media/platform/via/Kconfig"
 source "drivers/media/platform/amphion/Kconfig"
 source "drivers/media/platform/cadence/Kconfig"
 
+source "drivers/media/platform/coda/Kconfig"
 source "drivers/media/platform/davinci/Kconfig"
 
 source "drivers/media/platform/omap/Kconfig"
@@ -178,23 +179,6 @@ config VIDEO_TI_CAL_MC
 
 # Mem2mem drivers
 
-config VIDEO_CODA
-	tristate "Chips&Media Coda multi-standard codec IP"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2 && OF && (ARCH_MXC || COMPILE_TEST)
-	select SRAM
-	select VIDEOBUF2_DMA_CONTIG
-	select VIDEOBUF2_VMALLOC
-	select V4L2_JPEG_HELPER
-	select V4L2_MEM2MEM_DEV
-	select GENERIC_ALLOCATOR
-	help
-	   Coda is a range of video codec IPs that supports
-	   H.264, MPEG-4, and other video formats.
-
-config VIDEO_IMX_VDOA
-	def_tristate VIDEO_CODA if SOC_IMX6Q || COMPILE_TEST
-
 config VIDEO_MEDIATEK_JPEG
 	tristate "Mediatek JPEG Codec driver"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/coda/Kconfig new file +17 -0
new file mode 100644
index 000000000000..ae495fd7b25a
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_CODA
+	tristate "Chips&Media Coda multi-standard codec IP"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2 && OF && (ARCH_MXC || COMPILE_TEST)
+	select SRAM
+	select VIDEOBUF2_DMA_CONTIG
+	select VIDEOBUF2_VMALLOC
+	select V4L2_JPEG_HELPER
+	select V4L2_MEM2MEM_DEV
+	select GENERIC_ALLOCATOR
+	help
+	   Coda is a range of video codec IPs that supports
+	   H.264, MPEG-4, and other video formats.
+
+config VIDEO_IMX_VDOA
+	def_tristate VIDEO_CODA if SOC_IMX6Q || COMPILE_TEST
Signature · 1 line
2.35.1
author maintainer
#14 lore raw

PATCH v2 14/67 media: platform: exynos-gsc: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place exynos-gsc-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig            | 11 +----------
 drivers/media/platform/exynos-gsc/Kconfig | 10 ++++++++++
 2 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 drivers/media/platform/exynos-gsc/Kconfig
drivers/media/platform/Kconfig +1 -10
index 0bf9dd5da845..57ca2426a83b 100644
@@ -46,6 +46,7 @@ source "drivers/media/platform/cadence/Kconfig"
 source "drivers/media/platform/coda/Kconfig"
 source "drivers/media/platform/davinci/Kconfig"
 
+source "drivers/media/platform/exynos-gsc/Kconfig"
 source "drivers/media/platform/omap/Kconfig"
 
 source "drivers/media/platform/aspeed/Kconfig"
@@ -317,16 +318,6 @@ config VIDEO_SAMSUNG_S5P_MFC
 	help
 	    MFC 5.1 and 6.x driver for V4L2
 
-config VIDEO_SAMSUNG_EXYNOS_GSC
-	tristate "Samsung Exynos G-Scaler driver"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_EXYNOS || COMPILE_TEST
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	  This is a v4l2 driver for Samsung EXYNOS5 SoC G-Scaler.
-
 config VIDEO_STI_BDISP
 	tristate "STMicroelectronics BDISP 2D blitter driver"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/exynos-gsc/Kconfig new file +10 -0
new file mode 100644
index 000000000000..f9bdffe915b4
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_SAMSUNG_EXYNOS_GSC
+	tristate "Samsung Exynos G-Scaler driver"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_EXYNOS || COMPILE_TEST
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	help
+	  This is a v4l2 driver for Samsung EXYNOS5 SoC G-Scaler.
Signature · 1 line
2.35.1
author maintainer
#15 lore raw

PATCH v2 15/67 media: platform: ge2d: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place ge2d-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig            | 15 +--------------
 drivers/media/platform/meson/ge2d/Kconfig | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 drivers/media/platform/meson/ge2d/Kconfig
drivers/media/platform/Kconfig +1 -14
index 57ca2426a83b..d3b7bef19237 100644
@@ -47,6 +47,7 @@ source "drivers/media/platform/coda/Kconfig"
 source "drivers/media/platform/davinci/Kconfig"
 
 source "drivers/media/platform/exynos-gsc/Kconfig"
+source "drivers/media/platform/meson/ge2d/Kconfig"
 source "drivers/media/platform/omap/Kconfig"
 
 source "drivers/media/platform/aspeed/Kconfig"
@@ -273,20 +274,6 @@ config VIDEO_MEM2MEM_DEINTERLACE
 	help
 	    Generic deinterlacing V4L2 driver.
 
-config VIDEO_MESON_GE2D
-	tristate "Amlogic 2D Graphic Acceleration Unit"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_MESON || COMPILE_TEST
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	  This is a v4l2 driver for Amlogic GE2D 2D graphics accelerator.
-	  GE2D is a standalone 2D graphic acceleration unit, with color converter,
-	  image scaling, BitBLT & alpha blending operations.
-
-	  To compile this driver as a module choose m here.
-
 config VIDEO_SAMSUNG_S5P_G2D
 	tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/meson/ge2d/Kconfig new file +14 -0
new file mode 100644
index 000000000000..8c3f3b1b6b05
@@ -0,0 +1,14 @@
+config VIDEO_MESON_GE2D
+	tristate "Amlogic 2D Graphic Acceleration Unit"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_MESON || COMPILE_TEST
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	help
+	  This is a v4l2 driver for Amlogic GE2D 2D graphics accelerator.
+	  GE2D is a standalone 2D graphic acceleration unit, with color converter,
+	  image scaling, BitBLT & alpha blending operations.
+
+	  To compile this driver as a module choose m here.
+
Signature · 1 line
2.35.1
author maintainer
#16 lore raw

PATCH v2 16/67 media: platform: mtk-jpeg: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place mtk-jpeg-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig          | 17 +----------------
 drivers/media/platform/mtk-jpeg/Kconfig | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100644 drivers/media/platform/mtk-jpeg/Kconfig
drivers/media/platform/Kconfig +1 -16
index d3b7bef19237..f517aa951460 100644
@@ -48,6 +48,7 @@ source "drivers/media/platform/davinci/Kconfig"
 
 source "drivers/media/platform/exynos-gsc/Kconfig"
 source "drivers/media/platform/meson/ge2d/Kconfig"
+source "drivers/media/platform/mtk-jpeg/Kconfig"
 source "drivers/media/platform/omap/Kconfig"
 
 source "drivers/media/platform/aspeed/Kconfig"
@@ -181,22 +182,6 @@ config VIDEO_TI_CAL_MC
 
 # Mem2mem drivers
 
-config VIDEO_MEDIATEK_JPEG
-	tristate "Mediatek JPEG Codec driver"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on MTK_IOMMU_V1 || MTK_IOMMU || COMPILE_TEST
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_MEDIATEK || COMPILE_TEST
-	depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n)
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	  Mediatek jpeg codec driver provides HW capability to decode
-	  JPEG format
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called mtk-jpeg
-
 config VIDEO_MEDIATEK_VPU
 	tristate "Mediatek Video Processor Unit"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/mtk-jpeg/Kconfig new file +16 -0
new file mode 100644
index 000000000000..72ed920b011a
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_MEDIATEK_JPEG
+	tristate "Mediatek JPEG Codec driver"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on MTK_IOMMU_V1 || MTK_IOMMU || COMPILE_TEST
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_MEDIATEK || COMPILE_TEST
+	depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n)
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	help
+	  Mediatek jpeg codec driver provides HW capability to decode
+	  JPEG format
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called mtk-jpeg
Signature · 1 line
2.35.1
author maintainer
#17 lore raw

PATCH v2 17/67 media: platform: mtk-mdp: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place mtk-mdp-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig         | 18 +-----------------
 drivers/media/platform/mtk-mdp/Kconfig | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 drivers/media/platform/mtk-mdp/Kconfig
drivers/media/platform/Kconfig +1 -17
index f517aa951460..3b3d7af47ca1 100644
@@ -49,6 +49,7 @@ source "drivers/media/platform/davinci/Kconfig"
 source "drivers/media/platform/exynos-gsc/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/omap/Kconfig"
 
 source "drivers/media/platform/aspeed/Kconfig"
@@ -196,23 +197,6 @@ config VIDEO_MEDIATEK_VPU
 	    To compile this driver as a module, choose M here: the
 	    module will be called mtk-vpu.
 
-config VIDEO_MEDIATEK_MDP
-	tristate "Mediatek MDP driver"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on MTK_IOMMU || COMPILE_TEST
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_MEDIATEK || COMPILE_TEST
-	depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n)
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	select VIDEO_MEDIATEK_VPU
-	help
-	    It is a v4l2 driver and present in Mediatek MT8173 SoCs.
-	    The driver supports for scaling and color space conversion.
-
-	    To compile this driver as a module, choose M here: the
-	    module will be called mtk-mdp.
-
 config VIDEO_MEDIATEK_VCODEC
 	tristate "Mediatek Video Codec driver"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/mtk-mdp/Kconfig new file +17 -0
new file mode 100644
index 000000000000..0cc743165a1a
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_MEDIATEK_MDP
+	tristate "Mediatek MDP driver"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on MTK_IOMMU || COMPILE_TEST
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_MEDIATEK || COMPILE_TEST
+	depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n)
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	select VIDEO_MEDIATEK_VPU
+	help
+	    It is a v4l2 driver and present in Mediatek MT8173 SoCs.
+	    The driver supports for scaling and color space conversion.
+
+	    To compile this driver as a module, choose M here: the
+	    module will be called mtk-mdp.
Signature · 1 line
2.35.1
author maintainer
#18 lore raw

PATCH v2 18/67 media: platform: mtk-vcodec: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place mtk-vcodec-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig            | 37 +----------------------
 drivers/media/platform/mtk-vcodec/Kconfig | 36 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 36 deletions(-)
 create mode 100644 drivers/media/platform/mtk-vcodec/Kconfig
drivers/media/platform/Kconfig +1 -36
index 3b3d7af47ca1..ab7c85613625 100644
@@ -50,6 +50,7 @@ source "drivers/media/platform/exynos-gsc/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"
 source "drivers/media/platform/omap/Kconfig"
 
 source "drivers/media/platform/aspeed/Kconfig"
@@ -197,42 +198,6 @@ config VIDEO_MEDIATEK_VPU
 	    To compile this driver as a module, choose M here: the
 	    module will be called mtk-vpu.
 
-config VIDEO_MEDIATEK_VCODEC
-	tristate "Mediatek Video Codec driver"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on MTK_IOMMU || COMPILE_TEST
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_MEDIATEK || COMPILE_TEST
-	depends on VIDEO_MEDIATEK_VPU || MTK_SCP
-	# The two following lines ensure we have the same state ("m" or "y") as
-	# our dependencies, to avoid missing symbols during link.
-	depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU
-	depends on MTK_SCP || !MTK_SCP
-	depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n)
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU
-	select VIDEO_MEDIATEK_VCODEC_SCP if MTK_SCP
-	select V4L2_H264
-	select MEDIA_CONTROLLER
-	select MEDIA_CONTROLLER_REQUEST_API
-	help
-	  Mediatek video codec driver provides HW capability to
-	  encode and decode in a range of video formats on MT8173
-	  and MT8183.
-
-	  Note that support for MT8173 requires VIDEO_MEDIATEK_VPU to
-	  also be selected. Support for MT8183 depends on MTK_SCP.
-
-	  To compile this driver as modules, choose M here: the
-	  modules will be called mtk-vcodec-dec and mtk-vcodec-enc.
-
-config VIDEO_MEDIATEK_VCODEC_VPU
-	bool
-
-config VIDEO_MEDIATEK_VCODEC_SCP
-	bool
-
 config VIDEO_MEM2MEM_DEINTERLACE
 	tristate "Deinterlace support"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/mtk-vcodec/Kconfig new file +36 -0
new file mode 100644
index 000000000000..635801a19d55
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_MEDIATEK_VCODEC_SCP
+	bool
+
+config VIDEO_MEDIATEK_VCODEC_VPU
+	bool
+
+config VIDEO_MEDIATEK_VCODEC
+	tristate "Mediatek Video Codec driver"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on MTK_IOMMU || COMPILE_TEST
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_MEDIATEK || COMPILE_TEST
+	depends on VIDEO_MEDIATEK_VPU || MTK_SCP
+	# The two following lines ensure we have the same state ("m" or "y") as
+	# our dependencies, to avoid missing symbols during link.
+	depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU
+	depends on MTK_SCP || !MTK_SCP
+	depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n)
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU
+	select VIDEO_MEDIATEK_VCODEC_SCP if MTK_SCP
+	select V4L2_H264
+	select MEDIA_CONTROLLER
+	select MEDIA_CONTROLLER_REQUEST_API
+	help
+	  Mediatek video codec driver provides HW capability to
+	  encode and decode in a range of video formats on MT8173
+	  and MT8183.
+
+	  Note that support for MT8173 requires VIDEO_MEDIATEK_VPU to
+	  also be selected. Support for MT8183 depends on MTK_SCP.
+
+	  To compile this driver as modules, choose M here: the
+	  modules will be called mtk-vcodec-dec and mtk-vcodec-enc.
Signature · 1 line
2.35.1
author maintainer
#19 lore raw

PATCH v2 19/67 media: platform: mtk-vpu: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place mtk-vpu-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig         | 15 +--------------
 drivers/media/platform/mtk-vpu/Kconfig | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 drivers/media/platform/mtk-vpu/Kconfig
drivers/media/platform/Kconfig +1 -14
index ab7c85613625..39bf4c57e044 100644
@@ -51,6 +51,7 @@ 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"
+source "drivers/media/platform/mtk-vpu/Kconfig"
 source "drivers/media/platform/omap/Kconfig"
 
 source "drivers/media/platform/aspeed/Kconfig"
@@ -184,20 +185,6 @@ config VIDEO_TI_CAL_MC
 
 # Mem2mem drivers
 
-config VIDEO_MEDIATEK_VPU
-	tristate "Mediatek Video Processor Unit"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_MEDIATEK || COMPILE_TEST
-	help
-	    This driver provides downloading VPU firmware and
-	    communicating with VPU. This driver for hw video
-	    codec embedded in Mediatek's MT8173 SOCs. It is able
-	    to handle video decoding/encoding in a range of formats.
-
-	    To compile this driver as a module, choose M here: the
-	    module will be called mtk-vpu.
-
 config VIDEO_MEM2MEM_DEINTERLACE
 	tristate "Deinterlace support"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/mtk-vpu/Kconfig new file +15 -0
new file mode 100644
index 000000000000..df679ea79ed0
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config VIDEO_MEDIATEK_VPU
+	tristate "Mediatek Video Processor Unit"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_MEDIATEK || COMPILE_TEST
+	help
+	    This driver provides downloading VPU firmware and
+	    communicating with VPU. This driver for hw video
+	    codec embedded in Mediatek's MT8173 SOCs. It is able
+	    to handle video decoding/encoding in a range of formats.
+
+	    To compile this driver as a module, choose M here: the
+	    module will be called mtk-vpu.
Signature · 1 line
2.35.1
author maintainer
#20 lore raw

PATCH v2 20/67 media: platform: omap3isp: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place omap3isp-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig          | 22 +---------------------
 drivers/media/platform/omap3isp/Kconfig | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 drivers/media/platform/omap3isp/Kconfig
drivers/media/platform/Kconfig +1 -21
index 39bf4c57e044..1dac7a5b53eb 100644
@@ -52,6 +52,7 @@ source "drivers/media/platform/mtk-jpeg/Kconfig"
 source "drivers/media/platform/mtk-mdp/Kconfig"
 source "drivers/media/platform/mtk-vcodec/Kconfig"
 source "drivers/media/platform/mtk-vpu/Kconfig"
+source "drivers/media/platform/omap3isp/Kconfig"
 source "drivers/media/platform/omap/Kconfig"
 
 source "drivers/media/platform/aspeed/Kconfig"
@@ -68,27 +69,6 @@ config VIDEO_MUX
 	help
 	  This driver provides support for N:1 video bus multiplexers.
 
-config VIDEO_OMAP3
-	tristate "OMAP 3 Camera support"
-	depends on V4L_PLATFORM_DRIVERS
-	depends on VIDEO_V4L2 && I2C
-	depends on (ARCH_OMAP3 && OMAP_IOMMU) || COMPILE_TEST
-	depends on COMMON_CLK && OF
-	select ARM_DMA_USE_IOMMU if OMAP_IOMMU
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select VIDEOBUF2_DMA_CONTIG
-	select MFD_SYSCON
-	select V4L2_FWNODE
-	help
-	  Driver for an OMAP 3 camera controller.
-
-config VIDEO_OMAP3_DEBUG
-	bool "OMAP 3 Camera debug messages"
-	depends on VIDEO_OMAP3
-	help
-	  Enable debug messages on OMAP 3 camera controller driver.
-
 source "drivers/media/platform/intel/Kconfig"
 
 config VIDEO_QCOM_CAMSS
drivers/media/platform/omap3isp/Kconfig new file +21 -0
new file mode 100644
index 000000000000..85f0cf063153
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_OMAP3
+	tristate "OMAP 3 Camera support"
+	depends on V4L_PLATFORM_DRIVERS
+	depends on VIDEO_V4L2 && I2C
+	depends on (ARCH_OMAP3 && OMAP_IOMMU) || COMPILE_TEST
+	depends on COMMON_CLK && OF
+	select ARM_DMA_USE_IOMMU if OMAP_IOMMU
+	select MEDIA_CONTROLLER
+	select VIDEO_V4L2_SUBDEV_API
+	select VIDEOBUF2_DMA_CONTIG
+	select MFD_SYSCON
+	select V4L2_FWNODE
+	help
+	  Driver for an OMAP 3 camera controller.
+
+config VIDEO_OMAP3_DEBUG
+	bool "OMAP 3 Camera debug messages"
+	depends on VIDEO_OMAP3
+	help
+	  Enable debug messages on OMAP 3 camera controller driver.
Signature · 1 line
2.35.1
author maintainer
#21 lore raw

PATCH v2 21/67 media: platform: camss: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place camss-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig            | 11 +----------
 drivers/media/platform/qcom/camss/Kconfig |  9 +++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 drivers/media/platform/qcom/camss/Kconfig
drivers/media/platform/Kconfig +1 -10
index 1dac7a5b53eb..b5a1cb0d62c2 100644
@@ -54,6 +54,7 @@ source "drivers/media/platform/mtk-vcodec/Kconfig"
 source "drivers/media/platform/mtk-vpu/Kconfig"
 source "drivers/media/platform/omap3isp/Kconfig"
 source "drivers/media/platform/omap/Kconfig"
+source "drivers/media/platform/qcom/camss/Kconfig"
 
 source "drivers/media/platform/aspeed/Kconfig"
 
@@ -71,16 +72,6 @@ config VIDEO_MUX
 
 source "drivers/media/platform/intel/Kconfig"
 
-config VIDEO_QCOM_CAMSS
-	tristate "Qualcomm V4L2 Camera Subsystem driver"
-	depends on V4L_PLATFORM_DRIVERS
-	depends on VIDEO_V4L2
-	depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select VIDEOBUF2_DMA_SG
-	select V4L2_FWNODE
-
 config VIDEO_S3C_CAMIF
 	tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver"
 	depends on V4L_PLATFORM_DRIVERS
drivers/media/platform/qcom/camss/Kconfig new file +9 -0
new file mode 100644
index 000000000000..56be91578706
@@ -0,0 +1,9 @@
+config VIDEO_QCOM_CAMSS
+	tristate "Qualcomm V4L2 Camera Subsystem driver"
+	depends on V4L_PLATFORM_DRIVERS
+	depends on VIDEO_V4L2
+	depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST
+	select MEDIA_CONTROLLER
+	select VIDEO_V4L2_SUBDEV_API
+	select VIDEOBUF2_DMA_SG
+	select V4L2_FWNODE
Signature · 1 line
2.35.1
author maintainer
#22 lore raw

PATCH v2 22/67 media: platform: venus: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place venus-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig            | 16 +---------------
 drivers/media/platform/qcom/venus/Kconfig | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 drivers/media/platform/qcom/venus/Kconfig
drivers/media/platform/Kconfig +1 -15
index b5a1cb0d62c2..5a8495338fd4 100644
@@ -55,6 +55,7 @@ source "drivers/media/platform/mtk-vpu/Kconfig"
 source "drivers/media/platform/omap3isp/Kconfig"
 source "drivers/media/platform/omap/Kconfig"
 source "drivers/media/platform/qcom/camss/Kconfig"
+source "drivers/media/platform/qcom/venus/Kconfig"
 
 source "drivers/media/platform/aspeed/Kconfig"
 
@@ -319,21 +320,6 @@ config VIDEO_TI_VPE_DEBUG
 	help
 	  Enable debug messages on VPE driver.
 
-config VIDEO_QCOM_VENUS
-	tristate "Qualcomm Venus V4L2 encoder/decoder driver"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2 && QCOM_SMEM
-	depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST
-	select QCOM_MDT_LOADER if ARCH_QCOM
-	select QCOM_SCM
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	  This is a V4L2 driver for Qualcomm Venus video accelerator
-	  hardware. It accelerates encoding and decoding operations
-	  on various Qualcomm SoCs.
-	  To compile this driver as a module choose m here.
-
 config VIDEO_SUN8I_DEINTERLACE
 	tristate "Allwinner Deinterlace driver"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/qcom/venus/Kconfig new file +14 -0
new file mode 100644
index 000000000000..de0fe3f7be5f
@@ -0,0 +1,14 @@
+config VIDEO_QCOM_VENUS
+	tristate "Qualcomm Venus V4L2 encoder/decoder driver"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2 && QCOM_SMEM
+	depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST
+	select QCOM_MDT_LOADER if ARCH_QCOM
+	select QCOM_SCM
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	help
+	  This is a V4L2 driver for Qualcomm Venus video accelerator
+	  hardware. It accelerates encoding and decoding operations
+	  on various Qualcomm SoCs.
+	  To compile this driver as a module choose m here.
Signature · 1 line
2.35.1
author maintainer
#23 lore raw

PATCH v2 23/67 media: platform: rga: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place rga-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig              | 16 +---------------
 drivers/media/platform/rockchip/rga/Kconfig | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)
 create mode 100644 drivers/media/platform/rockchip/rga/Kconfig
drivers/media/platform/Kconfig +1 -15
index 5a8495338fd4..314e25dd7ca1 100644
@@ -58,6 +58,7 @@ source "drivers/media/platform/qcom/camss/Kconfig"
 source "drivers/media/platform/qcom/venus/Kconfig"
 
 source "drivers/media/platform/aspeed/Kconfig"
+source "drivers/media/platform/rockchip/rga/Kconfig"
 
 config VIDEO_MUX
 	tristate "Video Multiplexer"
@@ -284,21 +285,6 @@ config VIDEO_STM32_DMA2D
 	  The STM32 DMA2D is a memory-to-memory engine for pixel conversion
 	  and specialized DMA dedicated to image manipulation.
 
-config VIDEO_ROCKCHIP_RGA
-	tristate "Rockchip Raster 2d Graphic Acceleration Unit"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_ROCKCHIP || COMPILE_TEST
-	select VIDEOBUF2_DMA_SG
-	select V4L2_MEM2MEM_DEV
-	help
-	  This is a v4l2 driver for Rockchip SOC RGA 2d graphics accelerator.
-	  Rockchip RGA is a separate 2D raster graphic acceleration unit.
-	  It accelerates 2D graphics operations, such as point/line drawing,
-	  image scaling, rotation, BitBLT, alpha blending and image blur/sharpness.
-
-	  To compile this driver as a module choose m here.
-
 config VIDEO_TI_VPE
 	tristate "TI VPE (Video Processing Engine) driver"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/rockchip/rga/Kconfig new file +14 -0
new file mode 100644
index 000000000000..0106cc8a93a7
@@ -0,0 +1,14 @@
+config VIDEO_ROCKCHIP_RGA
+	tristate "Rockchip Raster 2d Graphic Acceleration Unit"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_ROCKCHIP || COMPILE_TEST
+	select VIDEOBUF2_DMA_SG
+	select V4L2_MEM2MEM_DEV
+	help
+	  This is a v4l2 driver for Rockchip SOC RGA 2d graphics accelerator.
+	  Rockchip RGA is a separate 2D raster graphic acceleration unit.
+	  It accelerates 2D graphics operations, such as point/line drawing,
+	  image scaling, rotation, BitBLT, alpha blending and image blur/sharpness.
+
+	  To compile this driver as a module choose m here.
Signature · 1 line
2.35.1
author maintainer
#24 lore raw

PATCH v2 24/67 media: platform: s3c-camif: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place s3c-camif-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig           | 16 +---------------
 drivers/media/platform/s3c-camif/Kconfig | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 drivers/media/platform/s3c-camif/Kconfig
drivers/media/platform/Kconfig +1 -15
index 314e25dd7ca1..9fe01afd4145 100644
@@ -59,6 +59,7 @@ source "drivers/media/platform/qcom/venus/Kconfig"
 
 source "drivers/media/platform/aspeed/Kconfig"
 source "drivers/media/platform/rockchip/rga/Kconfig"
+source "drivers/media/platform/s3c-camif/Kconfig"
 
 config VIDEO_MUX
 	tristate "Video Multiplexer"
@@ -74,21 +75,6 @@ config VIDEO_MUX
 
 source "drivers/media/platform/intel/Kconfig"
 
-config VIDEO_S3C_CAMIF
-	tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver"
-	depends on V4L_PLATFORM_DRIVERS
-	depends on VIDEO_V4L2 && I2C && PM
-	depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select VIDEOBUF2_DMA_CONTIG
-	help
-	  This is a v4l2 driver for s3c24xx and s3c64xx SoC series camera
-	  host interface (CAMIF).
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called s3c-camif.
-
 config VIDEO_STM32_DCMI
 	tristate "STM32 Digital Camera Memory Interface (DCMI) support"
 	depends on V4L_PLATFORM_DRIVERS
drivers/media/platform/s3c-camif/Kconfig new file +15 -0
new file mode 100644
index 000000000000..e8ef9e06dc1b
@@ -0,0 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_S3C_CAMIF
+	tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver"
+	depends on V4L_PLATFORM_DRIVERS
+	depends on VIDEO_V4L2 && I2C && PM
+	depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST
+	select MEDIA_CONTROLLER
+	select VIDEO_V4L2_SUBDEV_API
+	select VIDEOBUF2_DMA_CONTIG
+	help
+	  This is a v4l2 driver for s3c24xx and s3c64xx SoC series camera
+	  host interface (CAMIF).
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called s3c-camif.
Signature · 1 line
2.35.1
author maintainer
#25 lore raw

PATCH v2 25/67 media: platform: s5p-g2d: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place s5p-g2d-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig         | 11 +----------
 drivers/media/platform/s5p-g2d/Kconfig | 11 +++++++++++
 2 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 drivers/media/platform/s5p-g2d/Kconfig
drivers/media/platform/Kconfig +1 -10
index 9fe01afd4145..0b88c36e8a83 100644
@@ -60,6 +60,7 @@ source "drivers/media/platform/qcom/venus/Kconfig"
 source "drivers/media/platform/aspeed/Kconfig"
 source "drivers/media/platform/rockchip/rga/Kconfig"
 source "drivers/media/platform/s3c-camif/Kconfig"
+source "drivers/media/platform/s5p-g2d/Kconfig"
 
 config VIDEO_MUX
 	tristate "Video Multiplexer"
@@ -154,16 +155,6 @@ config VIDEO_MEM2MEM_DEINTERLACE
 	help
 	    Generic deinterlacing V4L2 driver.
 
-config VIDEO_SAMSUNG_S5P_G2D
-	tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	  This is a v4l2 driver for Samsung S5P and EXYNOS4 G2D
-	  2d graphics accelerator.
 
 config VIDEO_SAMSUNG_S5P_JPEG
 	tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"
drivers/media/platform/s5p-g2d/Kconfig new file +11 -0
new file mode 100644
index 000000000000..9bc9d90a666a
@@ -0,0 +1,11 @@
+config VIDEO_SAMSUNG_S5P_G2D
+	tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	help
+	  This is a v4l2 driver for Samsung S5P and EXYNOS4 G2D
+	  2d graphics accelerator.
+
Signature · 1 line
2.35.1
author maintainer
#26 lore raw

PATCH v2 26/67 media: platform: hva: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place hva-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig         | 28 +-------------------------
 drivers/media/platform/sti/hva/Kconfig | 26 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 drivers/media/platform/sti/hva/Kconfig
drivers/media/platform/Kconfig +1 -27
index 0b88c36e8a83..9408096a365e 100644
@@ -61,6 +61,7 @@ source "drivers/media/platform/aspeed/Kconfig"
 source "drivers/media/platform/rockchip/rga/Kconfig"
 source "drivers/media/platform/s3c-camif/Kconfig"
 source "drivers/media/platform/s5p-g2d/Kconfig"
+source "drivers/media/platform/sti/hva/Kconfig"
 
 config VIDEO_MUX
 	tristate "Video Multiplexer"
@@ -186,33 +187,6 @@ config VIDEO_STI_BDISP
 	help
 	  This v4l2 mem2mem driver is a 2D blitter for STMicroelectronics SoC.
 
-config VIDEO_STI_HVA
-	tristate "STMicroelectronics HVA multi-format video encoder V4L2 driver"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_STI || COMPILE_TEST
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	  This V4L2 driver enables HVA (Hardware Video Accelerator) multi-format
-	  video encoder of STMicroelectronics SoC, allowing hardware encoding of
-	  raw uncompressed formats in various compressed video bitstreams format.
-
-	  To compile this driver as a module, choose M here:
-	  the module will be called st-hva.
-
-config VIDEO_STI_HVA_DEBUGFS
-	bool "Export STMicroelectronics HVA internals in debugfs"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_STI_HVA
-	depends on DEBUG_FS
-	help
-	  Select this to see information about the internal state and the last
-	  operation of STMicroelectronics HVA multi-format video encoder in
-	  debugfs.
-
-	  Choose N unless you know you need this.
-
 config VIDEO_STI_DELTA
 	tristate "STMicroelectronics DELTA multi-format video decoder V4L2 driver"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/sti/hva/Kconfig new file +26 -0
new file mode 100644
index 000000000000..5651667bcc54
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_STI_HVA
+	tristate "STMicroelectronics HVA multi-format video encoder V4L2 driver"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_STI || COMPILE_TEST
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	help
+	  This V4L2 driver enables HVA (Hardware Video Accelerator) multi-format
+	  video encoder of STMicroelectronics SoC, allowing hardware encoding of
+	  raw uncompressed formats in various compressed video bitstreams format.
+
+	  To compile this driver as a module, choose M here:
+	  the module will be called st-hva.
+
+config VIDEO_STI_HVA_DEBUGFS
+	bool "Export STMicroelectronics HVA internals in debugfs"
+	depends on VIDEO_STI_HVA
+	depends on DEBUG_FS
+	help
+	  Select this to see information about the internal state and the last
+	  operation of STMicroelectronics HVA multi-format video encoder in
+	  debugfs.
+
+	  Choose N unless you know you need this.
Signature · 1 line
2.35.1
author maintainer
#27 lore raw

PATCH v2 27/67 media: platform: stm32: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place stm32-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig       | 29 +-------------------------
 drivers/media/platform/stm32/Kconfig | 31 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 28 deletions(-)
 create mode 100644 drivers/media/platform/stm32/Kconfig
drivers/media/platform/Kconfig +1 -28
index 9408096a365e..b14a0fc78f41 100644
@@ -62,6 +62,7 @@ source "drivers/media/platform/rockchip/rga/Kconfig"
 source "drivers/media/platform/s3c-camif/Kconfig"
 source "drivers/media/platform/s5p-g2d/Kconfig"
 source "drivers/media/platform/sti/hva/Kconfig"
+source "drivers/media/platform/stm32/Kconfig"
 
 config VIDEO_MUX
 	tristate "Video Multiplexer"
@@ -77,21 +78,6 @@ config VIDEO_MUX
 
 source "drivers/media/platform/intel/Kconfig"
 
-config VIDEO_STM32_DCMI
-	tristate "STM32 Digital Camera Memory Interface (DCMI) support"
-	depends on V4L_PLATFORM_DRIVERS
-	depends on VIDEO_V4L2 && OF
-	depends on ARCH_STM32 || COMPILE_TEST
-	select VIDEOBUF2_DMA_CONTIG
-	select MEDIA_CONTROLLER
-	select V4L2_FWNODE
-	help
-	  This module makes the STM32 Digital Camera Memory Interface (DCMI)
-	  available as a v4l2 device.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called stm32-dcmi.
-
 config VIDEO_ROCKCHIP_ISP1
 	tristate "Rockchip Image Signal Processing v1 Unit driver"
 	depends on V4L_PLATFORM_DRIVERS
@@ -223,19 +209,6 @@ config VIDEO_STI_DELTA_DRIVER
 	select V4L2_MEM2MEM_DEV
 	select RPMSG
 
-config VIDEO_STM32_DMA2D
-	tristate "STM32 Chrom-Art Accelerator (DMA2D)"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_STM32 || COMPILE_TEST
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	  Enables DMA2D hardware support on stm32.
-
-	  The STM32 DMA2D is a memory-to-memory engine for pixel conversion
-	  and specialized DMA dedicated to image manipulation.
-
 config VIDEO_TI_VPE
 	tristate "TI VPE (Video Processing Engine) driver"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/stm32/Kconfig new file +31 -0
new file mode 100644
index 000000000000..60b87e403c7c
@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+# V4L drivers
+config VIDEO_STM32_DCMI
+	tristate "STM32 Digital Camera Memory Interface (DCMI) support"
+	depends on V4L_PLATFORM_DRIVERS
+	depends on VIDEO_V4L2 && OF
+	depends on ARCH_STM32 || COMPILE_TEST
+	select VIDEOBUF2_DMA_CONTIG
+	select MEDIA_CONTROLLER
+	select V4L2_FWNODE
+	help
+	  This module makes the STM32 Digital Camera Memory Interface (DCMI)
+	  available as a v4l2 device.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called stm32-dcmi.
+
+# Mem2mem drivers
+config VIDEO_STM32_DMA2D
+	tristate "STM32 Chrom-Art Accelerator (DMA2D)"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_STM32 || COMPILE_TEST
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	help
+	  Enables DMA2D hardware support on stm32.
+
+	  The STM32 DMA2D is a memory-to-memory engine for pixel conversion
+	  and specialized DMA dedicated to image manipulation.
Signature · 1 line
2.35.1
author maintainer
#28 lore raw

PATCH v2 28/67 media: platform: sun8i-di: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place sun8i-di-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig                | 15 +--------------
 drivers/media/platform/sunxi/sun8i-di/Kconfig | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 drivers/media/platform/sunxi/sun8i-di/Kconfig
drivers/media/platform/Kconfig +1 -14
index b14a0fc78f41..61f8a8fae109 100644
@@ -63,6 +63,7 @@ source "drivers/media/platform/s3c-camif/Kconfig"
 source "drivers/media/platform/s5p-g2d/Kconfig"
 source "drivers/media/platform/sti/hva/Kconfig"
 source "drivers/media/platform/stm32/Kconfig"
+source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
 
 config VIDEO_MUX
 	tristate "Video Multiplexer"
@@ -230,20 +231,6 @@ config VIDEO_TI_VPE_DEBUG
 	help
 	  Enable debug messages on VPE driver.
 
-config VIDEO_SUN8I_DEINTERLACE
-	tristate "Allwinner Deinterlace driver"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_SUNXI || COMPILE_TEST
-	depends on COMMON_CLK && OF
-	depends on PM
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	   Support for the Allwinner deinterlace unit with scaling
-	   capability found on some SoCs, like H3.
-	   To compile this driver as a module choose m here.
-
 config VIDEO_SUN8I_ROTATE
 	tristate "Allwinner DE2 rotation driver"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/sunxi/sun8i-di/Kconfig new file +14 -0
new file mode 100644
index 000000000000..8d762e664d45
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_SUN8I_DEINTERLACE
+	tristate "Allwinner Deinterlace driver"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_SUNXI || COMPILE_TEST
+	depends on COMMON_CLK && OF
+	depends on PM
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	help
+	   Support for the Allwinner deinterlace unit with scaling
+	   capability found on some SoCs, like H3.
+	   To compile this driver as a module choose m here.
Signature · 1 line
2.35.1
author maintainer
#29 lore raw

PATCH v2 29/67 media: platform: sun8i-rotate: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place sun8i-rotate-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig                    | 14 +-------------
 drivers/media/platform/sunxi/sun8i-rotate/Kconfig | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/Kconfig
drivers/media/platform/Kconfig +1 -13
index 61f8a8fae109..224ebe4f5348 100644
@@ -64,6 +64,7 @@ source "drivers/media/platform/s5p-g2d/Kconfig"
 source "drivers/media/platform/sti/hva/Kconfig"
 source "drivers/media/platform/stm32/Kconfig"
 source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
+source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig"
 
 config VIDEO_MUX
 	tristate "Video Multiplexer"
@@ -231,19 +232,6 @@ config VIDEO_TI_VPE_DEBUG
 	help
 	  Enable debug messages on VPE driver.
 
-config VIDEO_SUN8I_ROTATE
-	tristate "Allwinner DE2 rotation driver"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_SUNXI || COMPILE_TEST
-	depends on COMMON_CLK && OF
-	depends on PM
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	   Support for the Allwinner DE2 rotation unit.
-	   To compile this driver as a module choose m here.
-
 config VIDEO_TEGRA_VDE
 	tristate "NVIDIA Tegra Video Decoder Engine driver"
 	depends on V4L_MEM2MEM_DRIVERS
drivers/media/platform/sunxi/sun8i-rotate/Kconfig new file +14 -0
new file mode 100644
index 000000000000..64a8ea76e917
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config VIDEO_SUN8I_ROTATE
+	tristate "Allwinner DE2 rotation driver"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_SUNXI || COMPILE_TEST
+	depends on COMMON_CLK && OF
+	depends on PM
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	help
+	   Support for the Allwinner DE2 rotation unit.
+	   To compile this driver as a module choose m here.
Signature · 1 line
2.35.1
author maintainer
#30 lore raw

PATCH v2 30/67 media: platform: vde: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place vde-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig           | 19 +------------------
 drivers/media/platform/tegra/vde/Kconfig | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 drivers/media/platform/tegra/vde/Kconfig
drivers/media/platform/Kconfig +1 -18
index 224ebe4f5348..b0acbf3ccb69 100644
@@ -65,6 +65,7 @@ source "drivers/media/platform/sti/hva/Kconfig"
 source "drivers/media/platform/stm32/Kconfig"
 source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
 source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig"
+source "drivers/media/platform/tegra/vde/Kconfig"
 
 config VIDEO_MUX
 	tristate "Video Multiplexer"
@@ -232,24 +233,6 @@ config VIDEO_TI_VPE_DEBUG
 	help
 	  Enable debug messages on VPE driver.
 
-config VIDEO_TEGRA_VDE
-	tristate "NVIDIA Tegra Video Decoder Engine driver"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on ARCH_TEGRA || COMPILE_TEST
-	depends on VIDEO_DEV && VIDEO_V4L2
-	select DMA_SHARED_BUFFER
-	select IOMMU_IOVA
-	select MEDIA_CONTROLLER
-	select MEDIA_CONTROLLER_REQUEST_API
-	select SRAM
-	select VIDEOBUF2_DMA_CONTIG
-	select VIDEOBUF2_DMA_SG
-	select V4L2_H264
-	select V4L2_MEM2MEM_DEV
-	help
-	   Support for the NVIDIA Tegra video decoder unit.
-	   To compile this driver as a module choose m here.
-
 # TI VIDEO PORT Helper Modules
 # These will be selected by VPE and VIP
 config VIDEO_TI_VPDMA
drivers/media/platform/tegra/vde/Kconfig new file +17 -0
new file mode 100644
index 000000000000..584b78d8d66c
@@ -0,0 +1,17 @@
+config VIDEO_TEGRA_VDE
+	tristate "NVIDIA Tegra Video Decoder Engine driver"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on ARCH_TEGRA || COMPILE_TEST
+	depends on VIDEO_DEV && VIDEO_V4L2
+	select DMA_SHARED_BUFFER
+	select IOMMU_IOVA
+	select MEDIA_CONTROLLER
+	select MEDIA_CONTROLLER_REQUEST_API
+	select SRAM
+	select VIDEOBUF2_DMA_CONTIG
+	select VIDEOBUF2_DMA_SG
+	select V4L2_H264
+	select V4L2_MEM2MEM_DEV
+	help
+	   Support for the NVIDIA Tegra video decoder unit.
+	   To compile this driver as a module choose m here.
Signature · 1 line
2.35.1
author maintainer
#31 lore raw

PATCH v2 31/67 media: platform: ti-vpe: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place ti-vpe-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig        | 60 +-------------------------
 drivers/media/platform/ti-vpe/Kconfig | 62 +++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 59 deletions(-)
 create mode 100644 drivers/media/platform/ti-vpe/Kconfig
drivers/media/platform/Kconfig +1 -59
index b0acbf3ccb69..228881ae0d22 100644
@@ -66,6 +66,7 @@ source "drivers/media/platform/stm32/Kconfig"
 source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
 source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig"
 source "drivers/media/platform/tegra/vde/Kconfig"
+source "drivers/media/platform/ti-vpe/Kconfig"
 
 config VIDEO_MUX
 	tristate "Video Multiplexer"
@@ -106,33 +107,6 @@ source "drivers/media/platform/xilinx/Kconfig"
 source "drivers/media/platform/atmel/Kconfig"
 source "drivers/media/platform/sunxi/Kconfig"
 
-config VIDEO_TI_CAL
-	tristate "TI CAL (Camera Adaptation Layer) driver"
-	depends on V4L_PLATFORM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	depends on SOC_DRA7XX || ARCH_K3 || COMPILE_TEST
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_FWNODE
-	help
-	  Support for the TI CAL (Camera Adaptation Layer) block
-	  found on DRA72X SoC.
-	  In TI Technical Reference Manual this module is referred as
-	  Camera Interface Subsystem (CAMSS).
-
-config VIDEO_TI_CAL_MC
-	bool "Media Controller centric mode by default"
-	depends on VIDEO_TI_CAL
-	default n
-	help
-	  Enables Media Controller centric mode by default.
-
-	  If set, CAL driver will start in Media Controller mode by
-	  default. Note that this behavior can be overridden via
-	  module parameter 'mc_api'.
-
-
 # Mem2mem drivers
 
 config VIDEO_MEM2MEM_DEINTERLACE
@@ -212,37 +186,5 @@ config VIDEO_STI_DELTA_DRIVER
 	select V4L2_MEM2MEM_DEV
 	select RPMSG
 
-config VIDEO_TI_VPE
-	tristate "TI VPE (Video Processing Engine) driver"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on SOC_DRA7XX || COMPILE_TEST
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	select VIDEO_TI_VPDMA
-	select VIDEO_TI_SC
-	select VIDEO_TI_CSC
-	help
-	  Support for the TI VPE(Video Processing Engine) block
-	  found on DRA7XX SoC.
-
-config VIDEO_TI_VPE_DEBUG
-	bool "VPE debug messages"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_TI_VPE
-	help
-	  Enable debug messages on VPE driver.
-
-# TI VIDEO PORT Helper Modules
-# These will be selected by VPE and VIP
-config VIDEO_TI_VPDMA
-	tristate
-
-config VIDEO_TI_SC
-	tristate
-
-config VIDEO_TI_CSC
-	tristate
-
 # DVB platform drivers
 source "drivers/media/platform/sti/c8sectpfe/Kconfig"
drivers/media/platform/ti-vpe/Kconfig new file +62 -0

62 lines not on this page · raw message

Signature · 1 line
2.35.1
author maintainer
#32 lore raw

PATCH v2 32/67 media: platform: rkisp1: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place rkisp1-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig                | 20 +------------------
 .../media/platform/rockchip/rkisp1/Kconfig    | 19 ++++++++++++++++++
 2 files changed, 20 insertions(+), 19 deletions(-)
 create mode 100644 drivers/media/platform/rockchip/rkisp1/Kconfig
drivers/media/platform/Kconfig +1 -19
index 228881ae0d22..29afef26cbe4 100644
@@ -59,6 +59,7 @@ source "drivers/media/platform/qcom/venus/Kconfig"
 
 source "drivers/media/platform/aspeed/Kconfig"
 source "drivers/media/platform/rockchip/rga/Kconfig"
+source "drivers/media/platform/rockchip/rkisp1/Kconfig"
 source "drivers/media/platform/s3c-camif/Kconfig"
 source "drivers/media/platform/s5p-g2d/Kconfig"
 source "drivers/media/platform/sti/hva/Kconfig"
@@ -82,25 +83,6 @@ config VIDEO_MUX
 
 source "drivers/media/platform/intel/Kconfig"
 
-config VIDEO_ROCKCHIP_ISP1
-	tristate "Rockchip Image Signal Processing v1 Unit driver"
-	depends on V4L_PLATFORM_DRIVERS
-	depends on VIDEO_V4L2 && OF
-	depends on ARCH_ROCKCHIP || COMPILE_TEST
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select VIDEOBUF2_DMA_CONTIG
-	select VIDEOBUF2_VMALLOC
-	select V4L2_FWNODE
-	select GENERIC_PHY_MIPI_DPHY
-	default n
-	help
-	  Enable this to support the Image Signal Processing (ISP) module
-	  present in RK3399 SoCs.
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called rockchip-isp1.
-
 source "drivers/media/platform/exynos4-is/Kconfig"
 source "drivers/media/platform/am437x/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"
drivers/media/platform/rockchip/rkisp1/Kconfig new file +19 -0
new file mode 100644
index 000000000000..c2e464317929
@@ -0,0 +1,19 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_ROCKCHIP_ISP1
+	tristate "Rockchip Image Signal Processing v1 Unit driver"
+	depends on V4L_PLATFORM_DRIVERS
+	depends on VIDEO_V4L2 && OF
+	depends on ARCH_ROCKCHIP || COMPILE_TEST
+	select MEDIA_CONTROLLER
+	select VIDEO_V4L2_SUBDEV_API
+	select VIDEOBUF2_DMA_CONTIG
+	select VIDEOBUF2_VMALLOC
+	select V4L2_FWNODE
+	select GENERIC_PHY_MIPI_DPHY
+	default n
+	help
+	  Enable this to support the Image Signal Processing (ISP) module
+	  present in RK3399 SoCs.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called rockchip-isp1.
Signature · 1 line
2.35.1
author maintainer
#33 lore raw

PATCH v2 33/67 media: platform: delta: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place delta-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig           | 36 +-----------------------
 drivers/media/platform/sti/delta/Kconfig | 36 ++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 35 deletions(-)
 create mode 100644 drivers/media/platform/sti/delta/Kconfig
drivers/media/platform/Kconfig +1 -35
index 29afef26cbe4..ba4c10896537 100644
@@ -132,41 +132,7 @@ config VIDEO_STI_BDISP
 	help
 	  This v4l2 mem2mem driver is a 2D blitter for STMicroelectronics SoC.
 
-config VIDEO_STI_DELTA
-	tristate "STMicroelectronics DELTA multi-format video decoder V4L2 driver"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_STI || COMPILE_TEST
-	help
-		This V4L2 driver enables DELTA multi-format video decoder
-		of STMicroelectronics STiH4xx SoC series allowing hardware
-		decoding of various compressed video bitstream format in
-		raw uncompressed format.
-
-		Use this option to see the decoders available for such
-		hardware.
-
-		Please notice that the driver will only be built if
-		at least one of the DELTA decoder below is selected.
-
-config VIDEO_STI_DELTA_MJPEG
-	bool "STMicroelectronics DELTA MJPEG support"
-	default y
-	depends on VIDEO_STI_DELTA
-	help
-		Enables DELTA MJPEG hardware support.
-
-		To compile this driver as a module, choose M here:
-		the module will be called st-delta.
-
-config VIDEO_STI_DELTA_DRIVER
-	tristate
-	depends on VIDEO_STI_DELTA
-	depends on VIDEO_STI_DELTA_MJPEG
-	default VIDEO_STI_DELTA_MJPEG
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	select RPMSG
+source "drivers/media/platform/sti/delta/Kconfig"
 
 # DVB platform drivers
 source "drivers/media/platform/sti/c8sectpfe/Kconfig"
drivers/media/platform/sti/delta/Kconfig new file +36 -0
new file mode 100644
index 000000000000..0bbc7edce208
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_STI_DELTA
+	tristate "STMicroelectronics DELTA multi-format video decoder V4L2 driver"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_STI || COMPILE_TEST
+	help
+		This V4L2 driver enables DELTA multi-format video decoder
+		of STMicroelectronics STiH4xx SoC series allowing hardware
+		decoding of various compressed video bitstream format in
+		raw uncompressed format.
+
+		Use this option to see the decoders available for such
+		hardware.
+
+		Please notice that the driver will only be built if
+		at least one of the DELTA decoder below is selected.
+
+config VIDEO_STI_DELTA_MJPEG
+	bool "STMicroelectronics DELTA MJPEG support"
+	default y
+	depends on VIDEO_STI_DELTA
+	help
+		Enables DELTA MJPEG hardware support.
+
+		To compile this driver as a module, choose M here:
+		the module will be called st-delta.
+
+config VIDEO_STI_DELTA_DRIVER
+	tristate
+	depends on VIDEO_STI_DELTA
+	depends on VIDEO_STI_DELTA_MJPEG
+	default VIDEO_STI_DELTA_MJPEG
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	select RPMSG
Signature · 1 line
2.35.1
author maintainer
#34 lore raw

PATCH v2 34/67 media: platform: bdisp: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place bdisp-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig           | 10 +---------
 drivers/media/platform/sti/bdisp/Kconfig | 10 ++++++++++
 2 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 drivers/media/platform/sti/bdisp/Kconfig
drivers/media/platform/Kconfig +1 -9
index ba4c10896537..2069eee801af 100644
@@ -122,15 +122,7 @@ config VIDEO_SAMSUNG_S5P_MFC
 	help
 	    MFC 5.1 and 6.x driver for V4L2
 
-config VIDEO_STI_BDISP
-	tristate "STMicroelectronics BDISP 2D blitter driver"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_STI || COMPILE_TEST
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	  This v4l2 mem2mem driver is a 2D blitter for STMicroelectronics SoC.
+source "drivers/media/platform/sti/bdisp/Kconfig"
 
 source "drivers/media/platform/sti/delta/Kconfig"
 
drivers/media/platform/sti/bdisp/Kconfig new file +10 -0
new file mode 100644
index 000000000000..e583fb924f52
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_STI_BDISP
+	tristate "STMicroelectronics BDISP 2D blitter driver"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_STI || COMPILE_TEST
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	help
+	  This v4l2 mem2mem driver is a 2D blitter for STMicroelectronics SoC.
Signature · 1 line
2.35.1
author maintainer
#35 lore raw

PATCH v2 35/67 media: platform: s5p-mfc: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place s5p-mfc-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig         | 9 +--------
 drivers/media/platform/s5p-mfc/Kconfig | 9 +++++++++
 2 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 drivers/media/platform/s5p-mfc/Kconfig
drivers/media/platform/Kconfig +1 -8
index 2069eee801af..fd6b18ac0c7c 100644
@@ -113,14 +113,7 @@ config VIDEO_SAMSUNG_S5P_JPEG
 	  This is a v4l2 driver for Samsung S5P, EXYNOS3250
 	  and EXYNOS4 JPEG codec
 
-config VIDEO_SAMSUNG_S5P_MFC
-	tristate "Samsung S5P MFC Video Codec"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
-	select VIDEOBUF2_DMA_CONTIG
-	help
-	    MFC 5.1 and 6.x driver for V4L2
+source "drivers/media/platform/s5p-mfc/Kconfig"
 
 source "drivers/media/platform/sti/bdisp/Kconfig"
 
drivers/media/platform/s5p-mfc/Kconfig new file +9 -0
new file mode 100644
index 000000000000..34b52b0de304
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+config VIDEO_SAMSUNG_S5P_MFC
+	tristate "Samsung S5P MFC Video Codec"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
+	select VIDEOBUF2_DMA_CONTIG
+	help
+	    MFC 5.1 and 6.x driver for V4L2
Signature · 1 line
2.35.1
author maintainer
#36 lore raw

PATCH v2 36/67 media: platform: s5p-jpeg: move config to its own file

In reply to Mauro Carvalho Chehab

In order to better organize the platform/Kconfig, place s5p-jpeg-specific config stuff on a separate Kconfig file.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig          | 13 +------------
 drivers/media/platform/s5p-jpeg/Kconfig | 12 ++++++++++++
 2 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 drivers/media/platform/s5p-jpeg/Kconfig
drivers/media/platform/Kconfig +1 -12
index fd6b18ac0c7c..d5aedc6b5ca3 100644
@@ -62,6 +62,7 @@ source "drivers/media/platform/rockchip/rga/Kconfig"
 source "drivers/media/platform/rockchip/rkisp1/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/sti/hva/Kconfig"
 source "drivers/media/platform/stm32/Kconfig"
 source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
@@ -101,18 +102,6 @@ config VIDEO_MEM2MEM_DEINTERLACE
 	help
 	    Generic deinterlacing V4L2 driver.
 
-
-config VIDEO_SAMSUNG_S5P_JPEG
-	tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	  This is a v4l2 driver for Samsung S5P, EXYNOS3250
-	  and EXYNOS4 JPEG codec
-
 source "drivers/media/platform/s5p-mfc/Kconfig"
 
 source "drivers/media/platform/sti/bdisp/Kconfig"
drivers/media/platform/s5p-jpeg/Kconfig new file +12 -0
new file mode 100644
index 000000000000..e522860d2b15
@@ -0,0 +1,12 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config VIDEO_SAMSUNG_S5P_JPEG
+	tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	help
+	  This is a v4l2 driver for Samsung S5P, EXYNOS3250
+	  and EXYNOS4 JPEG codec
Signature · 1 line
2.35.1
author maintainer
#37 lore raw

PATCH v2 37/67 media: platform: Kconfig: sort entries

In reply to Mauro Carvalho Chehab

Now that each non-generic driver has their own directory, sort the entries.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig | 98 +++++++++++++++-------------------
 1 file changed, 43 insertions(+), 55 deletions(-)
drivers/media/platform/Kconfig +43 -55
index d5aedc6b5ca3..b7c60969c974 100644
@@ -29,84 +29,72 @@ config V4L_MEM2MEM_DRIVERS
 	  to capture and output drivers, which use memory buffers for just
 	  one of those.
 
+# Ancillary drivers
+
+config VIDEO_MEM2MEM_DEINTERLACE
+	tristate "Deinterlace support"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on HAS_DMA
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	help
+	    Generic deinterlacing V4L2 driver.
+
+config VIDEO_MUX
+	tristate "Video Multiplexer"
+	depends on V4L_PLATFORM_DRIVERS
+	select MULTIPLEXER
+	depends on VIDEO_V4L2 && OF
+	select MEDIA_CONTROLLER
+	select VIDEO_V4L2_SUBDEV_API
+	select REGMAP
+	select V4L2_FWNODE
+	help
+	  This driver provides support for N:1 video bus multiplexers.
+
+# Platform drivers - Please keep it alphabetically sorted
+
+# TODO: create per-manufacturer directories
+
 source "drivers/media/platform/allegro-dvt/Kconfig"
-source "drivers/media/platform/nxp/Kconfig"
-
-source "drivers/media/platform/renesas/Kconfig"
-
-# V4L platform drivers
-
-source "drivers/media/platform/marvell-ccic/Kconfig"
-
-source "drivers/media/platform/via/Kconfig"
-
+source "drivers/media/platform/am437x/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"
-
 source "drivers/media/platform/coda/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-ccic/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"
 source "drivers/media/platform/mtk-vpu/Kconfig"
-source "drivers/media/platform/omap3isp/Kconfig"
+source "drivers/media/platform/nxp/Kconfig"
 source "drivers/media/platform/omap/Kconfig"
+source "drivers/media/platform/omap3isp/Kconfig"
 source "drivers/media/platform/qcom/camss/Kconfig"
 source "drivers/media/platform/qcom/venus/Kconfig"
-
-source "drivers/media/platform/aspeed/Kconfig"
+source "drivers/media/platform/renesas/Kconfig"
 source "drivers/media/platform/rockchip/rga/Kconfig"
 source "drivers/media/platform/rockchip/rkisp1/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/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/stm32/Kconfig"
+source "drivers/media/platform/sunxi/Kconfig"
 source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
 source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig"
 source "drivers/media/platform/tegra/vde/Kconfig"
 source "drivers/media/platform/ti-vpe/Kconfig"
-
-config VIDEO_MUX
-	tristate "Video Multiplexer"
-	depends on V4L_PLATFORM_DRIVERS
-	select MULTIPLEXER
-	depends on VIDEO_V4L2 && OF
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select REGMAP
-	select V4L2_FWNODE
-	help
-	  This driver provides support for N:1 video bus multiplexers.
-
-source "drivers/media/platform/intel/Kconfig"
-
-source "drivers/media/platform/exynos4-is/Kconfig"
-source "drivers/media/platform/am437x/Kconfig"
+source "drivers/media/platform/via/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"
-source "drivers/media/platform/atmel/Kconfig"
-source "drivers/media/platform/sunxi/Kconfig"
-
-# Mem2mem drivers
-
-config VIDEO_MEM2MEM_DEINTERLACE
-	tristate "Deinterlace support"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on HAS_DMA
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	    Generic deinterlacing V4L2 driver.
-
-source "drivers/media/platform/s5p-mfc/Kconfig"
-
-source "drivers/media/platform/sti/bdisp/Kconfig"
-
-source "drivers/media/platform/sti/delta/Kconfig"
-
-# DVB platform drivers
-source "drivers/media/platform/sti/c8sectpfe/Kconfig"
Signature · 1 line
2.35.1
maintainer Acked-by on v2 37/67
#38 lore raw

Re: [PATCH v2 37/67] media: platform: Kconfig: sort entries

Dne ponedeljek, 14. marec 2022 ob 17:34:32 CET je Mauro Carvalho Chehab napisal(a):

Quoted 6 lines

Now that each non-generic driver has their own directory, sort the entries.

---

For sunxi:

Best regards,
Jernej

Quoted 2 lines

To avoid mailbombing on a large number of people, only mailing lists were C/

C on the cover.

Quoted 1 line

See [PATCH v2 00/67] at: https://lore.kernel.org/all/cover.

[email protected]/

Quoted 140 lines
 drivers/media/platform/Kconfig | 98 +++++++++++++++-------------------
 1 file changed, 43 insertions(+), 55 deletions(-)
drivers/media/platform/Kconfig +43 -55
index d5aedc6b5ca3..b7c60969c974 100644
@@ -29,84 +29,72 @@ config V4L_MEM2MEM_DRIVERS
 	  to capture and output drivers, which use memory buffers for just
 	  one of those.
 
+# Ancillary drivers
+
+config VIDEO_MEM2MEM_DEINTERLACE
+	tristate "Deinterlace support"
+	depends on V4L_MEM2MEM_DRIVERS
+	depends on VIDEO_DEV && VIDEO_V4L2
+	depends on HAS_DMA
+	select VIDEOBUF2_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	help
+	    Generic deinterlacing V4L2 driver.
+
+config VIDEO_MUX
+	tristate "Video Multiplexer"
+	depends on V4L_PLATFORM_DRIVERS
+	select MULTIPLEXER
+	depends on VIDEO_V4L2 && OF
+	select MEDIA_CONTROLLER
+	select VIDEO_V4L2_SUBDEV_API
+	select REGMAP
+	select V4L2_FWNODE
+	help
+	  This driver provides support for N:1 video bus multiplexers.
+
+# Platform drivers - Please keep it alphabetically sorted
+
+# TODO: create per-manufacturer directories
+
 source "drivers/media/platform/allegro-dvt/Kconfig"
-source "drivers/media/platform/nxp/Kconfig"
-
-source "drivers/media/platform/renesas/Kconfig"
-
-# V4L platform drivers
-
-source "drivers/media/platform/marvell-ccic/Kconfig"
-
-source "drivers/media/platform/via/Kconfig"
-
+source "drivers/media/platform/am437x/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"
-
 source "drivers/media/platform/coda/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-ccic/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"
 source "drivers/media/platform/mtk-vpu/Kconfig"
-source "drivers/media/platform/omap3isp/Kconfig"
+source "drivers/media/platform/nxp/Kconfig"
 source "drivers/media/platform/omap/Kconfig"
+source "drivers/media/platform/omap3isp/Kconfig"
 source "drivers/media/platform/qcom/camss/Kconfig"
 source "drivers/media/platform/qcom/venus/Kconfig"
-
-source "drivers/media/platform/aspeed/Kconfig"
+source "drivers/media/platform/renesas/Kconfig"
 source "drivers/media/platform/rockchip/rga/Kconfig"
 source "drivers/media/platform/rockchip/rkisp1/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/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/stm32/Kconfig"
+source "drivers/media/platform/sunxi/Kconfig"
 source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
 source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig"
 source "drivers/media/platform/tegra/vde/Kconfig"
 source "drivers/media/platform/ti-vpe/Kconfig"
-
-config VIDEO_MUX
-	tristate "Video Multiplexer"
-	depends on V4L_PLATFORM_DRIVERS
-	select MULTIPLEXER
-	depends on VIDEO_V4L2 && OF
-	select MEDIA_CONTROLLER
-	select VIDEO_V4L2_SUBDEV_API
-	select REGMAP
-	select V4L2_FWNODE
-	help
-	  This driver provides support for N:1 video bus multiplexers.
-
-source "drivers/media/platform/intel/Kconfig"
-
-source "drivers/media/platform/exynos4-is/Kconfig"
-source "drivers/media/platform/am437x/Kconfig"
+source "drivers/media/platform/via/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"
-source "drivers/media/platform/atmel/Kconfig"
-source "drivers/media/platform/sunxi/Kconfig"
-
-# Mem2mem drivers
-
-config VIDEO_MEM2MEM_DEINTERLACE
-	tristate "Deinterlace support"
-	depends on V4L_MEM2MEM_DRIVERS
-	depends on VIDEO_DEV && VIDEO_V4L2
-	depends on HAS_DMA
-	select VIDEOBUF2_DMA_CONTIG
-	select V4L2_MEM2MEM_DEV
-	help
-	    Generic deinterlacing V4L2 driver.
-
-source "drivers/media/platform/s5p-mfc/Kconfig"
-
-source "drivers/media/platform/sti/bdisp/Kconfig"
-
-source "drivers/media/platform/sti/delta/Kconfig"
-
-# DVB platform drivers
-source "drivers/media/platform/sti/c8sectpfe/Kconfig"
Signature · 1 line
2.35.1
author maintainer
#39 lore raw

PATCH v2 38/67 media: platform: move some manufacturer entries

In reply to Mauro Carvalho Chehab

As there are 4 manufacturer's directories with multiple sources (qcom, rockchip, sti and sunxi), move the sources from platform/Kconfig to their specific Konfig files.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/platform/Kconfig          | 13 +++----------
 drivers/media/platform/qcom/Kconfig     |  4 ++++
 drivers/media/platform/rockchip/Kconfig |  3 +++
 drivers/media/platform/sti/Kconfig      |  5 +++++
 drivers/media/platform/sunxi/Kconfig    |  2 ++
 5 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 drivers/media/platform/qcom/Kconfig
 create mode 100644 drivers/media/platform/rockchip/Kconfig
 create mode 100644 drivers/media/platform/sti/Kconfig
drivers/media/platform/Kconfig +3 -10
index b7c60969c974..e3316fa37a8f 100644
@@ -77,23 +77,16 @@ source "drivers/media/platform/mtk-vpu/Kconfig"
 source "drivers/media/platform/nxp/Kconfig"
 source "drivers/media/platform/omap/Kconfig"
 source "drivers/media/platform/omap3isp/Kconfig"
-source "drivers/media/platform/qcom/camss/Kconfig"
-source "drivers/media/platform/qcom/venus/Kconfig"
+source "drivers/media/platform/qcom/Kconfig"
 source "drivers/media/platform/renesas/Kconfig"
-source "drivers/media/platform/rockchip/rga/Kconfig"
-source "drivers/media/platform/rockchip/rkisp1/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/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/Kconfig"
 source "drivers/media/platform/stm32/Kconfig"
 source "drivers/media/platform/sunxi/Kconfig"
-source "drivers/media/platform/sunxi/sun8i-di/Kconfig"
-source "drivers/media/platform/sunxi/sun8i-rotate/Kconfig"
 source "drivers/media/platform/tegra/vde/Kconfig"
 source "drivers/media/platform/ti-vpe/Kconfig"
 source "drivers/media/platform/via/Kconfig"
drivers/media/platform/qcom/Kconfig new file +4 -0
new file mode 100644
index 000000000000..9f6c91cc95ca
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+source "drivers/media/platform/qcom/camss/Kconfig"
+source "drivers/media/platform/qcom/venus/Kconfig"
drivers/media/platform/rockchip/Kconfig new file +3 -0
new file mode 100644
index 000000000000..2f97c0e0268a
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0-only
+source "drivers/media/platform/rockchip/rga/Kconfig"
+source "drivers/media/platform/rockchip/rkisp1/Kconfig"
drivers/media/platform/sti/Kconfig new file +5 -0
new file mode 100644
index 000000000000..9fb5e78a92cf
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+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"
drivers/media/platform/sunxi/Kconfig +2 -0
index 7151cc249afa..a10032215b08 100644
@@ -2,3 +2,5 @@
 
 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
author maintainer
#40 lore raw

PATCH v2 39/67 media: platform: Kconfig: place platform drivers on a submenu

In reply to Mauro Carvalho Chehab

Just like media bus drivers, place platform drivers on a submenu, in order to better organize user-selection:

    Media drivers  --->
	    *** media drivers ***
	[*] Media USB Adapters  --->
	[*] Media PCI Adapters  --->
	-*- Radio Adapters  --->
	[*] Media platform devices  --->
	    *** MMC/SDIO DVB adapters ***
	< > Siano SMS1xxx based MDTV via SDIO interface
	[*] V4L test drivers  --->
	[*] DVB test drivers  --->
	    *** FireWire (IEEE 1394) Adapters ***
	<*> FireDTV and FloppyDTV
	    *** common driver options ***
	[ ] Enable Remote Controller support for Siano devices
	[ ] Enable debugfs for smsdvb

As this submenu depends on MEDIA_PLATFORM_DRIVERS and defaults to "y", there's no need to change already-existing .config entries, nor touch the several make *_defconfig.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 drivers/media/Kconfig          |  8 +++++---
 drivers/media/platform/Kconfig | 10 ++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)
drivers/media/Kconfig +5 -3
index f3f24c63536b..1a75058df374 100644
@@ -216,13 +216,12 @@ menu "Media drivers"
 comment "Drivers filtered as selected at 'Filter media drivers'"
 	depends on MEDIA_SUPPORT_FILTER
 
+comment "Media drivers"
+
 source "drivers/media/usb/Kconfig"
 source "drivers/media/pci/Kconfig"
 source "drivers/media/radio/Kconfig"
 
-# Common driver options
-source "drivers/media/common/Kconfig"
-
 if MEDIA_PLATFORM_SUPPORT
 source "drivers/media/platform/Kconfig"
 source "drivers/media/mmc/Kconfig"
@@ -234,6 +233,9 @@ endif
 
 source "drivers/media/firewire/Kconfig"
 
+# Common driver options
+source "drivers/media/common/Kconfig"
+
 endmenu
 
 #
drivers/media/platform/Kconfig +10 -0
index e3316fa37a8f..721f27ef0130 100644
@@ -3,6 +3,14 @@
 # Platform drivers
 #	Most drivers here are currently for webcam support
 
+menuconfig MEDIA_PLATFORM_DRIVERS
+	bool "Media platform devices"
+	default "y"
+	help
+	  Say Y here to enable support for platform-specific media drivers.
+
+if MEDIA_PLATFORM_DRIVERS
+
 config V4L_PLATFORM_DRIVERS
 	bool "V4L platform devices"
 	help
@@ -91,3 +99,5 @@ 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"
+
+endif # MEDIA_PLATFORM_DRIVERS
Signature · 1 line
2.35.1
author maintainer
#41 lore raw

PATCH v2 40/67 media: platform: rename coda/ to chips-media/

In reply to Mauro Carvalho Chehab

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

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 721f27ef0130..24a43cef18de 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
author maintainer
#42 lore raw

PATCH v2 41/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 24a43cef18de..0a4260627a00 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
author maintainer
#43 lore raw

PATCH v2 42/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 0a4260627a00..b4faee0a1b63 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
author maintainer
#44 lore raw

PATCH v2 43/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 b4faee0a1b63..f1746529e763 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 · 1 line
2.35.1
author maintainer
#45 lore raw

PATCH v2 44/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 f1746529e763..8a7ac0b8e09f 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 · 1 line
2.35.1
author maintainer
#46 lore raw

PATCH v2 45/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 8a7ac0b8e09f..10055af0c7f8 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
author maintainer
#47 lore raw

PATCH v2 46/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 10055af0c7f8..a9ad0c3bd0cc 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
author maintainer
#48 lore raw

PATCH v2 47/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 a9ad0c3bd0cc..61240f8226bb 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..95a671d87e85
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+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
maintainer
#49 lore raw

Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/

Dne ponedeljek, 14. marec 2022 ob 17:34:42 CET je Mauro Carvalho Chehab napisal(a):

Quoted 4 lines

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

I would rather not do that. Everything related to Allwinner is called sunxi, albeit there are a few outliers. This is similar to Amlogic/meson situation.

Best regards,
Jernej

author maintainer
#50 lore raw

Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/

Em Mon, 14 Mar 2022 18:22:20 +0100
Jernej Škrabec <[email protected]> escreveu:

Quoted 9 lines

Dne ponedeljek, 14. marec 2022 ob 17:34:42 CET je Mauro Carvalho Chehab napisal(a):

Quoted 4 lines

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

I would rather not do that. Everything related to Allwinner is called sunxi, albeit there are a few outliers. This is similar to Amlogic/meson situation.

The rationale of having one directory per manufacturer is that, if drivers for newer platforms with different names from the same manufacturers are added, those will still fit under allwinner/ and amlogic/.

The Kconfig names for sunxi and meson didn't change, nor the driver's name. Also, the directories under allwinner preserve sun<x>i name on them:

drivers/media/platform/allwinner/
├── sun4i-csi
├── sun6i-csi
├── sun8i-di
└── sun8i-rotate

and so the directory under amlogic/:

drivers/media/platform/amlogic/
└── meson-ge2d

Now, if Allinner decides to release a new platforms named after another star, let's say, "Vega" and "Rigel", it would be just a matter of adding "vega/" and "rigel/" directories under allwinner. No need to touch media/platform/Kconfig and media/platform/Makefile. Everything will happen on much more smaller vendor-specific Kconfig/Makefile.

See for instance, TI. We had initially a single driver, and everywhere it was called "omap", which was had gained different versions (omap2, omap3, ...). Then, TI decided to use other names for newer IP (davinci, am437x), and now the current development is at cal and vpe.

If we had placed a ti/ directory by the time omap were added (and the same for the other vendors), we would have avoided the need of this reorg.

Thanks,
Mauro

maintainer
#51 lore raw

Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/

Hi Mauro,

Quoted 27 lines · Mauro Carvalho Chehab

Em Mon, 14 Mar 2022 18:22:20 +0100 Jernej Škrabec escreveu:

Quoted 9 lines

Dne ponedeljek, 14. marec 2022 ob 17:34:42 CET je Mauro Carvalho Chehab napisal(a):

Quoted 4 lines

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

I would rather not do that. Everything related to Allwinner is called sunxi, albeit there are a few outliers. This is similar to Amlogic/meson situation.

The rationale of having one directory per manufacturer is that, if drivers for newer platforms with different names from the same manufacturers are added, those will still fit under allwinner/ and amlogic/.

The Kconfig names for sunxi and meson didn't change, nor the driver's name. Also, the directories under allwinner preserve sun<x>i name on them:

drivers/media/platform/allwinner/
├── sun4i-csi
├── sun6i-csi
├── sun8i-di
└── sun8i-rotate

and so the directory under amlogic/:

Quoted 8 lines

drivers/media/platform/amlogic/
└── meson-ge2d

Now, if Allinner decides to release a new platforms named after another star, let's say, "Vega" and "Rigel", it would be just a matter of adding "vega/" and "rigel/" directories under allwinner. No need to touch media/platform/Kconfig and media/platform/Makefile. Everything will happen on much more smaller vendor-specific Kconfig/Makefile.

But the day Allwinner changes its name to Noloser, we'll have a similar problem. Thnk about Freescale vs. NXP, or Altera bought by Intel. No naming scheme is totally future-proof. If the accepted standard through the kernel is to use sunxi to refer to Allwinner SoCs, I don't think it's a bit idea to go with that.

Quoted 8 lines

See for instance, TI. We had initially a single driver, and everywhere it was called "omap", which was had gained different versions (omap2, omap3, ...). Then, TI decided to use other names for newer IP (davinci, am437x), and now the current development is at cal and vpe.

If we had placed a ti/ directory by the time omap were added (and the same for the other vendors), we would have avoided the need of this reorg.

Signature · 3 lines
Regards,

Laurent Pinchart
author maintainer
#52 lore raw

Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/

Em Tue, 15 Mar 2022 08:54:25 +0200
Laurent Pinchart <[email protected]> escreveu:

Quoted 33 lines

Hi Mauro,

Quoted 30 lines · Mauro Carvalho Chehab

Em Mon, 14 Mar 2022 18:22:20 +0100 Jernej Škrabec escreveu:

Quoted 9 lines

Dne ponedeljek, 14. marec 2022 ob 17:34:42 CET je Mauro Carvalho Chehab napisal(a):

Quoted 4 lines

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

I would rather not do that. Everything related to Allwinner is called sunxi, albeit there are a few outliers. This is similar to Amlogic/meson situation.

The rationale of having one directory per manufacturer is that, if drivers for newer platforms with different names from the same manufacturers are added, those will still fit under allwinner/ and amlogic/.

The Kconfig names for sunxi and meson didn't change, nor the driver's name. Also, the directories under allwinner preserve sun<x>i name on them:

drivers/media/platform/allwinner/
├── sun4i-csi
├── sun6i-csi
├── sun8i-di
└── sun8i-rotate

and so the directory under amlogic/:

drivers/media/platform/amlogic/
└── meson-ge2d

Quoted 8 lines
Quoted 5 lines

Now, if Allinner decides to release a new platforms named after another star, let's say, "Vega" and "Rigel", it would be just a matter of adding "vega/" and "rigel/" directories under allwinner. No need to touch media/platform/Kconfig and media/platform/Makefile. Everything will happen on much more smaller vendor-specific Kconfig/Makefile.

But the day Allwinner changes its name to Noloser, we'll have a similar problem.

Not really. It will still be a single directory per vendor (whatever name it is).

Quoted 1 line

Thnk about Freescale vs. NXP, or Altera bought by Intel.

Yeah, when some drivers move from one vendor to another one that already exists there, we should probably move the directories, in order to keep things well organized.

The worse case scenario is really if, let's say, TI decides to sell their omap architecture to NXP, keeping the rest. On such case, the best would be to move platform/ti/omap* to the directory of its newer owner.

That's said, when things like that happen, there are usually a change at MAINTAINERS, as e-mails, mailing lists and contact people will likely change. So, this will very likely generate patches anyway.

Quoted 4 lines

No
naming scheme is totally future-proof. If the accepted standard through the kernel is to use sunxi to refer to Allwinner SoCs, I don't think it's a bit idea to go with that.

I'm not too concerned about the name here, but rather about the process. Needing to do reorg like this is painful, as it causes all pending work to fail merging against upstream, requiring rebases. So, we should avoid needing to re-do it by trying our best to avoid the need of another global change like that in the future.

By organizing entries per vendor, while we may need to do puntual per-vendor adjustments when they rename and change IP with other vendors, the global platform Kconfig/Make will contain a single entry per vendor. I can't foresee any need to change this in the future, if we take care of keeping the entries there properly sorted.

With regards to naming the per-vendor directory, while I do prefer to have the directories named after the vendor, and not after a vendor's nick name, It should also be ok to use a vendor's nick name, provided that such name is meant to be used by all their current and future IP.

Not sure if "sunxi" is actually a vendor's nick name. It sounds much likely that it is, instead, a brand name that covers their current media-related SoC.

Can someone from the vendor shed a light on it?

Thanks,
Mauro

maintainer
#53 lore raw

Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/

Quoted 45 lines · Mauro Carvalho Chehab

Em Tue, 15 Mar 2022 08:54:25 +0200
Laurent Pinchart <[email protected]> escreveu:

Quoted 33 lines

Hi Mauro,

Quoted 30 lines · Mauro Carvalho Chehab

Em Mon, 14 Mar 2022 18:22:20 +0100 Jernej Škrabec escreveu:

Quoted 9 lines

Dne ponedeljek, 14. marec 2022 ob 17:34:42 CET je Mauro Carvalho Chehab napisal(a):

Quoted 4 lines

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

I would rather not do that. Everything related to Allwinner is called sunxi, albeit there are a few outliers. This is similar to Amlogic/meson situation.

The rationale of having one directory per manufacturer is that, if drivers for newer platforms with different names from the same manufacturers are added, those will still fit under allwinner/ and amlogic/.

The Kconfig names for sunxi and meson didn't change, nor the driver's name. Also, the directories under allwinner preserve sun<x>i name on them:

drivers/media/platform/allwinner/
├── sun4i-csi
├── sun6i-csi
├── sun8i-di
└── sun8i-rotate

and so the directory under amlogic/:

drivers/media/platform/amlogic/
└── meson-ge2d

Quoted 8 lines
Quoted 5 lines

Now, if Allinner decides to release a new platforms named after another star, let's say, "Vega" and "Rigel", it would be just a matter of adding "vega/" and "rigel/" directories under allwinner. No need to touch media/platform/Kconfig and media/platform/Makefile. Everything will happen on much more smaller vendor-specific Kconfig/Makefile.

But the day Allwinner changes its name to Noloser, we'll have a similar problem.

Quoted 8 lines

Not really. It will still be a single directory per vendor (whatever name it is).

Quoted 1 line

Thnk about Freescale vs. NXP, or Altera bought by Intel.

Yeah, when some drivers move from one vendor to another one that already exists there, we should probably move the directories, in order to keep things well organized.

I'm not sure we should. We still have arch/arm64/boot/dts/freescale/ for instance. We can answer that question later though, when confronted with the situation.

Quoted 13 lines

The worse case scenario is really if, let's say, TI decides to sell their omap architecture to NXP, keeping the rest. On such case, the best would be to move platform/ti/omap* to the directory of its newer owner.

That's said, when things like that happen, there are usually a change at MAINTAINERS, as e-mails, mailing lists and contact people will likely change. So, this will very likely generate patches anyway.

Quoted 4 lines

No
naming scheme is totally future-proof. If the accepted standard through the kernel is to use sunxi to refer to Allwinner SoCs, I don't think it's a bit idea to go with that.

Quoted 5 lines

I'm not too concerned about the name here, but rather about the process. Needing to do reorg like this is painful, as it causes all pending work to fail merging against upstream, requiring rebases. So, we should avoid needing to re-do it by trying our best to avoid the need of another global change like that in the future.

Most of the pain we'll go through in the immediate future comes from the fact that we never really cared about this. I think renames (of vendors or product lines) will be infrequent enough that picking sunxi for Allwinner drivers wouldn't be an issue.

There's a similar think with Renesas, which had an SH product line and then moved to ARM, creating R-Mobile and R-Car (among other product liens). That's why we still have drivers/dma/sh/ for Renesas DMA drivers.

Quoted 11 lines

By organizing entries per vendor, while we may need to do puntual per-vendor adjustments when they rename and change IP with other vendors, the global platform Kconfig/Make will contain a single entry per vendor. I can't foresee any need to change this in the future, if we take care of keeping the entries there properly sorted.

With regards to naming the per-vendor directory, while I do prefer to have the directories named after the vendor, and not after a vendor's nick name, It should also be ok to use a vendor's nick name, provided that such name is meant to be used by all their current and future IP.

Quoted 5 lines

Not sure if "sunxi" is actually a vendor's nick name. It sounds much likely that it is, instead, a brand name that covers their current media-related SoC.

Can someone from the vendor shed a light on it?

Maybe we can let the Allwinner upstream community tell us what name to pick ? I'm sure they know better than us :-)

Signature · 3 lines
Regards,

Laurent Pinchart
maintainer
#54 lore raw

Re: Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/

Dne torek, 15. marec 2022 ob 09:35:05 CET je Laurent Pinchart napisal(a):

Quoted 10 lines · Mauro Carvalho Chehab
Quoted 9 lines

Em Tue, 15 Mar 2022 08:54:25 +0200
Laurent Pinchart <[email protected]> escreveu:

Quoted 6 lines

Hi Mauro,

Quoted 3 lines · Mauro Carvalho Chehab

Em Mon, 14 Mar 2022 18:22:20 +0100 Jernej Škrabec escreveu:

Quoted 1 line

Dne ponedeljek, 14. marec 2022 ob 17:34:42 CET je Mauro Carvalho

Chehab

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

napisal(a):

Quoted 4 lines

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

I would rather not do that. Everything related to Allwinner is

called sunxi,

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

albeit there are a few outliers. This is similar to Amlogic/meson

situation.

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

The rationale of having one directory per manufacturer is that, if

drivers

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

for newer platforms with different names from the same manufacturers

are

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

added, those will still fit under allwinner/ and amlogic/.

The Kconfig names for sunxi and meson didn't change, nor the driver's

name.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

Also, the directories under allwinner preserve sun<x>i name on them:

drivers/media/platform/allwinner/
├── sun4i-csi
├── sun6i-csi
├── sun8i-di
└── sun8i-rotate

Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines

and so the directory under amlogic/:

drivers/media/platform/amlogic/
└── meson-ge2d

Now, if Allinner decides to release a new platforms named after

another star,

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

let's say, "Vega" and "Rigel", it would be just a matter of adding "vega/" and "rigel/" directories under allwinner. No need to touch media/platform/Kconfig and media/platform/Makefile. Everything will

happen

Quoted 42 lines
Quoted 5 lines
Quoted 4 lines
Quoted 1 line

on much more smaller vendor-specific Kconfig/Makefile.

But the day Allwinner changes its name to Noloser, we'll have a similar problem.

Quoted 8 lines

Not really. It will still be a single directory per vendor (whatever name it is).

Quoted 1 line

Thnk about Freescale vs. NXP, or Altera bought by Intel.

Yeah, when some drivers move from one vendor to another one that already exists there, we should probably move the directories, in order to keep things well organized.

I'm not sure we should. We still have arch/arm64/boot/dts/freescale/ for instance. We can answer that question later though, when confronted with the situation.

Quoted 13 lines

The worse case scenario is really if, let's say, TI decides to sell their omap architecture to NXP, keeping the rest. On such case, the best would be to move platform/ti/omap* to the directory of its newer owner.

That's said, when things like that happen, there are usually a change at MAINTAINERS, as e-mails, mailing lists and contact people will likely change. So, this will very likely generate patches anyway.

Quoted 4 lines

No
naming scheme is totally future-proof. If the accepted standard through the kernel is to use sunxi to refer to Allwinner SoCs, I don't think it's a bit idea to go with that.

Quoted 5 lines

I'm not too concerned about the name here, but rather about the process. Needing to do reorg like this is painful, as it causes all pending work to fail merging against upstream, requiring rebases. So, we should avoid needing to re-do it by trying our best to avoid the need of another global change like that in the future.

Most of the pain we'll go through in the immediate future comes from the fact that we never really cared about this. I think renames (of vendors or product lines) will be infrequent enough that picking sunxi for Allwinner drivers wouldn't be an issue.

Quoted 21 lines

There's a similar think with Renesas, which had an SH product line and then moved to ARM, creating R-Mobile and R-Car (among other product liens). That's why we still have drivers/dma/sh/ for Renesas DMA drivers.

Quoted 16 lines

By organizing entries per vendor, while we may need to do puntual per-vendor adjustments when they rename and change IP with other vendors, the global platform Kconfig/Make will contain a single entry per vendor. I can't foresee any need to change this in the future, if we take care of keeping the entries there properly sorted.

With regards to naming the per-vendor directory, while I do prefer to have the directories named after the vendor, and not after a vendor's nick name, It should also be ok to use a vendor's nick name, provided that such name is meant to be used by all their current and future IP.

Not sure if "sunxi" is actually a vendor's nick name. It sounds much likely that it is, instead, a brand name that covers their current media-related SoC.

Can someone from the vendor shed a light on it?

Allwinner (as a company) isn't directly involved in maintaining upstream Linux support. Drivers are provided by linux-sunxi community, sometimes by cleaning up vendor drivers or more often by writing them from scratch.

That being said, "sunxi" is extensively used in vendor kernel, most often it's directory name containing vendor specific driver. It's derived from SoC family name, like sun4i, sun5i, sun5i, sun50i, etc. where number is replaced with X.

sunxi is synonym for Allwinner basically from the start. Community build around these SoCs is called linux-sunxi and even entry in MAINTAINERS contains both names: "ARM/Allwinner sunXi SoC support". Note that sunxi is not limited to ARM SoCs. RISC-V family is called sun20i.

Hope this helps.

Best regards,
Jernej

Quoted 12 lines

Maybe we can let the Allwinner upstream community tell us what name to pick ? I'm sure they know better than us :-)

Signature · 3 lines
Regards,

Laurent Pinchart
author maintainer
#55 lore raw

Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/

Em Tue, 15 Mar 2022 19:04:05 +0100
Jernej Škrabec <[email protected]> escreveu:

Quoted 25 lines
Quoted 11 lines
Quoted 11 lines

By organizing entries per vendor, while we may need to do puntual per-vendor adjustments when they rename and change IP with other vendors, the global platform Kconfig/Make will contain a single entry per vendor. I can't foresee any need to change this in the future, if we take care of keeping the entries there properly sorted.

With regards to naming the per-vendor directory, while I do prefer to have the directories named after the vendor, and not after a vendor's nick name, It should also be ok to use a vendor's nick name, provided that such name is meant to be used by all their current and future IP.

Quoted 5 lines
Quoted 5 lines

Not sure if "sunxi" is actually a vendor's nick name. It sounds much likely that it is, instead, a brand name that covers their current media-related SoC.

Can someone from the vendor shed a light on it?

Allwinner (as a company) isn't directly involved in maintaining upstream Linux support. Drivers are provided by linux-sunxi community, sometimes by cleaning up vendor drivers or more often by writing them from scratch.

That being said, "sunxi" is extensively used in vendor kernel, most often it's directory name containing vendor specific driver. It's derived from SoC family name, like sun4i, sun5i, sun5i, sun50i, etc. where number is replaced with X.

Quoted 6 lines

sunxi is synonym for Allwinner basically from the start. Community build around these SoCs is called linux-sunxi and even entry in MAINTAINERS contains both names: "ARM/Allwinner sunXi SoC support". Note that sunxi is not limited to ARM SoCs. RISC-V family is called sun20i.

Hope this helps.

Ok, so let's then keep it named as "sunxi", and place all drivers from Allwinner there.

Thanks,
Mauro

author maintainer
#56 lore raw

Re: [PATCH v2 47/67] media: platform: rename sunxi/ to allwinner/

In reply to Laurent Pinchart

Em Tue, 15 Mar 2022 10:35:05 +0200
Laurent Pinchart <[email protected]> escreveu:

Quoted 51 lines · Mauro Carvalho Chehab
Quoted 50 lines

Em Tue, 15 Mar 2022 08:54:25 +0200
Laurent Pinchart <[email protected]> escreveu:

Quoted 33 lines

Hi Mauro,

Quoted 30 lines · Mauro Carvalho Chehab

Em Mon, 14 Mar 2022 18:22:20 +0100 Jernej Škrabec escreveu:

Quoted 9 lines

Dne ponedeljek, 14. marec 2022 ob 17:34:42 CET je Mauro Carvalho Chehab napisal(a):

Quoted 4 lines

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

I would rather not do that. Everything related to Allwinner is called sunxi, albeit there are a few outliers. This is similar to Amlogic/meson situation.

The rationale of having one directory per manufacturer is that, if drivers for newer platforms with different names from the same manufacturers are added, those will still fit under allwinner/ and amlogic/.

The Kconfig names for sunxi and meson didn't change, nor the driver's name. Also, the directories under allwinner preserve sun<x>i name on them:

drivers/media/platform/allwinner/
├── sun4i-csi
├── sun6i-csi
├── sun8i-di
└── sun8i-rotate

and so the directory under amlogic/:

drivers/media/platform/amlogic/
└── meson-ge2d

Quoted 8 lines
Quoted 5 lines

Now, if Allinner decides to release a new platforms named after another star, let's say, "Vega" and "Rigel", it would be just a matter of adding "vega/" and "rigel/" directories under allwinner. No need to touch media/platform/Kconfig and media/platform/Makefile. Everything will happen on much more smaller vendor-specific Kconfig/Makefile.

But the day Allwinner changes its name to Noloser, we'll have a similar problem.

Not really. It will still be a single directory per vendor (whatever name it is).

Quoted 1 line

Thnk about Freescale vs. NXP, or Altera bought by Intel.

Quoted 7 lines
Quoted 3 lines

Yeah, when some drivers move from one vendor to another one that already exists there, we should probably move the directories, in order to keep things well organized.

I'm not sure we should. We still have arch/arm64/boot/dts/freescale/ for instance. We can answer that question later though, when confronted with the situation.

It would be messy if some drivers under a

media/platform/vendor_a/

directory would actually belong to vendor_b, which also has its own media/platform/vendor_b/ directory.

On such case, I do think we should move stuff. Now, if everything under a "media/platform/vendor_a/" directory are now property of a vendor_c which doesn't have yet any directory there, I don't see and problems on not renaming - and even adding new drivers there that would belong to vendor_c.

Quoted 14 lines
Quoted 14 lines

The worse case scenario is really if, let's say, TI decides to sell their omap architecture to NXP, keeping the rest. On such case, the best would be to move platform/ti/omap* to the directory of its newer owner.

That's said, when things like that happen, there are usually a change at MAINTAINERS, as e-mails, mailing lists and contact people will likely change. So, this will very likely generate patches anyway.

Quoted 4 lines

No
naming scheme is totally future-proof. If the accepted standard through the kernel is to use sunxi to refer to Allwinner SoCs, I don't think it's a bit idea to go with that.

Quoted 8 lines
Quoted 5 lines

I'm not too concerned about the name here, but rather about the process. Needing to do reorg like this is painful, as it causes all pending work to fail merging against upstream, requiring rebases. So, we should avoid needing to re-do it by trying our best to avoid the need of another global change like that in the future.

Most of the pain we'll go through in the immediate future comes from the fact that we never really cared about this.

Nah, we had other reorgs in the past, also trying to better organize stuff, like splitting M2M from V4L and DVB platform drivers.

The thing is that the number of entries at platform/ increased a lot, and that justifies a major change.

Quoted 3 lines

I think renames (of vendors
or product lines) will be infrequent enough that picking sunxi for Allwinner drivers wouldn't be an issue.

Agreed.

Quoted 16 lines

There's a similar think with Renesas, which had an SH product line and then moved to ARM, creating R-Mobile and R-Car (among other product liens). That's why we still have drivers/dma/sh/ for Renesas DMA drivers.

Quoted 11 lines

By organizing entries per vendor, while we may need to do puntual per-vendor adjustments when they rename and change IP with other vendors, the global platform Kconfig/Make will contain a single entry per vendor. I can't foresee any need to change this in the future, if we take care of keeping the entries there properly sorted.

With regards to naming the per-vendor directory, while I do prefer to have the directories named after the vendor, and not after a vendor's nick name, It should also be ok to use a vendor's nick name, provided that such name is meant to be used by all their current and future IP.

Quoted 8 lines
Quoted 5 lines

Not sure if "sunxi" is actually a vendor's nick name. It sounds much likely that it is, instead, a brand name that covers their current media-related SoC.

Can someone from the vendor shed a light on it?

Maybe we can let the Allwinner upstream community tell us what name to pick ? I'm sure they know better than us :-)

Works for me.

Thanks,
Mauro

author maintainer
#57 lore raw

PATCH v2 48/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 MAINTAINERS                                                    | 2 +-
 drivers/media/platform/Kconfig                                 | 2 +-
 drivers/media/platform/Makefile                                | 2 +-
 drivers/media/platform/nvidia/Makefile                         | 3 +++
 drivers/media/platform/{tegra/vde => nvidia/tegra-vde}/Kconfig | 0
 .../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
 13 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 drivers/media/platform/nvidia/Makefile
 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 61240f8226bb..13d8f3e59116 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/Makefile new file +3 -0
new file mode 100644
index 000000000000..428415ff83de
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0
+
+obj-y += tegra-vde/
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
author maintainer
#58 lore raw

PATCH v2 49/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 c9333d46047e..13dd4693b898 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 13d8f3e59116..3d0f431c167d 100644
@@ -76,7 +76,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 ce9909534218..6ef541bdb225 100644
@@ -16,7 +16,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
author maintainer
#59 lore raw

PATCH v2 50/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 3d0f431c167d..0a05ef7304c0 100644
@@ -75,7 +75,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 6ef541bdb225..996ec99be08f 100644
@@ -15,7 +15,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
author maintainer
#60 lore raw

PATCH v2 51/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 13dd4693b898..80f2a0eea3f7 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 0a05ef7304c0..aed4394ddd05 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 996ec99be08f..cb5e6d1df248 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
author maintainer
#61 lore raw

PATCH v2 52/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 80f2a0eea3f7..4b03db9ee31e 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 aed4394ddd05..8dd178e1a359 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 cb5e6d1df248..aa822365d8d0 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
maintainer Acked-by on v2 52/67
#62 lore raw

Re: [PATCH v2 52/67] media: platform: rename s5p-g2d/ to samsung/s5p-g2d/

Quoted 9 lines · when Mauro Carvalho Chehab

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

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

Quoted 17 lines
 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%)
Quoted 73 lines
MAINTAINERS +1 -1
index 80f2a0eea3f7..4b03db9ee31e 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 aed4394ddd05..8dd178e1a359 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 cb5e6d1df248..aa822365d8d0 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 · 3 lines
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics
author maintainer
#63 lore raw

PATCH v2 53/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 4b03db9ee31e..e01013c68fc1 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 8dd178e1a359..df67690c8f3a 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 aa822365d8d0..9c6c272797cd 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
author maintainer
#64 lore raw

PATCH v2 54/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 e01013c68fc1..a0cfe84b8192 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 df67690c8f3a..6b05afa218b3 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 9c6c272797cd..97aa99d8fac8 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
author maintainer
#65 lore raw

PATCH v2 55/67 media: platform: rename stm32/ to stm/stm32/

In reply to Mauro Carvalho Chehab

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

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 MAINTAINERS                                               | 2 +-
 drivers/media/platform/Kconfig                            | 2 +-
 drivers/media/platform/Makefile                           | 2 +-
 drivers/media/platform/{ => stm}/stm32/Kconfig            | 0
 drivers/media/platform/{ => stm}/stm32/Makefile           | 0
 drivers/media/platform/{ => stm}/stm32/dma2d/dma2d-hw.c   | 0
 drivers/media/platform/{ => stm}/stm32/dma2d/dma2d-regs.h | 0
 drivers/media/platform/{ => stm}/stm32/dma2d/dma2d.c      | 0
 drivers/media/platform/{ => stm}/stm32/dma2d/dma2d.h      | 0
 drivers/media/platform/{ => stm}/stm32/stm32-dcmi.c       | 0
 10 files changed, 3 insertions(+), 3 deletions(-)
 rename drivers/media/platform/{ => stm}/stm32/Kconfig (100%)
 rename drivers/media/platform/{ => stm}/stm32/Makefile (100%)
 rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d-hw.c (100%)
 rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d-regs.h (100%)
 rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d.c (100%)
 rename drivers/media/platform/{ => stm}/stm32/dma2d/dma2d.h (100%)
 rename drivers/media/platform/{ => stm}/stm32/stm32-dcmi.c (100%)
MAINTAINERS +1 -1
index a0cfe84b8192..4cf03d253bc8 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/stm/stm32/stm32-dcmi.c
 
 MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
 M:	Mauro Carvalho Chehab <[email protected]>
drivers/media/platform/Kconfig +1 -1
index 6b05afa218b3..c308de1a42a4 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/stm/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 97aa99d8fac8..7f077c9a416d 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 += stm/stm32/
 obj-y += ti-vpe/
 obj-y += via/
 obj-y += xilinx/
drivers/media/platform/stm/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/stm/stm32/Kconfig
drivers/media/platform/stm/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/stm/stm32/Makefile
drivers/media/platform/stm/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/stm/stm32/dma2d/dma2d-hw.c
drivers/media/platform/stm/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/stm/stm32/dma2d/dma2d-regs.h
drivers/media/platform/stm/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/stm/stm32/dma2d/dma2d.c
drivers/media/platform/stm/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/stm/stm32/dma2d/dma2d.h
drivers/media/platform/stm/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/stm/stm32/stm32-dcmi.c
Signature · 1 line
2.35.1
author maintainer
#66 lore raw

PATCH v2 56/67 media: platform: rename sti/ to stm/sti/

In reply to Mauro Carvalho Chehab

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

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

 MAINTAINERS                                               | 8 ++++----
 drivers/media/platform/Kconfig                            | 2 +-
 drivers/media/platform/Makefile                           | 8 ++++----
 drivers/media/platform/sti/Kconfig                        | 5 -----
 drivers/media/platform/stm/sti/Kconfig                    | 5 +++++
 drivers/media/platform/{ => stm}/sti/bdisp/Kconfig        | 0
 drivers/media/platform/{ => stm}/sti/bdisp/Makefile       | 0
 drivers/media/platform/{ => stm}/sti/bdisp/bdisp-debug.c  | 0
 drivers/media/platform/{ => stm}/sti/bdisp/bdisp-filter.h | 0
 drivers/media/platform/{ => stm}/sti/bdisp/bdisp-hw.c     | 0
 drivers/media/platform/{ => stm}/sti/bdisp/bdisp-reg.h    | 0
 drivers/media/platform/{ => stm}/sti/bdisp/bdisp-v4l2.c   | 0
 drivers/media/platform/{ => stm}/sti/bdisp/bdisp.h        | 0
 drivers/media/platform/{ => stm}/sti/c8sectpfe/Kconfig    | 0
 drivers/media/platform/{ => stm}/sti/c8sectpfe/Makefile   | 0
 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-common.c   | 0
 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-common.h   | 0
 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-core.c     | 0
 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-core.h     | 0
 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-debugfs.c  | 0
 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-debugfs.h  | 0
 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.c      | 0
 .../platform/{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.h      | 0
 drivers/media/platform/{ => stm}/sti/delta/Kconfig        | 0
 drivers/media/platform/{ => stm}/sti/delta/Makefile       | 0
 drivers/media/platform/{ => stm}/sti/delta/delta-cfg.h    | 0
 drivers/media/platform/{ => stm}/sti/delta/delta-debug.c  | 0
 drivers/media/platform/{ => stm}/sti/delta/delta-debug.h  | 0
 drivers/media/platform/{ => stm}/sti/delta/delta-ipc.c    | 0
 drivers/media/platform/{ => stm}/sti/delta/delta-ipc.h    | 0
 drivers/media/platform/{ => stm}/sti/delta/delta-mem.c    | 0
 drivers/media/platform/{ => stm}/sti/delta/delta-mem.h    | 0
 .../media/platform/{ => stm}/sti/delta/delta-mjpeg-dec.c  | 0
 .../media/platform/{ => stm}/sti/delta/delta-mjpeg-fw.h   | 0
 .../media/platform/{ => stm}/sti/delta/delta-mjpeg-hdr.c  | 0
 drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg.h  | 0
 drivers/media/platform/{ => stm}/sti/delta/delta-v4l2.c   | 0
 drivers/media/platform/{ => stm}/sti/delta/delta.h        | 0
 drivers/media/platform/{ => stm}/sti/hva/Kconfig          | 0
 drivers/media/platform/{ => stm}/sti/hva/Makefile         | 0
 drivers/media/platform/{ => stm}/sti/hva/hva-debugfs.c    | 0
 drivers/media/platform/{ => stm}/sti/hva/hva-h264.c       | 0
 drivers/media/platform/{ => stm}/sti/hva/hva-hw.c         | 0
 drivers/media/platform/{ => stm}/sti/hva/hva-hw.h         | 0
 drivers/media/platform/{ => stm}/sti/hva/hva-mem.c        | 0
 drivers/media/platform/{ => stm}/sti/hva/hva-mem.h        | 0
 drivers/media/platform/{ => stm}/sti/hva/hva-v4l2.c       | 0
 drivers/media/platform/{ => stm}/sti/hva/hva.h            | 0
 48 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 drivers/media/platform/sti/Kconfig
 create mode 100644 drivers/media/platform/stm/sti/Kconfig
 rename drivers/media/platform/{ => stm}/sti/bdisp/Kconfig (100%)
 rename drivers/media/platform/{ => stm}/sti/bdisp/Makefile (100%)
 rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-debug.c (100%)
 rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-filter.h (100%)
 rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-hw.c (100%)
 rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-reg.h (100%)
 rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp-v4l2.c (100%)
 rename drivers/media/platform/{ => stm}/sti/bdisp/bdisp.h (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/Kconfig (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/Makefile (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-common.c (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-common.h (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-core.c (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-core.h (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-debugfs.c (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-debugfs.h (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.c (100%)
 rename drivers/media/platform/{ => stm}/sti/c8sectpfe/c8sectpfe-dvb.h (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/Kconfig (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/Makefile (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-cfg.h (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-debug.c (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-debug.h (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-ipc.c (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-ipc.h (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-mem.c (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-mem.h (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg-dec.c (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg-fw.h (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg-hdr.c (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-mjpeg.h (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta-v4l2.c (100%)
 rename drivers/media/platform/{ => stm}/sti/delta/delta.h (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/Kconfig (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/Makefile (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva-debugfs.c (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva-h264.c (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva-hw.c (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva-hw.h (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva-mem.c (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva-mem.h (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva-v4l2.c (100%)
 rename drivers/media/platform/{ => stm}/sti/hva/hva.h (100%)
MAINTAINERS +4 -4
index 4cf03d253bc8..6c1055c27c65 100644
@@ -2710,7 +2710,7 @@ 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/platform/stm/sti/c8sectpfe/
 F:	drivers/media/rc/st_rc.c
 F:	drivers/mmc/host/sdhci-st.c
 F:	drivers/phy/st/phy-miphy28lp.c
@@ -3383,7 +3383,7 @@ L:	[email protected]
 S:	Supported
 W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
-F:	drivers/media/platform/sti/bdisp
+F:	drivers/media/platform/stm/sti/bdisp
 
 BECKHOFF CX5020 ETHERCAT MASTER DRIVER
 M:	Dariusz Marcinkiewicz <[email protected]>
@@ -5482,7 +5482,7 @@ L:	[email protected]
 S:	Supported
 W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
-F:	drivers/media/platform/sti/delta
+F:	drivers/media/platform/stm/sti/delta
 
 DELTA AHE-50DC FAN CONTROL MODULE DRIVER
 M:	Zev Weiss <[email protected]>
@@ -8870,7 +8870,7 @@ L:	[email protected]
 S:	Supported
 W:	https://linuxtv.org
 T:	git git://linuxtv.org/media_tree.git
-F:	drivers/media/platform/sti/hva
+F:	drivers/media/platform/stm/sti/hva
 
 HWPOISON MEMORY FAILURE HANDLING
 M:	Naoya Horiguchi <[email protected]>
drivers/media/platform/Kconfig +1 -1
index c308de1a42a4..2ad5fde02543 100644
@@ -94,7 +94,7 @@ 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/stm/sti/Kconfig"
 source "drivers/media/platform/stm/stm32/Kconfig"
 source "drivers/media/platform/ti-vpe/Kconfig"
 source "drivers/media/platform/via/Kconfig"
drivers/media/platform/Makefile +4 -4
index 7f077c9a416d..f20f1287c665 100644
@@ -36,10 +36,10 @@ 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 += stm/sti/bdisp/
+obj-y += stm/sti/c8sectpfe/
+obj-y += stm/sti/delta/
+obj-y += stm/sti/hva/
 obj-y += stm/stm32/
 obj-y += ti-vpe/
 obj-y += via/
drivers/media/platform/sti/Kconfig deleted +0 -5
deleted file mode 100644
index 9fb5e78a92cf..000000000000
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-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"
drivers/media/platform/stm/sti/Kconfig new file +5 -0
new file mode 100644
index 000000000000..311930644281
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0-only
+source "drivers/media/platform/stm/sti/bdisp/Kconfig"
+source "drivers/media/platform/stm/sti/c8sectpfe/Kconfig"
+source "drivers/media/platform/stm/sti/delta/Kconfig"
+source "drivers/media/platform/stm/sti/hva/Kconfig"
drivers/media/platform/stm/sti/bdisp/Kconfig renamed from drivers/media/platform/sti/bdisp/Kconfig +0 -0
similarity index 100%
rename from drivers/media/platform/sti/bdisp/Kconfig
rename to drivers/media/platform/stm/sti/bdisp/Kconfig
drivers/media/platform/stm/sti/bdisp/Makefile renamed from drivers/media/platform/sti/bdisp/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/sti/bdisp/Makefile
rename to drivers/media/platform/stm/sti/bdisp/Makefile
drivers/media/platform/stm/sti/bdisp/bdisp-debug.c renamed from drivers/media/platform/sti/bdisp/bdisp-debug.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/bdisp/bdisp-debug.c
rename to drivers/media/platform/stm/sti/bdisp/bdisp-debug.c
drivers/media/platform/stm/sti/bdisp/bdisp-filter.h renamed from drivers/media/platform/sti/bdisp/bdisp-filter.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/bdisp/bdisp-filter.h
rename to drivers/media/platform/stm/sti/bdisp/bdisp-filter.h
drivers/media/platform/stm/sti/bdisp/bdisp-hw.c renamed from drivers/media/platform/sti/bdisp/bdisp-hw.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/bdisp/bdisp-hw.c
rename to drivers/media/platform/stm/sti/bdisp/bdisp-hw.c
drivers/media/platform/stm/sti/bdisp/bdisp-reg.h renamed from drivers/media/platform/sti/bdisp/bdisp-reg.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/bdisp/bdisp-reg.h
rename to drivers/media/platform/stm/sti/bdisp/bdisp-reg.h
drivers/media/platform/stm/sti/bdisp/bdisp-v4l2.c renamed from drivers/media/platform/sti/bdisp/bdisp-v4l2.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/bdisp/bdisp-v4l2.c
rename to drivers/media/platform/stm/sti/bdisp/bdisp-v4l2.c
drivers/media/platform/stm/sti/bdisp/bdisp.h renamed from drivers/media/platform/sti/bdisp/bdisp.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/bdisp/bdisp.h
rename to drivers/media/platform/stm/sti/bdisp/bdisp.h
drivers/media/platform/stm/sti/c8sectpfe/Kconfig renamed from drivers/media/platform/sti/c8sectpfe/Kconfig +0 -0
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/Kconfig
rename to drivers/media/platform/stm/sti/c8sectpfe/Kconfig
drivers/media/platform/stm/sti/c8sectpfe/Makefile renamed from drivers/media/platform/sti/c8sectpfe/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/Makefile
rename to drivers/media/platform/stm/sti/c8sectpfe/Makefile
drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-common.c renamed from drivers/media/platform/sti/c8sectpfe/c8sectpfe-common.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-common.c
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-common.c
drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-common.h renamed from drivers/media/platform/sti/c8sectpfe/c8sectpfe-common.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-common.h
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-common.h
drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-core.c renamed from drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-core.c
drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-core.h renamed from drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.h
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-core.h
drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-debugfs.c renamed from drivers/media/platform/sti/c8sectpfe/c8sectpfe-debugfs.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-debugfs.c
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-debugfs.c
drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-debugfs.h renamed from drivers/media/platform/sti/c8sectpfe/c8sectpfe-debugfs.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-debugfs.h
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-debugfs.h
drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-dvb.c renamed from drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.c
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-dvb.c
drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-dvb.h renamed from drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/c8sectpfe/c8sectpfe-dvb.h
rename to drivers/media/platform/stm/sti/c8sectpfe/c8sectpfe-dvb.h
drivers/media/platform/stm/sti/delta/Kconfig renamed from drivers/media/platform/sti/delta/Kconfig +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/Kconfig
rename to drivers/media/platform/stm/sti/delta/Kconfig
drivers/media/platform/stm/sti/delta/Makefile renamed from drivers/media/platform/sti/delta/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/Makefile
rename to drivers/media/platform/stm/sti/delta/Makefile
drivers/media/platform/stm/sti/delta/delta-cfg.h renamed from drivers/media/platform/sti/delta/delta-cfg.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-cfg.h
rename to drivers/media/platform/stm/sti/delta/delta-cfg.h
drivers/media/platform/stm/sti/delta/delta-debug.c renamed from drivers/media/platform/sti/delta/delta-debug.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-debug.c
rename to drivers/media/platform/stm/sti/delta/delta-debug.c
drivers/media/platform/stm/sti/delta/delta-debug.h renamed from drivers/media/platform/sti/delta/delta-debug.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-debug.h
rename to drivers/media/platform/stm/sti/delta/delta-debug.h
drivers/media/platform/stm/sti/delta/delta-ipc.c renamed from drivers/media/platform/sti/delta/delta-ipc.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-ipc.c
rename to drivers/media/platform/stm/sti/delta/delta-ipc.c
drivers/media/platform/stm/sti/delta/delta-ipc.h renamed from drivers/media/platform/sti/delta/delta-ipc.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-ipc.h
rename to drivers/media/platform/stm/sti/delta/delta-ipc.h
drivers/media/platform/stm/sti/delta/delta-mem.c renamed from drivers/media/platform/sti/delta/delta-mem.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-mem.c
rename to drivers/media/platform/stm/sti/delta/delta-mem.c
drivers/media/platform/stm/sti/delta/delta-mem.h renamed from drivers/media/platform/sti/delta/delta-mem.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-mem.h
rename to drivers/media/platform/stm/sti/delta/delta-mem.h
drivers/media/platform/stm/sti/delta/delta-mjpeg-dec.c renamed from drivers/media/platform/sti/delta/delta-mjpeg-dec.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-mjpeg-dec.c
rename to drivers/media/platform/stm/sti/delta/delta-mjpeg-dec.c
drivers/media/platform/stm/sti/delta/delta-mjpeg-fw.h renamed from drivers/media/platform/sti/delta/delta-mjpeg-fw.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-mjpeg-fw.h
rename to drivers/media/platform/stm/sti/delta/delta-mjpeg-fw.h
drivers/media/platform/stm/sti/delta/delta-mjpeg-hdr.c renamed from drivers/media/platform/sti/delta/delta-mjpeg-hdr.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-mjpeg-hdr.c
rename to drivers/media/platform/stm/sti/delta/delta-mjpeg-hdr.c
drivers/media/platform/stm/sti/delta/delta-mjpeg.h renamed from drivers/media/platform/sti/delta/delta-mjpeg.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-mjpeg.h
rename to drivers/media/platform/stm/sti/delta/delta-mjpeg.h
drivers/media/platform/stm/sti/delta/delta-v4l2.c renamed from drivers/media/platform/sti/delta/delta-v4l2.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/delta-v4l2.c
rename to drivers/media/platform/stm/sti/delta/delta-v4l2.c
drivers/media/platform/stm/sti/delta/delta.h renamed from drivers/media/platform/sti/delta/delta.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/delta/delta.h
rename to drivers/media/platform/stm/sti/delta/delta.h
drivers/media/platform/stm/sti/hva/Kconfig renamed from drivers/media/platform/sti/hva/Kconfig +0 -0
similarity index 100%
rename from drivers/media/platform/sti/hva/Kconfig
rename to drivers/media/platform/stm/sti/hva/Kconfig
drivers/media/platform/stm/sti/hva/Makefile renamed from drivers/media/platform/sti/hva/Makefile +0 -0
similarity index 100%
rename from drivers/media/platform/sti/hva/Makefile
rename to drivers/media/platform/stm/sti/hva/Makefile
drivers/media/platform/stm/sti/hva/hva-debugfs.c renamed from drivers/media/platform/sti/hva/hva-debugfs.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/hva/hva-debugfs.c
rename to drivers/media/platform/stm/sti/hva/hva-debugfs.c
drivers/media/platform/stm/sti/hva/hva-h264.c renamed from drivers/media/platform/sti/hva/hva-h264.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/hva/hva-h264.c
rename to drivers/media/platform/stm/sti/hva/hva-h264.c
drivers/media/platform/stm/sti/hva/hva-hw.c renamed from drivers/media/platform/sti/hva/hva-hw.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/hva/hva-hw.c
rename to drivers/media/platform/stm/sti/hva/hva-hw.c
drivers/media/platform/stm/sti/hva/hva-hw.h renamed from drivers/media/platform/sti/hva/hva-hw.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/hva/hva-hw.h
rename to drivers/media/platform/stm/sti/hva/hva-hw.h
drivers/media/platform/stm/sti/hva/hva-mem.c renamed from drivers/media/platform/sti/hva/hva-mem.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/hva/hva-mem.c
rename to drivers/media/platform/stm/sti/hva/hva-mem.c
drivers/media/platform/stm/sti/hva/hva-mem.h renamed from drivers/media/platform/sti/hva/hva-mem.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/hva/hva-mem.h
rename to drivers/media/platform/stm/sti/hva/hva-mem.h
drivers/media/platform/stm/sti/hva/hva-v4l2.c renamed from drivers/media/platform/sti/hva/hva-v4l2.c +0 -0
similarity index 100%
rename from drivers/media/platform/sti/hva/hva-v4l2.c
rename to drivers/media/platform/stm/sti/hva/hva-v4l2.c
drivers/media/platform/stm/sti/hva/hva.h renamed from drivers/media/platform/sti/hva/hva.h +0 -0
similarity index 100%
rename from drivers/media/platform/sti/hva/hva.h
rename to drivers/media/platform/stm/sti/hva/hva.h
Signature · 1 line
2.35.1
author maintainer
#67 lore raw

PATCH v2 57/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 6c1055c27c65..f0b262176a70 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 2ad5fde02543..5d56058fa397 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/amphion/Kconfig"
 source "drivers/media/platform/aspeed/Kconfig"
@@ -97,6 +96,7 @@ source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
 source "drivers/media/platform/stm/sti/Kconfig"
 source "drivers/media/platform/stm/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 f20f1287c665..f8c4617da0ae 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 += amphion/
 obj-y += aspeed/
@@ -42,6 +41,7 @@ obj-y += stm/sti/delta/
 obj-y += stm/sti/hva/
 obj-y += stm/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
maintainer Reviewed-by on v2 57/67
#68 lore raw

Re: [PATCH v2 57/67] media: platform: rename am437x/ to ti/am437x/

Quoted 11 lines · Mauro Carvalho Chehab

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

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] at: https://lore.kernel.org/all/[email protected]/

Quoted 15 lines
 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%)

Cheers,
Prabhakar

Quoted 76 lines
MAINTAINERS +1 -1
index 6c1055c27c65..f0b262176a70 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 2ad5fde02543..5d56058fa397 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/amphion/Kconfig"
 source "drivers/media/platform/aspeed/Kconfig"
@@ -97,6 +96,7 @@ source "drivers/media/platform/samsung/s5p-mfc/Kconfig"
 source "drivers/media/platform/stm/sti/Kconfig"
 source "drivers/media/platform/stm/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 f20f1287c665..f8c4617da0ae 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 += amphion/
 obj-y += aspeed/
@@ -42,6 +41,7 @@ obj-y += stm/sti/delta/
 obj-y += stm/sti/hva/
 obj-y += stm/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 -1
similarity index 100%
rename from drivers/media/platform/am437x/am437x-vpfe_regs.h
rename to drivers/media/platform/ti/am437x/am437x-vpfe_regs.h
--

2.35.1

author maintainer
#69 lore raw

PATCH v2 58/67 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/.

---

To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH v2 00/67] 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 f0b262176a70..4674c70f8859 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 5d56058fa397..9b1bccf9a621 100644
@@ -73,7 +73,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/stm/sti/Kconfig"
 source "drivers/media/platform/stm/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 f8c4617da0ae..70c87bd6468b 100644
@@ -13,7 +13,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 += stm/sti/hva/
 obj-y += stm/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