* [PATCH v2 00/38] Sort Makefiles and platform/Kconfig
@ 2022-03-11 14:07 Mauro Carvalho Chehab
2022-03-11 14:07 ` [PATCH v2 06/38] media: platform: place Aspeed driver on a separate dir Mauro Carvalho Chehab
0 siblings, 1 reply; 2+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-11 14:07 UTC (permalink / raw)
Cc: Heiko Stuebner, Dafna Hirschfeld, Eddie James, Alexandre Torgue,
Todor Tomov, Bjorn Andersson, Matthias Brugger, Lad, Prabhakar,
Laurent Pinchart, Andrzej Hajda, Dmitry Osipenko,
linux1394-devel, Fabio Estevam, linux-stm32, linux-kernel,
Jerome Brunet, linux-samsung-soc, linux-aspeed, Michael Tretter,
Krzysztof Kozlowski, Kevin Hilman, openbmc, Jernej Skrabec,
Shijie Qin, Chen-Yu Tsai, Jacob Chen, Michael Krufky,
Ezequiel Garcia, Mikhail Ulyanov, Philipp Zabel,
Andrzej Pietrasiewicz, Patrice Chotard, NXP Linux Team,
Sylwester Nawrocki, linux-tegra, Pengutronix Kernel Team,
Martin Blumenstingl, linux-arm-msm, Sascha Hauer,
Łukasz Stelmach, Maxime Ripard, Stanimir Varbanov,
Benoit Parrot, linux-mediatek, Jacek Anaszewski, Yong Deng,
Marek Szyprowski, linux-amlogic, Sylwester Nawrocki,
Mauro Carvalho Chehab, linux-arm-kernel, Andy Walls, Zhou Peng,
Mirela Rabulea, Andrew Jeffery, Andy Gross, Robert Foss,
Tomasz Figa, linux-renesas-soc, linux-rockchip, Stefan Richter,
Maxime Coquelin, linux-media, Shawn Guo, linux-sunxi, Ming Qian
Entries at Makefiles and Kconfig files end being merged on random order.
Sort Makefile entries in alphabetical order.
Sorting Kconfig is harder. So, for now, do it only for platform/Kconfig.
On platform/Kconfig, there is a mix of:
- two ancillary drivers;
- per-SoC drivers whose Kconfig/Makefile is on separate files;
- per-SoC drivers whose Makefile is on separate files, but the
driver is at platform/Makefile;
- per-SoC drivers that are specified inside platform/Makefile and
platform/Kconfig.
Give some order by ensuring that all non-generic drivers will be on
subdirectories.
The end goal is to have one directory below platform per manufacturer,
This series prepare for that.
Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-
v2:
- removed some renames at DVB frontend;
- added patches for platform/Kconfig sort.
Mauro Carvalho Chehab (38):
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
drivers: media: platform: move some manufacturer entries
.../admin-guide/media/i2c-cardlist.rst | 2 +-
MAINTAINERS | 22 +-
drivers/media/Makefile | 4 +-
drivers/media/cec/platform/Makefile | 16 +-
drivers/media/common/Makefile | 4 +-
drivers/media/common/videobuf2/Makefile | 6 +-
drivers/media/dvb-frontends/Makefile | 192 ++---
drivers/media/firewire/Makefile | 2 +-
drivers/media/i2c/Makefile | 92 +--
drivers/media/pci/Makefile | 18 +-
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/platform/Kconfig | 755 ++----------------
drivers/media/platform/Makefile | 132 +--
drivers/media/platform/allegro-dvt/Kconfig | 16 +
drivers/media/platform/am437x/Kconfig | 1 +
drivers/media/platform/amphion/Kconfig | 20 +
drivers/media/platform/aspeed/Kconfig | 10 +
drivers/media/platform/aspeed/Makefile | 1 +
.../platform/{ => aspeed}/aspeed-video.c | 0
drivers/media/platform/atmel/Kconfig | 4 +
drivers/media/platform/cadence/Kconfig | 1 +
drivers/media/platform/coda/Kconfig | 17 +
drivers/media/platform/davinci/Kconfig | 6 +
drivers/media/platform/exynos-gsc/Kconfig | 10 +
drivers/media/platform/exynos4-is/Kconfig | 1 +
drivers/media/platform/imx-jpeg/Kconfig | 1 +
drivers/media/platform/imx/Kconfig | 1 +
drivers/media/platform/intel/Kconfig | 11 +
drivers/media/platform/intel/Makefile | 1 +
.../media/platform/{ => intel}/pxa_camera.c | 0
drivers/media/platform/marvell-ccic/Kconfig | 2 +
drivers/media/platform/meson/ge2d/Kconfig | 14 +
drivers/media/platform/mtk-jpeg/Kconfig | 16 +
drivers/media/platform/mtk-mdp/Kconfig | 17 +
drivers/media/platform/mtk-vcodec/Kconfig | 36 +
drivers/media/platform/mtk-vpu/Kconfig | 15 +
drivers/media/platform/nxp/Kconfig | 40 +
drivers/media/platform/nxp/Makefile | 5 +
drivers/media/platform/{ => nxp}/fsl-viu.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/omap/Kconfig | 1 +
drivers/media/platform/omap3isp/Kconfig | 21 +
drivers/media/platform/qcom/Kconfig | 3 +
drivers/media/platform/qcom/camss/Kconfig | 9 +
drivers/media/platform/qcom/venus/Kconfig | 14 +
drivers/media/platform/renesas/Kconfig | 119 +++
drivers/media/platform/renesas/Makefile | 14 +
.../media/platform/{ => renesas}/rcar-fcp.c | 0
.../media/platform/{ => renesas}/rcar-isp.c | 0
.../platform/{ => renesas}/rcar-vin/Kconfig | 2 +
.../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
drivers/media/platform/rockchip/Kconfig | 3 +
drivers/media/platform/rockchip/rga/Kconfig | 14 +
.../media/platform/rockchip/rkisp1/Kconfig | 19 +
drivers/media/platform/s3c-camif/Kconfig | 15 +
drivers/media/platform/s5p-g2d/Kconfig | 11 +
drivers/media/platform/s5p-jpeg/Kconfig | 12 +
drivers/media/platform/s5p-mfc/Kconfig | 9 +
drivers/media/platform/sti/Kconfig | 5 +
drivers/media/platform/sti/bdisp/Kconfig | 10 +
drivers/media/platform/sti/c8sectpfe/Kconfig | 1 +
drivers/media/platform/sti/delta/Kconfig | 36 +
drivers/media/platform/sti/hva/Kconfig | 26 +
drivers/media/platform/stm32/Kconfig | 31 +
drivers/media/platform/sunxi/Kconfig | 2 +
.../media/platform/sunxi/sun4i-csi/Kconfig | 1 +
.../media/platform/sunxi/sun6i-csi/Kconfig | 1 +
drivers/media/platform/sunxi/sun8i-di/Kconfig | 14 +
.../media/platform/sunxi/sun8i-rotate/Kconfig | 14 +
drivers/media/platform/tegra/vde/Kconfig | 17 +
drivers/media/platform/ti-vpe/Kconfig | 62 ++
drivers/media/platform/via/Kconfig | 11 +
drivers/media/platform/via/Makefile | 1 +
drivers/media/platform/{ => via}/via-camera.c | 0
drivers/media/platform/{ => via}/via-camera.h | 0
drivers/media/platform/xilinx/Kconfig | 1 +
drivers/media/radio/Makefile | 42 +-
drivers/media/rc/Makefile | 45 +-
drivers/media/rc/keymaps/Makefile | 33 +-
drivers/media/spi/Makefile | 5 +-
drivers/media/test-drivers/Makefile | 13 +-
drivers/media/tuners/Makefile | 66 +-
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/Makefile | 25 +-
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/Makefile | 88 +-
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/Makefile | 29 +-
drivers/media/v4l2-core/tuner-core.c | 2 +-
120 files changed, 1248 insertions(+), 1144 deletions(-)
create mode 100644 drivers/media/platform/allegro-dvt/Kconfig
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/coda/Kconfig
create mode 100644 drivers/media/platform/exynos-gsc/Kconfig
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%)
create mode 100644 drivers/media/platform/meson/ge2d/Kconfig
create mode 100644 drivers/media/platform/mtk-jpeg/Kconfig
create mode 100644 drivers/media/platform/mtk-mdp/Kconfig
create mode 100644 drivers/media/platform/mtk-vcodec/Kconfig
create mode 100644 drivers/media/platform/mtk-vpu/Kconfig
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-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/omap3isp/Kconfig
create mode 100644 drivers/media/platform/qcom/Kconfig
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 (93%)
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%)
create mode 100644 drivers/media/platform/rockchip/Kconfig
create mode 100644 drivers/media/platform/rockchip/rga/Kconfig
create mode 100644 drivers/media/platform/rockchip/rkisp1/Kconfig
create mode 100644 drivers/media/platform/s3c-camif/Kconfig
create mode 100644 drivers/media/platform/s5p-g2d/Kconfig
create mode 100644 drivers/media/platform/s5p-jpeg/Kconfig
create mode 100644 drivers/media/platform/s5p-mfc/Kconfig
create mode 100644 drivers/media/platform/sti/Kconfig
create mode 100644 drivers/media/platform/sti/bdisp/Kconfig
create mode 100644 drivers/media/platform/sti/delta/Kconfig
create mode 100644 drivers/media/platform/sti/hva/Kconfig
create mode 100644 drivers/media/platform/stm32/Kconfig
create mode 100644 drivers/media/platform/sunxi/sun8i-di/Kconfig
create mode 100644 drivers/media/platform/sunxi/sun8i-rotate/Kconfig
create mode 100644 drivers/media/platform/tegra/vde/Kconfig
create mode 100644 drivers/media/platform/ti-vpe/Kconfig
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%)
--
2.35.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH v2 06/38] media: platform: place Aspeed driver on a separate dir
2022-03-11 14:07 [PATCH v2 00/38] Sort Makefiles and platform/Kconfig Mauro Carvalho Chehab
@ 2022-03-11 14:07 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 2+ messages in thread
From: Mauro Carvalho Chehab @ 2022-03-11 14:07 UTC (permalink / raw)
Cc: linux-arm-kernel, Jammy Huang, Niklas Söderlund,
linux-aspeed, Zev Weiss, Paul Menzel, Andrew Jeffery, openbmc,
Eddie James, Jacopo Mondi, linux-kernel, Yang Li, Joel Stanley,
Sakari Ailus, Hans Verkuil, Eugen Hristev, Dmitry Osipenko,
Mauro Carvalho Chehab, linux-media, Ming Qian, Laurent Pinchart
In order to cleanup the main platform media directory, move Aspeed
driver to its own directory.
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] at: https://lore.kernel.org/all/cover.1647006877.git.mchehab@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 | 1 +
drivers/media/platform/{ => aspeed}/aspeed-video.c | 0
6 files changed, 14 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%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 1a9fb0615925..1b6f48a660de 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3026,7 +3026,7 @@ L: linux-media@vger.kernel.org
L: openbmc@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 <corentin.chary@gmail.com>
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 1cb73f09d0b5..ad95a25ae2fc 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -57,15 +57,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"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index c7ee7dafe6b3..1a52a1a784b5 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -5,6 +5,7 @@
# Place here, alphabetically sorted, all directories
obj-y += allegro-dvt/
+obj-y += aspeed/
obj-y += am437x/
obj-y += amphion/
obj-y += atmel/
@@ -44,7 +45,6 @@ obj-y += vsp1/
obj-y += xilinx/
# Please place here only ancillary drivers that aren't SoC-specific
-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
diff --git a/drivers/media/platform/aspeed/Kconfig b/drivers/media/platform/aspeed/Kconfig
new file mode 100644
index 000000000000..5025e892844c
--- /dev/null
+++ b/drivers/media/platform/aspeed/Kconfig
@@ -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.
diff --git a/drivers/media/platform/aspeed/Makefile b/drivers/media/platform/aspeed/Makefile
new file mode 100644
index 000000000000..4ee15b3ddd90
--- /dev/null
+++ b/drivers/media/platform/aspeed/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_VIDEO_ASPEED) += aspeed-video.o
diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed/aspeed-video.c
similarity index 100%
rename from drivers/media/platform/aspeed-video.c
rename to drivers/media/platform/aspeed/aspeed-video.c
--
2.35.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-03-14 23:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-11 14:07 [PATCH v2 00/38] Sort Makefiles and platform/Kconfig Mauro Carvalho Chehab
2022-03-11 14:07 ` [PATCH v2 06/38] media: platform: place Aspeed driver on a separate dir Mauro Carvalho Chehab
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).