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 <[email protected]>
-
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
In order to better organize the platform/Kconfig, place
s5p-mfc-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 2f52f3f975cd..447fe5681307 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -123,14 +123,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"
diff --git a/drivers/media/platform/s5p-mfc/Kconfig b/drivers/media/platform/s5p-mfc/Kconfig
new file mode 100644
index 000000000000..34b52b0de304
--- /dev/null
+++ b/drivers/media/platform/s5p-mfc/Kconfig
@@ -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
--
2.35.1
In order to better organize the platform/Kconfig, place
ti-vpe-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 9b8a5f4eaafc..a7db6cee6b07 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -73,6 +73,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"
@@ -114,33 +115,6 @@ 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"
- 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
source "drivers/media/platform/imx-jpeg/Kconfig"
@@ -222,38 +196,6 @@ 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"
diff --git a/drivers/media/platform/ti-vpe/Kconfig b/drivers/media/platform/ti-vpe/Kconfig
new file mode 100644
index 000000000000..a9ee0189f2f2
--- /dev/null
+++ b/drivers/media/platform/ti-vpe/Kconfig
@@ -0,0 +1,62 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+# 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
+
+# V4L drivers
+
+config VIDEO_TI_CAL
+ tristate "TI CAL (Camera Adaptation Layer) driver"
+ depends on VIDEO_DEV && VIDEO_V4L2
+ depends on V4L_PLATFORM_DRIVERS
+ 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_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 VIDEO_TI_VPE
+ help
+ Enable debug messages on VPE driver.
--
2.35.1
In order to better organize the platform/Kconfig, place
exynos-gsc-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index f6bc8457a1c2..103f3771fd29 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -53,6 +53,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"
@@ -328,16 +329,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
diff --git a/drivers/media/platform/exynos-gsc/Kconfig b/drivers/media/platform/exynos-gsc/Kconfig
new file mode 100644
index 000000000000..f9bdffe915b4
--- /dev/null
+++ b/drivers/media/platform/exynos-gsc/Kconfig
@@ -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.
--
2.35.1
In order to better organize the platform/Kconfig, place
coda-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 25cfda75e625..f6bc8457a1c2 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -50,6 +50,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"
@@ -187,23 +188,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
-
source "drivers/media/platform/imx-jpeg/Kconfig"
config VIDEO_MEDIATEK_JPEG
diff --git a/drivers/media/platform/coda/Kconfig b/drivers/media/platform/coda/Kconfig
new file mode 100644
index 000000000000..ae495fd7b25a
--- /dev/null
+++ b/drivers/media/platform/coda/Kconfig
@@ -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
--
2.35.1
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.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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(-)
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index d18357bf1346..20fac24e4f0f 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -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/
diff --git a/drivers/media/cec/platform/Makefile b/drivers/media/cec/platform/Makefile
index ea6f8ee8161c..26d2bc778394 100644
--- a/drivers/media/cec/platform/Makefile
+++ b/drivers/media/cec/platform/Makefile
@@ -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/
diff --git a/drivers/media/firewire/Makefile b/drivers/media/firewire/Makefile
index 3670c85af6f5..d5551e6389bf 100644
--- a/drivers/media/firewire/Makefile
+++ b/drivers/media/firewire/Makefile
@@ -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
diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index 7f8c1df60330..557c8c9dfafe 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -2,10 +2,10 @@
msp3400-objs := msp3400-driver.o msp3400-kthreads.o
obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o
-obj-$(CONFIG_VIDEO_CCS) += ccs/
-obj-$(CONFIG_VIDEO_ET8EK8) += et8ek8/
+obj-$(CONFIG_VIDEO_CCS) += ccs/
+obj-$(CONFIG_VIDEO_ET8EK8) += et8ek8/
obj-$(CONFIG_VIDEO_CX25840) += cx25840/
-obj-$(CONFIG_VIDEO_M5MOLS) += m5mols/
+obj-$(CONFIG_VIDEO_M5MOLS) += m5mols/
obj-$(CONFIG_VIDEO_APTINA_PLL) += aptina-pll.o
obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o
@@ -21,11 +21,11 @@ obj-$(CONFIG_VIDEO_SAA717X) += saa717x.o
obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
obj-$(CONFIG_VIDEO_SAA6752HS) += saa6752hs.o
-obj-$(CONFIG_VIDEO_AD5820) += ad5820.o
-obj-$(CONFIG_VIDEO_AK7375) += ak7375.o
-obj-$(CONFIG_VIDEO_DW9714) += dw9714.o
-obj-$(CONFIG_VIDEO_DW9768) += dw9768.o
-obj-$(CONFIG_VIDEO_DW9807_VCM) += dw9807-vcm.o
+obj-$(CONFIG_VIDEO_AD5820) += ad5820.o
+obj-$(CONFIG_VIDEO_AK7375) += ak7375.o
+obj-$(CONFIG_VIDEO_DW9714) += dw9714.o
+obj-$(CONFIG_VIDEO_DW9768) += dw9768.o
+obj-$(CONFIG_VIDEO_DW9807_VCM) += dw9807-vcm.o
obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o
obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o
obj-$(CONFIG_VIDEO_ADV7180) += adv7180.o
@@ -38,7 +38,7 @@ obj-$(CONFIG_VIDEO_ADV7842) += adv7842.o
obj-$(CONFIG_VIDEO_AD9389B) += ad9389b.o
obj-$(CONFIG_VIDEO_ADV7511) += adv7511-v4l2.o
obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o
-obj-$(CONFIG_VIDEO_VS6624) += vs6624.o
+obj-$(CONFIG_VIDEO_VS6624) += vs6624.o
obj-$(CONFIG_VIDEO_BT819) += bt819.o
obj-$(CONFIG_VIDEO_BT856) += bt856.o
obj-$(CONFIG_VIDEO_BT866) += bt866.o
@@ -102,42 +102,42 @@ obj-$(CONFIG_VIDEO_MT9T112) += mt9t112.o
obj-$(CONFIG_VIDEO_MT9V011) += mt9v011.o
obj-$(CONFIG_VIDEO_MT9V032) += mt9v032.o
obj-$(CONFIG_VIDEO_MT9V111) += mt9v111.o
-obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o
-obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o
-obj-$(CONFIG_VIDEO_RJ54N1) += rj54n1cb0c.o
-obj-$(CONFIG_VIDEO_S5K6AA) += s5k6aa.o
-obj-$(CONFIG_VIDEO_S5K6A3) += s5k6a3.o
-obj-$(CONFIG_VIDEO_S5K4ECGX) += s5k4ecgx.o
-obj-$(CONFIG_VIDEO_S5K5BAF) += s5k5baf.o
-obj-$(CONFIG_VIDEO_S5C73M3) += s5c73m3/
-obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o
-obj-$(CONFIG_VIDEO_LM3560) += lm3560.o
-obj-$(CONFIG_VIDEO_LM3646) += lm3646.o
-obj-$(CONFIG_VIDEO_CCS_PLL) += ccs-pll.o
-obj-$(CONFIG_VIDEO_AK881X) += ak881x.o
-obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o
-obj-$(CONFIG_VIDEO_I2C) += video-i2c.o
-obj-$(CONFIG_VIDEO_ML86V7667) += ml86v7667.o
-obj-$(CONFIG_VIDEO_OV2659) += ov2659.o
-obj-$(CONFIG_VIDEO_TC358743) += tc358743.o
-obj-$(CONFIG_VIDEO_HI556) += hi556.o
-obj-$(CONFIG_VIDEO_HI846) += hi846.o
-obj-$(CONFIG_VIDEO_HI847) += hi847.o
-obj-$(CONFIG_VIDEO_IMX208) += imx208.o
-obj-$(CONFIG_VIDEO_IMX214) += imx214.o
-obj-$(CONFIG_VIDEO_IMX219) += imx219.o
-obj-$(CONFIG_VIDEO_IMX258) += imx258.o
-obj-$(CONFIG_VIDEO_IMX274) += imx274.o
-obj-$(CONFIG_VIDEO_IMX290) += imx290.o
-obj-$(CONFIG_VIDEO_IMX319) += imx319.o
-obj-$(CONFIG_VIDEO_IMX334) += imx334.o
-obj-$(CONFIG_VIDEO_IMX335) += imx335.o
-obj-$(CONFIG_VIDEO_IMX355) += imx355.o
-obj-$(CONFIG_VIDEO_IMX412) += imx412.o
-obj-$(CONFIG_VIDEO_ISL7998X) += isl7998x.o
-obj-$(CONFIG_VIDEO_MAX9286) += max9286.o
-obj-$(CONFIG_VIDEO_MAX9271_LIB) += max9271.o
-obj-$(CONFIG_VIDEO_RDACM20) += rdacm20.o
-obj-$(CONFIG_VIDEO_RDACM21) += rdacm21.o
+obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o
+obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o
+obj-$(CONFIG_VIDEO_RJ54N1) += rj54n1cb0c.o
+obj-$(CONFIG_VIDEO_S5K6AA) += s5k6aa.o
+obj-$(CONFIG_VIDEO_S5K6A3) += s5k6a3.o
+obj-$(CONFIG_VIDEO_S5K4ECGX) += s5k4ecgx.o
+obj-$(CONFIG_VIDEO_S5K5BAF) += s5k5baf.o
+obj-$(CONFIG_VIDEO_S5C73M3) += s5c73m3/
+obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o
+obj-$(CONFIG_VIDEO_LM3560) += lm3560.o
+obj-$(CONFIG_VIDEO_LM3646) += lm3646.o
+obj-$(CONFIG_VIDEO_CCS_PLL) += ccs-pll.o
+obj-$(CONFIG_VIDEO_AK881X) += ak881x.o
+obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o
+obj-$(CONFIG_VIDEO_I2C) += video-i2c.o
+obj-$(CONFIG_VIDEO_ML86V7667) += ml86v7667.o
+obj-$(CONFIG_VIDEO_OV2659) += ov2659.o
+obj-$(CONFIG_VIDEO_TC358743) += tc358743.o
+obj-$(CONFIG_VIDEO_HI556) += hi556.o
+obj-$(CONFIG_VIDEO_HI846) += hi846.o
+obj-$(CONFIG_VIDEO_HI847) += hi847.o
+obj-$(CONFIG_VIDEO_IMX208) += imx208.o
+obj-$(CONFIG_VIDEO_IMX214) += imx214.o
+obj-$(CONFIG_VIDEO_IMX219) += imx219.o
+obj-$(CONFIG_VIDEO_IMX258) += imx258.o
+obj-$(CONFIG_VIDEO_IMX274) += imx274.o
+obj-$(CONFIG_VIDEO_IMX290) += imx290.o
+obj-$(CONFIG_VIDEO_IMX319) += imx319.o
+obj-$(CONFIG_VIDEO_IMX334) += imx334.o
+obj-$(CONFIG_VIDEO_IMX335) += imx335.o
+obj-$(CONFIG_VIDEO_IMX355) += imx355.o
+obj-$(CONFIG_VIDEO_IMX412) += imx412.o
+obj-$(CONFIG_VIDEO_ISL7998X) += isl7998x.o
+obj-$(CONFIG_VIDEO_MAX9286) += max9286.o
+obj-$(CONFIG_VIDEO_MAX9271_LIB) += max9271.o
+obj-$(CONFIG_VIDEO_RDACM20) += rdacm20.o
+obj-$(CONFIG_VIDEO_RDACM21) += rdacm21.o
obj-$(CONFIG_VIDEO_ST_MIPID02) += st-mipid02.o
obj-$(CONFIG_SDR_MAX2175) += max2175.o
diff --git a/drivers/media/test-drivers/Makefile b/drivers/media/test-drivers/Makefile
index 9f0e4ebb2efe..1e64e05c1f22 100644
--- a/drivers/media/test-drivers/Makefile
+++ b/drivers/media/test-drivers/Makefile
@@ -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/
diff --git a/drivers/media/usb/Makefile b/drivers/media/usb/Makefile
index 3eaff3149ef4..65521f4921e3 100644
--- a/drivers/media/usb/Makefile
+++ b/drivers/media/usb/Makefile
@@ -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/
diff --git a/drivers/media/usb/gspca/Makefile b/drivers/media/usb/gspca/Makefile
index 3e3ecbffdf9f..a35c45006130 100644
--- a/drivers/media/usb/gspca/Makefile
+++ b/drivers/media/usb/gspca/Makefile
@@ -1,51 +1,51 @@
# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_USB_GSPCA) += gspca_main.o
-obj-$(CONFIG_USB_GSPCA_BENQ) += gspca_benq.o
-obj-$(CONFIG_USB_GSPCA_CONEX) += gspca_conex.o
-obj-$(CONFIG_USB_GSPCA_CPIA1) += gspca_cpia1.o
-obj-$(CONFIG_USB_GSPCA_DTCS033) += gspca_dtcs033.o
-obj-$(CONFIG_USB_GSPCA_ETOMS) += gspca_etoms.o
-obj-$(CONFIG_USB_GSPCA_FINEPIX) += gspca_finepix.o
-obj-$(CONFIG_USB_GSPCA_JEILINJ) += gspca_jeilinj.o
+obj-$(CONFIG_USB_GSPCA) += gspca_main.o
+obj-$(CONFIG_USB_GSPCA_BENQ) += gspca_benq.o
+obj-$(CONFIG_USB_GSPCA_CONEX) += gspca_conex.o
+obj-$(CONFIG_USB_GSPCA_CPIA1) += gspca_cpia1.o
+obj-$(CONFIG_USB_GSPCA_DTCS033) += gspca_dtcs033.o
+obj-$(CONFIG_USB_GSPCA_ETOMS) += gspca_etoms.o
+obj-$(CONFIG_USB_GSPCA_FINEPIX) += gspca_finepix.o
+obj-$(CONFIG_USB_GSPCA_JEILINJ) += gspca_jeilinj.o
obj-$(CONFIG_USB_GSPCA_JL2005BCD) += gspca_jl2005bcd.o
-obj-$(CONFIG_USB_GSPCA_KINECT) += gspca_kinect.o
-obj-$(CONFIG_USB_GSPCA_KONICA) += gspca_konica.o
-obj-$(CONFIG_USB_GSPCA_MARS) += gspca_mars.o
+obj-$(CONFIG_USB_GSPCA_KINECT) += gspca_kinect.o
+obj-$(CONFIG_USB_GSPCA_KONICA) += gspca_konica.o
+obj-$(CONFIG_USB_GSPCA_MARS) += gspca_mars.o
obj-$(CONFIG_USB_GSPCA_MR97310A) += gspca_mr97310a.o
-obj-$(CONFIG_USB_GSPCA_NW80X) += gspca_nw80x.o
-obj-$(CONFIG_USB_GSPCA_OV519) += gspca_ov519.o
-obj-$(CONFIG_USB_GSPCA_OV534) += gspca_ov534.o
-obj-$(CONFIG_USB_GSPCA_OV534_9) += gspca_ov534_9.o
-obj-$(CONFIG_USB_GSPCA_PAC207) += gspca_pac207.o
-obj-$(CONFIG_USB_GSPCA_PAC7302) += gspca_pac7302.o
-obj-$(CONFIG_USB_GSPCA_PAC7311) += gspca_pac7311.o
-obj-$(CONFIG_USB_GSPCA_SE401) += gspca_se401.o
+obj-$(CONFIG_USB_GSPCA_NW80X) += gspca_nw80x.o
+obj-$(CONFIG_USB_GSPCA_OV519) += gspca_ov519.o
+obj-$(CONFIG_USB_GSPCA_OV534) += gspca_ov534.o
+obj-$(CONFIG_USB_GSPCA_OV534_9) += gspca_ov534_9.o
+obj-$(CONFIG_USB_GSPCA_PAC207) += gspca_pac207.o
+obj-$(CONFIG_USB_GSPCA_PAC7302) += gspca_pac7302.o
+obj-$(CONFIG_USB_GSPCA_PAC7311) += gspca_pac7311.o
+obj-$(CONFIG_USB_GSPCA_SE401) += gspca_se401.o
obj-$(CONFIG_USB_GSPCA_SN9C2028) += gspca_sn9c2028.o
-obj-$(CONFIG_USB_GSPCA_SN9C20X) += gspca_sn9c20x.o
-obj-$(CONFIG_USB_GSPCA_SONIXB) += gspca_sonixb.o
-obj-$(CONFIG_USB_GSPCA_SONIXJ) += gspca_sonixj.o
-obj-$(CONFIG_USB_GSPCA_SPCA500) += gspca_spca500.o
-obj-$(CONFIG_USB_GSPCA_SPCA501) += gspca_spca501.o
-obj-$(CONFIG_USB_GSPCA_SPCA505) += gspca_spca505.o
-obj-$(CONFIG_USB_GSPCA_SPCA506) += gspca_spca506.o
-obj-$(CONFIG_USB_GSPCA_SPCA508) += gspca_spca508.o
-obj-$(CONFIG_USB_GSPCA_SPCA561) += gspca_spca561.o
+obj-$(CONFIG_USB_GSPCA_SN9C20X) += gspca_sn9c20x.o
+obj-$(CONFIG_USB_GSPCA_SONIXB) += gspca_sonixb.o
+obj-$(CONFIG_USB_GSPCA_SONIXJ) += gspca_sonixj.o
+obj-$(CONFIG_USB_GSPCA_SPCA500) += gspca_spca500.o
+obj-$(CONFIG_USB_GSPCA_SPCA501) += gspca_spca501.o
+obj-$(CONFIG_USB_GSPCA_SPCA505) += gspca_spca505.o
+obj-$(CONFIG_USB_GSPCA_SPCA506) += gspca_spca506.o
+obj-$(CONFIG_USB_GSPCA_SPCA508) += gspca_spca508.o
+obj-$(CONFIG_USB_GSPCA_SPCA561) += gspca_spca561.o
obj-$(CONFIG_USB_GSPCA_SPCA1528) += gspca_spca1528.o
-obj-$(CONFIG_USB_GSPCA_SQ905) += gspca_sq905.o
-obj-$(CONFIG_USB_GSPCA_SQ905C) += gspca_sq905c.o
-obj-$(CONFIG_USB_GSPCA_SQ930X) += gspca_sq930x.o
-obj-$(CONFIG_USB_GSPCA_SUNPLUS) += gspca_sunplus.o
-obj-$(CONFIG_USB_GSPCA_STK014) += gspca_stk014.o
-obj-$(CONFIG_USB_GSPCA_STK1135) += gspca_stk1135.o
-obj-$(CONFIG_USB_GSPCA_STV0680) += gspca_stv0680.o
-obj-$(CONFIG_USB_GSPCA_T613) += gspca_t613.o
-obj-$(CONFIG_USB_GSPCA_TOPRO) += gspca_topro.o
-obj-$(CONFIG_USB_GSPCA_TOUPTEK) += gspca_touptek.o
-obj-$(CONFIG_USB_GSPCA_TV8532) += gspca_tv8532.o
-obj-$(CONFIG_USB_GSPCA_VC032X) += gspca_vc032x.o
-obj-$(CONFIG_USB_GSPCA_VICAM) += gspca_vicam.o
+obj-$(CONFIG_USB_GSPCA_SQ905) += gspca_sq905.o
+obj-$(CONFIG_USB_GSPCA_SQ905C) += gspca_sq905c.o
+obj-$(CONFIG_USB_GSPCA_SQ930X) += gspca_sq930x.o
+obj-$(CONFIG_USB_GSPCA_SUNPLUS) += gspca_sunplus.o
+obj-$(CONFIG_USB_GSPCA_STK014) += gspca_stk014.o
+obj-$(CONFIG_USB_GSPCA_STK1135) += gspca_stk1135.o
+obj-$(CONFIG_USB_GSPCA_STV0680) += gspca_stv0680.o
+obj-$(CONFIG_USB_GSPCA_T613) += gspca_t613.o
+obj-$(CONFIG_USB_GSPCA_TOPRO) += gspca_topro.o
+obj-$(CONFIG_USB_GSPCA_TOUPTEK) += gspca_touptek.o
+obj-$(CONFIG_USB_GSPCA_TV8532) += gspca_tv8532.o
+obj-$(CONFIG_USB_GSPCA_VC032X) += gspca_vc032x.o
+obj-$(CONFIG_USB_GSPCA_VICAM) += gspca_vicam.o
obj-$(CONFIG_USB_GSPCA_XIRLINK_CIT) += gspca_xirlink_cit.o
-obj-$(CONFIG_USB_GSPCA_ZC3XX) += gspca_zc3xx.o
+obj-$(CONFIG_USB_GSPCA_ZC3XX) += gspca_zc3xx.o
gspca_main-objs := gspca.o autogain_functions.o
gspca_benq-objs := benq.o
@@ -95,6 +95,6 @@ gspca_vicam-objs := vicam.o
gspca_xirlink_cit-objs := xirlink_cit.o
gspca_zc3xx-objs := zc3xx.o
-obj-$(CONFIG_USB_M5602) += m5602/
+obj-$(CONFIG_USB_M5602) += m5602/
obj-$(CONFIG_USB_STV06XX) += stv06xx/
-obj-$(CONFIG_USB_GL860) += gl860/
+obj-$(CONFIG_USB_GL860) += gl860/
--
2.35.1
In order to better organize the platform/Kconfig, place
stm32-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 7e2b120a2057..460ad793b89b 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -69,6 +69,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"
@@ -84,21 +85,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
@@ -233,19 +219,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
diff --git a/drivers/media/platform/stm32/Kconfig b/drivers/media/platform/stm32/Kconfig
new file mode 100644
index 000000000000..f4726010ca14
--- /dev/null
+++ b/drivers/media/platform/stm32/Kconfig
@@ -0,0 +1,31 @@
+# SPDX-License-Identifier: GPL-2.0
+
+# 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.
--
2.35.1
In order to better organize the platform/Kconfig, place
bdisp-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index c5eb97199e2e..2f52f3f975cd 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -132,15 +132,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"
diff --git a/drivers/media/platform/sti/bdisp/Kconfig b/drivers/media/platform/sti/bdisp/Kconfig
new file mode 100644
index 000000000000..e583fb924f52
--- /dev/null
+++ b/drivers/media/platform/sti/bdisp/Kconfig
@@ -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.
--
2.35.1
In order to better organize the platform/Kconfig, place
camss-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index f65eefa15dda..19ca01d2f841 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -61,6 +61,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"
@@ -78,16 +79,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
diff --git a/drivers/media/platform/qcom/camss/Kconfig b/drivers/media/platform/qcom/camss/Kconfig
new file mode 100644
index 000000000000..56be91578706
--- /dev/null
+++ b/drivers/media/platform/qcom/camss/Kconfig
@@ -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
--
2.35.1
In order to cleanup the main platform media directory, move Via
driver to its own directory.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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 | 1 +
drivers/media/platform/{ => via}/via-camera.c | 0
drivers/media/platform/{ => via}/via-camera.h | 0
6 files changed, 14 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%)
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index efdb5fe592c6..d6751282087a 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -42,16 +42,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"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index c290835885de..6783b374dc80 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -43,6 +43,7 @@ obj-y += stm32/
obj-y += sunxi/
obj-y += tegra/vde/
obj-y += ti-vpe/
+obj-y += via/
obj-y += vsp1/
obj-y += xilinx/
@@ -56,4 +57,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
diff --git a/drivers/media/platform/via/Kconfig b/drivers/media/platform/via/Kconfig
new file mode 100644
index 000000000000..1dcf789dce96
--- /dev/null
+++ b/drivers/media/platform/via/Kconfig
@@ -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.
diff --git a/drivers/media/platform/via/Makefile b/drivers/media/platform/via/Makefile
new file mode 100644
index 000000000000..e5cd95d27523
--- /dev/null
+++ b/drivers/media/platform/via/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o
diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/via/via-camera.c
similarity index 100%
rename from drivers/media/platform/via-camera.c
rename to drivers/media/platform/via/via-camera.c
diff --git a/drivers/media/platform/via-camera.h b/drivers/media/platform/via/via-camera.h
similarity index 100%
rename from drivers/media/platform/via-camera.h
rename to drivers/media/platform/via/via-camera.h
--
2.35.1
In order to better organize the platform/Kconfig, place
rkisp1-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index a7db6cee6b07..620c7f1d5033 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -65,6 +65,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/rkisp1/Kconfig"
source "drivers/media/platform/rockchip/rga/Kconfig"
source "drivers/media/platform/s3c-camif/Kconfig"
source "drivers/media/platform/s5p-g2d/Kconfig"
@@ -89,25 +90,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"
diff --git a/drivers/media/platform/rockchip/rkisp1/Kconfig b/drivers/media/platform/rockchip/rkisp1/Kconfig
new file mode 100644
index 000000000000..c2e464317929
--- /dev/null
+++ b/drivers/media/platform/rockchip/rkisp1/Kconfig
@@ -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.
--
2.35.1
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.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] at: https://lore.kernel.org/all/[email protected]/
drivers/media/platform/Kconfig | 127 ++++++++++++------
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, 107 insertions(+), 44 deletions(-)
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 4843fabb8bb2..1cb73f09d0b5 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -3,17 +3,46 @@
# Platform drivers
# Most drivers here are currently for webcam support
-menuconfig V4L_PLATFORM_DRIVERS
+menuconfig MEDIA_PLATFORM_DRIVERS
+ bool "Media platform devices"
+ 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
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 +51,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 +59,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 +69,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 +78,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 +91,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 +103,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
@@ -87,12 +118,14 @@ config VIDEO_OMAP3
config VIDEO_OMAP3_DEBUG
bool "OMAP 3 Camera debug messages"
+ depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_OMAP3
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
@@ -103,6 +136,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 +146,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 +161,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 +176,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 +186,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 +213,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 +226,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 +237,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 +254,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 +274,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 +291,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 +303,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 +319,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 +333,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 +350,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 +386,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 +396,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 +410,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 +421,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 +432,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 +441,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 +453,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 +463,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 +473,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 +488,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 +500,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 +515,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 +534,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 +549,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 +564,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 +577,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 +591,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 +607,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 +622,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 +636,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 +658,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 +672,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 +685,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 +703,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 +721,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 +732,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
@@ -713,4 +752,4 @@ 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
+endif #MEDIA_PLATFORM_DRIVERS
diff --git a/drivers/media/platform/am437x/Kconfig b/drivers/media/platform/am437x/Kconfig
index 9ef898f512de..619cefca7590 100644
--- a/drivers/media/platform/am437x/Kconfig
+++ b/drivers/media/platform/am437x/Kconfig
@@ -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
diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/atmel/Kconfig
index f83bee373d82..5122290729ae 100644
--- a/drivers/media/platform/atmel/Kconfig
+++ b/drivers/media/platform/atmel/Kconfig
@@ -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
diff --git a/drivers/media/platform/cadence/Kconfig b/drivers/media/platform/cadence/Kconfig
index 80cf601323ce..79a7e9fb2575 100644
--- a/drivers/media/platform/cadence/Kconfig
+++ b/drivers/media/platform/cadence/Kconfig
@@ -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.
diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/davinci/Kconfig
index 9d2a9eeb3499..7e5f92b0082a 100644
--- a/drivers/media/platform/davinci/Kconfig
+++ b/drivers/media/platform/davinci/Kconfig
@@ -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
diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/platform/exynos4-is/Kconfig
index 136d3b2a0fbb..868bb86c7699 100644
--- a/drivers/media/platform/exynos4-is/Kconfig
+++ b/drivers/media/platform/exynos4-is/Kconfig
@@ -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
diff --git a/drivers/media/platform/imx-jpeg/Kconfig b/drivers/media/platform/imx-jpeg/Kconfig
index 2fdd648cda80..cbf6101a8b1d 100644
--- a/drivers/media/platform/imx-jpeg/Kconfig
+++ b/drivers/media/platform/imx-jpeg/Kconfig
@@ -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
diff --git a/drivers/media/platform/imx/Kconfig b/drivers/media/platform/imx/Kconfig
index 683863572c20..7cd0617c9b1b 100644
--- a/drivers/media/platform/imx/Kconfig
+++ b/drivers/media/platform/imx/Kconfig
@@ -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
diff --git a/drivers/media/platform/marvell-ccic/Kconfig b/drivers/media/platform/marvell-ccic/Kconfig
index 3e3f86264762..bfe655b2cedd 100644
--- a/drivers/media/platform/marvell-ccic/Kconfig
+++ b/drivers/media/platform/marvell-ccic/Kconfig
@@ -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
diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/omap/Kconfig
index de16de46c0f4..789d5e5686c7 100644
--- a/drivers/media/platform/omap/Kconfig
+++ b/drivers/media/platform/omap/Kconfig
@@ -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
diff --git a/drivers/media/platform/rcar-vin/Kconfig b/drivers/media/platform/rcar-vin/Kconfig
index 030312d862e7..34b7ea6f1246 100644
--- a/drivers/media/platform/rcar-vin/Kconfig
+++ b/drivers/media/platform/rcar-vin/Kconfig
@@ -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
diff --git a/drivers/media/platform/sti/c8sectpfe/Kconfig b/drivers/media/platform/sti/c8sectpfe/Kconfig
index 369509e03071..702b910509c9 100644
--- a/drivers/media/platform/sti/c8sectpfe/Kconfig
+++ b/drivers/media/platform/sti/c8sectpfe/Kconfig
@@ -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
diff --git a/drivers/media/platform/sunxi/sun4i-csi/Kconfig b/drivers/media/platform/sunxi/sun4i-csi/Kconfig
index 903c6152f6e8..43ad2dd7da5d 100644
--- a/drivers/media/platform/sunxi/sun4i-csi/Kconfig
+++ b/drivers/media/platform/sunxi/sun4i-csi/Kconfig
@@ -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
diff --git a/drivers/media/platform/sunxi/sun6i-csi/Kconfig b/drivers/media/platform/sunxi/sun6i-csi/Kconfig
index 586e3fb3a80d..6d9cf1963c41 100644
--- a/drivers/media/platform/sunxi/sun6i-csi/Kconfig
+++ b/drivers/media/platform/sunxi/sun6i-csi/Kconfig
@@ -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
diff --git a/drivers/media/platform/xilinx/Kconfig b/drivers/media/platform/xilinx/Kconfig
index 44587dccacf1..a9531d5efd50 100644
--- a/drivers/media/platform/xilinx/Kconfig
+++ b/drivers/media/platform/xilinx/Kconfig
@@ -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
--
2.35.1
In order to better organize the platform/Kconfig, place
s3c-camif-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 2d2942e5187c..633fbc408b8c 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -66,6 +66,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"
@@ -81,21 +82,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
diff --git a/drivers/media/platform/s3c-camif/Kconfig b/drivers/media/platform/s3c-camif/Kconfig
new file mode 100644
index 000000000000..e8ef9e06dc1b
--- /dev/null
+++ b/drivers/media/platform/s3c-camif/Kconfig
@@ -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.
--
2.35.1
In order to better organize the platform/Kconfig, place
sun8i-di-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 460ad793b89b..37103f24979f 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -70,6 +70,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"
@@ -240,20 +241,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
diff --git a/drivers/media/platform/sunxi/sun8i-di/Kconfig b/drivers/media/platform/sunxi/sun8i-di/Kconfig
new file mode 100644
index 000000000000..8d762e664d45
--- /dev/null
+++ b/drivers/media/platform/sunxi/sun8i-di/Kconfig
@@ -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.
--
2.35.1
In order to better organize the platform/Kconfig, place
mtk-mdp-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 41162dcfafcc..00d77779ab0d 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -56,6 +56,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"
@@ -207,23 +208,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
diff --git a/drivers/media/platform/mtk-mdp/Kconfig b/drivers/media/platform/mtk-mdp/Kconfig
new file mode 100644
index 000000000000..0cc743165a1a
--- /dev/null
+++ b/drivers/media/platform/mtk-mdp/Kconfig
@@ -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.
--
2.35.1
In order to better organize the platform/Kconfig, place
ge2d-specific config stuff on a separate Kconfig file.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 103f3771fd29..da1fa4642bca 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -54,6 +54,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"
@@ -284,20 +285,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
diff --git a/drivers/media/platform/meson/ge2d/Kconfig b/drivers/media/platform/meson/ge2d/Kconfig
new file mode 100644
index 000000000000..8c3f3b1b6b05
--- /dev/null
+++ b/drivers/media/platform/meson/ge2d/Kconfig
@@ -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.
+
--
2.35.1
In order to cleanup the main platform media directory, move Intel
driver to its own directory.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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 | 1 +
drivers/media/platform/{ => intel}/pxa_camera.c | 0
5 files changed, 14 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%)
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index f5ef28d3e53c..efdb5fe592c6 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -104,16 +104,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"
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index e9f982eb034b..c290835885de 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -16,6 +16,7 @@ obj-y += exynos4-is/
obj-y += exynos-gsc/
obj-y += imx/
obj-y += imx-jpeg/
+obj-y += intel/
obj-y += marvell-ccic/
obj-y += meson/ge2d/
obj-y += mtk-jpeg/
@@ -48,7 +49,6 @@ obj-y += xilinx/
# Please place here only ancillary drivers that aren't SoC-specific
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
diff --git a/drivers/media/platform/intel/Kconfig b/drivers/media/platform/intel/Kconfig
new file mode 100644
index 000000000000..aeda421f7248
--- /dev/null
+++ b/drivers/media/platform/intel/Kconfig
@@ -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
diff --git a/drivers/media/platform/intel/Makefile b/drivers/media/platform/intel/Makefile
new file mode 100644
index 000000000000..10ea23fb2bcc
--- /dev/null
+++ b/drivers/media/platform/intel/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o
diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/intel/pxa_camera.c
similarity index 100%
rename from drivers/media/platform/pxa_camera.c
rename to drivers/media/platform/intel/pxa_camera.c
--
2.35.1
This is the only tuner driver that has "tuner-" on its name.
Rename it, in order to match all the other tuner drivers.
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
See [PATCH v2 00/38] 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%)
diff --git a/Documentation/admin-guide/media/i2c-cardlist.rst b/Documentation/admin-guide/media/i2c-cardlist.rst
index db17f39b56cf..ef3b5fff3b01 100644
--- a/Documentation/admin-guide/media/i2c-cardlist.rst
+++ b/Documentation/admin-guide/media/i2c-cardlist.rst
@@ -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
============ ==================================================
diff --git a/MAINTAINERS b/MAINTAINERS
index ae55cd558d95..1a9fb0615925 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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]>
diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
index 1be9672ae9d4..84260972c343 100644
--- a/drivers/media/pci/cx18/cx18-driver.c
+++ b/drivers/media/pci/cx18/cx18-driver.c
@@ -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>
diff --git a/drivers/media/pci/cx18/cx18-dvb.c b/drivers/media/pci/cx18/cx18-dvb.c
index 4c57a294b9fa..33e5a5b5fab4 100644
--- a/drivers/media/pci/cx18/cx18-dvb.c
+++ b/drivers/media/pci/cx18/cx18-dvb.c
@@ -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);
diff --git a/drivers/media/pci/cx18/cx18-gpio.c b/drivers/media/pci/cx18/cx18-gpio.c
index cf7cfda94107..160c8377e352 100644
--- a/drivers/media/pci/cx18/cx18-gpio.c
+++ b/drivers/media/pci/cx18/cx18-gpio.c
@@ -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 *********************/
diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index 0160f909f38c..9244b4320558 100644
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -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"
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 45c2f4afceb8..8fd5b6ef2428 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -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"
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c
index a380e0920a21..3d03f5e95786 100644
--- a/drivers/media/pci/cx23885/cx23885-video.c
+++ b/drivers/media/pci/cx23885/cx23885-video.c
@@ -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>
diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h
index ce4acf6de6aa..2ff3226a52ec 100644
--- a/drivers/media/pci/cx88/cx88.h
+++ b/drivers/media/pci/cx88/cx88.h
@@ -28,7 +28,7 @@
#include <media/i2c/wm8775.h>
#include "cx88-reg.h"
-#include "tuner-xc2028.h"
+#include "xc2028.h"
#include <linux/mutex.h>
diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
index 57d4d5485d7a..f5846c22c799 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.c
+++ b/drivers/media/pci/ivtv/ivtv-driver.c
@@ -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
diff --git a/drivers/media/pci/ivtv/ivtv-gpio.c b/drivers/media/pci/ivtv/ivtv-gpio.c
index 856e7ab7f33e..6434c0d03a6d 100644
--- a/drivers/media/pci/ivtv/ivtv-gpio.c
+++ b/drivers/media/pci/ivtv/ivtv-gpio.c
@@ -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>
diff --git a/drivers/media/pci/saa7134/saa7134-cards.c b/drivers/media/pci/saa7134/saa7134-cards.c
index 0d82a4b27d5b..99be59af3560 100644
--- a/drivers/media/pci/saa7134/saa7134-cards.c
+++ b/drivers/media/pci/saa7134/saa7134-cards.c
@@ -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"
diff --git a/drivers/media/pci/saa7134/saa7134-dvb.c b/drivers/media/pci/saa7134/saa7134-dvb.c
index d17a1b15faee..9c6cfef03331 100644
--- a/drivers/media/pci/saa7134/saa7134-dvb.c
+++ b/drivers/media/pci/saa7134/saa7134-dvb.c
@@ -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"
diff --git a/drivers/media/tuners/Makefile b/drivers/media/tuners/Makefile
index 7b4f8423501e..abcad519a4f9 100644
--- a/drivers/media/tuners/Makefile
+++ b/drivers/media/tuners/Makefile
@@ -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
diff --git a/drivers/media/tuners/tuner-types.c b/drivers/media/tuners/tuner-types.c
index 0ed2c5bc082e..ff5a6c0acdd4 100644
--- a/drivers/media/tuners/tuner-types.c
+++ b/drivers/media/tuners/tuner-types.c
@@ -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",
diff --git a/drivers/media/tuners/tuner-xc2028-types.h b/drivers/media/tuners/xc2028-types.h
similarity index 96%
rename from drivers/media/tuners/tuner-xc2028-types.h
rename to drivers/media/tuners/xc2028-types.h
index fcca39d3e006..63a03de1e97b 100644
--- a/drivers/media/tuners/tuner-xc2028-types.h
+++ b/drivers/media/tuners/xc2028-types.h
@@ -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]>
*/
diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/xc2028.c
similarity index 99%
rename from drivers/media/tuners/tuner-xc2028.c
rename to drivers/media/tuners/xc2028.c
index 574c3bb135d7..69c2e1b99bf1 100644
--- a/drivers/media/tuners/tuner-xc2028.c
+++ b/drivers/media/tuners/xc2028.c
@@ -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>
diff --git a/drivers/media/tuners/tuner-xc2028.h b/drivers/media/tuners/xc2028.h
similarity index 99%
rename from drivers/media/tuners/tuner-xc2028.h
rename to drivers/media/tuners/xc2028.h
index 2dd45d0765d7..072faae7a954 100644
--- a/drivers/media/tuners/tuner-xc2028.h
+++ b/drivers/media/tuners/xc2028.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * tuner-xc2028
+ * xc2028
*
* Copyright (c) 2007-2008 Mauro Carvalho Chehab <[email protected]>
*/
diff --git a/drivers/media/tuners/xc4000.c b/drivers/media/tuners/xc4000.c
index d9606738ce43..a04dfd5799f7 100644
--- a/drivers/media/tuners/xc4000.c
+++ b/drivers/media/tuners/xc4000.c
@@ -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);
diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
index 7707de7bae7c..265b960db499 100644
--- a/drivers/media/usb/dvb-usb/cxusb.c
+++ b/drivers/media/usb/dvb-usb/cxusb.c
@@ -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"
diff --git a/drivers/media/usb/dvb-usb/dib0700_devices.c b/drivers/media/usb/dvb-usb/dib0700_devices.c
index 710c1afe3e85..08fcf120daf1 100644
--- a/drivers/media/usb/dvb-usb/dib0700_devices.c
+++ b/drivers/media/usb/dvb-usb/dib0700_devices.c
@@ -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"
diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c
index 255395959255..b9a8d3fbad1a 100644
--- a/drivers/media/usb/em28xx/em28xx-i2c.c
+++ b/drivers/media/usb/em28xx/em28xx-i2c.c
@@ -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>
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index ab167cd1f400..7fc0b68a4a22 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -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"
diff --git a/drivers/media/usb/tm6000/tm6000-cards.c b/drivers/media/usb/tm6000/tm6000-cards.c
index 5358cd8c4603..98f4a63adc2a 100644
--- a/drivers/media/usb/tm6000/tm6000-cards.c
+++ b/drivers/media/usb/tm6000/tm6000-cards.c
@@ -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
diff --git a/drivers/media/usb/tm6000/tm6000-dvb.c b/drivers/media/usb/tm6000/tm6000-dvb.c
index 4990fa886d7a..8c2725e4105b 100644
--- a/drivers/media/usb/tm6000/tm6000-dvb.c
+++ b/drivers/media/usb/tm6000/tm6000-dvb.c
@@ -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");
diff --git a/drivers/media/usb/tm6000/tm6000-i2c.c b/drivers/media/usb/tm6000/tm6000-i2c.c
index b37782d6f79c..7554b93b82e6 100644
--- a/drivers/media/usb/tm6000/tm6000-i2c.c
+++ b/drivers/media/usb/tm6000/tm6000-i2c.c
@@ -15,7 +15,7 @@
#include "tm6000-regs.h"
#include <media/v4l2-common.h>
#include <media/tuner.h>
-#include "tuner-xc2028.h"
+#include "xc2028.h"
/* ----------------------------------------------------------- */
diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c
index 12d1e0c33c3c..ad9224a18853 100644
--- a/drivers/media/v4l2-core/tuner-core.c
+++ b/drivers/media/v4l2-core/tuner-core.c
@@ -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"
--
2.35.1
Dne petek, 11. marec 2022 ob 15:07:18 CET je Mauro Carvalho Chehab napisal(a):
> 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.
>
> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
> ---
>
> To avoid mailbombing on a large number of people, only mailing lists were C/
C on the cover.
> See [PATCH v2 00/38] at: https://lore.kernel.org/all/cover.
[email protected]/
>
> drivers/media/platform/Kconfig | 127 ++++++++++++------
> 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 +
Acked-by: Jernej Skrabec <[email protected]>
Best regards,
Jernej
> drivers/media/platform/xilinx/Kconfig | 1 +
> 15 files changed, 107 insertions(+), 44 deletions(-)
>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index 4843fabb8bb2..1cb73f09d0b5 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -3,17 +3,46 @@
> # Platform drivers
> # Most drivers here are currently for webcam support
>
> -menuconfig V4L_PLATFORM_DRIVERS
> +menuconfig MEDIA_PLATFORM_DRIVERS
> + bool "Media platform devices"
> + 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
> 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 +51,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 +59,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 +69,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 +78,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 +91,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 +103,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
> @@ -87,12 +118,14 @@ config VIDEO_OMAP3
>
> config VIDEO_OMAP3_DEBUG
> bool "OMAP 3 Camera debug messages"
> + depends on V4L_PLATFORM_DRIVERS
> depends on VIDEO_OMAP3
> 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
> @@ -103,6 +136,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 +146,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 +161,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 +176,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 +186,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 +213,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 +226,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 +237,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 +254,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 +274,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 +291,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 +303,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 +319,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 +333,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 +350,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 +386,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 +396,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 +410,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 +421,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 +432,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 +441,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 +453,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 +463,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 +473,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 +488,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 +500,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 +515,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 +534,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 +549,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 +564,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 +577,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 +591,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 +607,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 +622,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 +636,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 +658,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 +672,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 +685,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 +703,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 +721,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 +732,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
> @@ -713,4 +752,4 @@ 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
> +endif #MEDIA_PLATFORM_DRIVERS
> diff --git a/drivers/media/platform/am437x/Kconfig b/drivers/media/platform/
am437x/Kconfig
> index 9ef898f512de..619cefca7590 100644
> --- a/drivers/media/platform/am437x/Kconfig
> +++ b/drivers/media/platform/am437x/Kconfig
> @@ -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
> diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/
atmel/Kconfig
> index f83bee373d82..5122290729ae 100644
> --- a/drivers/media/platform/atmel/Kconfig
> +++ b/drivers/media/platform/atmel/Kconfig
> @@ -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
> diff --git a/drivers/media/platform/cadence/Kconfig b/drivers/media/platform/
cadence/Kconfig
> index 80cf601323ce..79a7e9fb2575 100644
> --- a/drivers/media/platform/cadence/Kconfig
> +++ b/drivers/media/platform/cadence/Kconfig
> @@ -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.
>
> diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/
davinci/Kconfig
> index 9d2a9eeb3499..7e5f92b0082a 100644
> --- a/drivers/media/platform/davinci/Kconfig
> +++ b/drivers/media/platform/davinci/Kconfig
> @@ -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
> diff --git a/drivers/media/platform/exynos4-is/Kconfig b/drivers/media/
platform/exynos4-is/Kconfig
> index 136d3b2a0fbb..868bb86c7699 100644
> --- a/drivers/media/platform/exynos4-is/Kconfig
> +++ b/drivers/media/platform/exynos4-is/Kconfig
> @@ -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
> diff --git a/drivers/media/platform/imx-jpeg/Kconfig b/drivers/media/platform/
imx-jpeg/Kconfig
> index 2fdd648cda80..cbf6101a8b1d 100644
> --- a/drivers/media/platform/imx-jpeg/Kconfig
> +++ b/drivers/media/platform/imx-jpeg/Kconfig
> @@ -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
> diff --git a/drivers/media/platform/imx/Kconfig b/drivers/media/platform/imx/
Kconfig
> index 683863572c20..7cd0617c9b1b 100644
> --- a/drivers/media/platform/imx/Kconfig
> +++ b/drivers/media/platform/imx/Kconfig
> @@ -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
> diff --git a/drivers/media/platform/marvell-ccic/Kconfig b/drivers/media/
platform/marvell-ccic/Kconfig
> index 3e3f86264762..bfe655b2cedd 100644
> --- a/drivers/media/platform/marvell-ccic/Kconfig
> +++ b/drivers/media/platform/marvell-ccic/Kconfig
> @@ -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
> diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/
omap/Kconfig
> index de16de46c0f4..789d5e5686c7 100644
> --- a/drivers/media/platform/omap/Kconfig
> +++ b/drivers/media/platform/omap/Kconfig
> @@ -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
> diff --git a/drivers/media/platform/rcar-vin/Kconfig b/drivers/media/platform/
rcar-vin/Kconfig
> index 030312d862e7..34b7ea6f1246 100644
> --- a/drivers/media/platform/rcar-vin/Kconfig
> +++ b/drivers/media/platform/rcar-vin/Kconfig
> @@ -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
> diff --git a/drivers/media/platform/sti/c8sectpfe/Kconfig b/drivers/media/
platform/sti/c8sectpfe/Kconfig
> index 369509e03071..702b910509c9 100644
> --- a/drivers/media/platform/sti/c8sectpfe/Kconfig
> +++ b/drivers/media/platform/sti/c8sectpfe/Kconfig
> @@ -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
> diff --git a/drivers/media/platform/sunxi/sun4i-csi/Kconfig b/drivers/media/
platform/sunxi/sun4i-csi/Kconfig
> index 903c6152f6e8..43ad2dd7da5d 100644
> --- a/drivers/media/platform/sunxi/sun4i-csi/Kconfig
> +++ b/drivers/media/platform/sunxi/sun4i-csi/Kconfig
> @@ -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
> diff --git a/drivers/media/platform/sunxi/sun6i-csi/Kconfig b/drivers/media/
platform/sunxi/sun6i-csi/Kconfig
> index 586e3fb3a80d..6d9cf1963c41 100644
> --- a/drivers/media/platform/sunxi/sun6i-csi/Kconfig
> +++ b/drivers/media/platform/sunxi/sun6i-csi/Kconfig
> @@ -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
> diff --git a/drivers/media/platform/xilinx/Kconfig b/drivers/media/platform/
xilinx/Kconfig
> index 44587dccacf1..a9531d5efd50 100644
> --- a/drivers/media/platform/xilinx/Kconfig
> +++ b/drivers/media/platform/xilinx/Kconfig
> @@ -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
> --
> 2.35.1
>
>
Dne petek, 11. marec 2022 ob 15:07:41 CET je Mauro Carvalho Chehab napisal(a):
> In order to better organize the platform/Kconfig, place
> sun8i-di-specific config stuff on a separate Kconfig file.
>
> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
> ---
Acked-by: Jernej Skrabec <[email protected]>
Best regards,
Jernej
>
> 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.
[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
>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index 460ad793b89b..37103f24979f 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -70,6 +70,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"
> @@ -240,20 +241,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
> diff --git a/drivers/media/platform/sunxi/sun8i-di/Kconfig b/drivers/media/
platform/sunxi/sun8i-di/Kconfig
> new file mode 100644
> index 000000000000..8d762e664d45
> --- /dev/null
> +++ b/drivers/media/platform/sunxi/sun8i-di/Kconfig
> @@ -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.
> --
> 2.35.1
>
>
On Fri, 11 Mar 2022 at 15:09, Mauro Carvalho Chehab <[email protected]> wrote:
>
> In order to better organize the platform/Kconfig, place
> camss-specific config stuff on a separate Kconfig file.
>
> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
> ---
>
> To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover.
> See [PATCH v2 00/38] 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
>
> diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
> index f65eefa15dda..19ca01d2f841 100644
> --- a/drivers/media/platform/Kconfig
> +++ b/drivers/media/platform/Kconfig
> @@ -61,6 +61,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"
>
> @@ -78,16 +79,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
> diff --git a/drivers/media/platform/qcom/camss/Kconfig b/drivers/media/platform/qcom/camss/Kconfig
> new file mode 100644
> index 000000000000..56be91578706
> --- /dev/null
> +++ b/drivers/media/platform/qcom/camss/Kconfig
> @@ -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
> --
> 2.35.1
>
Reviewed-by: Robert Foss <[email protected]>