Commit 256bf685 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: platform: move platform menu dependencies to drivers

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.
Acked-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent f7fb2414
This diff is collapsed.
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config VIDEO_AM437X_VPFE config VIDEO_AM437X_VPFE
tristate "TI AM437x VPFE video capture driver" tristate "TI AM437x VPFE video capture driver"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 depends on VIDEO_V4L2
depends on SOC_AM43XX || COMPILE_TEST depends on SOC_AM43XX || COMPILE_TEST
select MEDIA_CONTROLLER select MEDIA_CONTROLLER
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config VIDEO_ATMEL_ISC config VIDEO_ATMEL_ISC
tristate "ATMEL Image Sensor Controller (ISC) support" tristate "ATMEL Image Sensor Controller (ISC) support"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && COMMON_CLK depends on VIDEO_V4L2 && COMMON_CLK
depends on ARCH_AT91 || COMPILE_TEST depends on ARCH_AT91 || COMPILE_TEST
select MEDIA_CONTROLLER select MEDIA_CONTROLLER
...@@ -15,6 +16,7 @@ config VIDEO_ATMEL_ISC ...@@ -15,6 +16,7 @@ config VIDEO_ATMEL_ISC
config VIDEO_ATMEL_XISC config VIDEO_ATMEL_XISC
tristate "ATMEL eXtended Image Sensor Controller (XISC) support" 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 VIDEO_V4L2 && COMMON_CLK && VIDEO_V4L2_SUBDEV_API
depends on ARCH_AT91 || COMPILE_TEST depends on ARCH_AT91 || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG select VIDEOBUF2_DMA_CONTIG
...@@ -33,6 +35,7 @@ config VIDEO_ATMEL_ISC_BASE ...@@ -33,6 +35,7 @@ config VIDEO_ATMEL_ISC_BASE
config VIDEO_ATMEL_ISI config VIDEO_ATMEL_ISI
tristate "ATMEL Image Sensor Interface (ISI) support" tristate "ATMEL Image Sensor Interface (ISI) support"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && OF depends on VIDEO_V4L2 && OF
depends on ARCH_AT91 || COMPILE_TEST depends on ARCH_AT91 || COMPILE_TEST
select VIDEOBUF2_DMA_CONTIG select VIDEOBUF2_DMA_CONTIG
...@@ -43,6 +46,7 @@ config VIDEO_ATMEL_ISI ...@@ -43,6 +46,7 @@ config VIDEO_ATMEL_ISI
config VIDEO_MICROCHIP_CSI2DC config VIDEO_MICROCHIP_CSI2DC
tristate "Microchip CSI2 Demux Controller" tristate "Microchip CSI2 Demux Controller"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && COMMON_CLK && OF depends on VIDEO_V4L2 && COMMON_CLK && OF
depends on ARCH_AT91 || COMPILE_TEST depends on ARCH_AT91 || COMPILE_TEST
select MEDIA_CONTROLLER select MEDIA_CONTROLLER
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config VIDEO_CADENCE config VIDEO_CADENCE
bool "Cadence Video Devices" bool "Cadence Video Devices"
depends on V4L_PLATFORM_DRIVERS
help help
If you have a media device designed by Cadence, say Y. If you have a media device designed by Cadence, say Y.
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config VIDEO_DAVINCI_VPIF_DISPLAY config VIDEO_DAVINCI_VPIF_DISPLAY
tristate "TI DaVinci VPIF V4L2-Display driver" tristate "TI DaVinci VPIF V4L2-Display driver"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 depends on VIDEO_V4L2
depends on ARCH_DAVINCI || COMPILE_TEST depends on ARCH_DAVINCI || COMPILE_TEST
depends on I2C depends on I2C
...@@ -17,6 +18,7 @@ config VIDEO_DAVINCI_VPIF_DISPLAY ...@@ -17,6 +18,7 @@ config VIDEO_DAVINCI_VPIF_DISPLAY
config VIDEO_DAVINCI_VPIF_CAPTURE config VIDEO_DAVINCI_VPIF_CAPTURE
tristate "TI DaVinci VPIF video capture driver" tristate "TI DaVinci VPIF video capture driver"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 depends on VIDEO_V4L2
depends on ARCH_DAVINCI || COMPILE_TEST depends on ARCH_DAVINCI || COMPILE_TEST
depends on I2C depends on I2C
...@@ -32,6 +34,7 @@ config VIDEO_DAVINCI_VPIF_CAPTURE ...@@ -32,6 +34,7 @@ config VIDEO_DAVINCI_VPIF_CAPTURE
config VIDEO_DM6446_CCDC config VIDEO_DM6446_CCDC
tristate "TI DM6446 CCDC video capture driver" tristate "TI DM6446 CCDC video capture driver"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 depends on VIDEO_V4L2
depends on ARCH_DAVINCI || COMPILE_TEST depends on ARCH_DAVINCI || COMPILE_TEST
depends on I2C depends on I2C
...@@ -48,6 +51,7 @@ config VIDEO_DM6446_CCDC ...@@ -48,6 +51,7 @@ config VIDEO_DM6446_CCDC
config VIDEO_DM355_CCDC config VIDEO_DM355_CCDC
tristate "TI DM355 CCDC video capture driver" tristate "TI DM355 CCDC video capture driver"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 depends on VIDEO_V4L2
depends on ARCH_DAVINCI || COMPILE_TEST depends on ARCH_DAVINCI || COMPILE_TEST
depends on I2C depends on I2C
...@@ -64,6 +68,7 @@ config VIDEO_DM355_CCDC ...@@ -64,6 +68,7 @@ config VIDEO_DM355_CCDC
config VIDEO_DM365_ISIF config VIDEO_DM365_ISIF
tristate "TI DM365 ISIF video capture driver" tristate "TI DM365 ISIF video capture driver"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 depends on VIDEO_V4L2
depends on ARCH_DAVINCI || COMPILE_TEST depends on ARCH_DAVINCI || COMPILE_TEST
depends on I2C depends on I2C
...@@ -78,6 +83,7 @@ config VIDEO_DM365_ISIF ...@@ -78,6 +83,7 @@ config VIDEO_DM365_ISIF
config VIDEO_DAVINCI_VPBE_DISPLAY config VIDEO_DAVINCI_VPBE_DISPLAY
tristate "TI DaVinci VPBE V4L2-Display driver" tristate "TI DaVinci VPBE V4L2-Display driver"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 depends on VIDEO_V4L2
depends on ARCH_DAVINCI || COMPILE_TEST depends on ARCH_DAVINCI || COMPILE_TEST
depends on I2C depends on I2C
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
config VIDEO_SAMSUNG_EXYNOS4_IS config VIDEO_SAMSUNG_EXYNOS4_IS
tristate "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver" tristate "Samsung S5P/EXYNOS4 SoC series Camera Subsystem driver"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && OF && COMMON_CLK depends on VIDEO_V4L2 && OF && COMMON_CLK
depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
select MEDIA_CONTROLLER select MEDIA_CONTROLLER
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
config VIDEO_IMX8_JPEG config VIDEO_IMX8_JPEG
tristate "IMX8 JPEG Encoder/Decoder" tristate "IMX8 JPEG Encoder/Decoder"
depends on V4L_MEM2MEM_DRIVERS
depends on ARCH_MXC || COMPILE_TEST depends on ARCH_MXC || COMPILE_TEST
depends on VIDEO_DEV && VIDEO_V4L2 depends on VIDEO_DEV && VIDEO_V4L2
select VIDEOBUF2_DMA_CONTIG select VIDEOBUF2_DMA_CONTIG
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
menuconfig VIDEO_IMX menuconfig VIDEO_IMX
bool "V4L2 capture drivers for NXP i.MX devices" bool "V4L2 capture drivers for NXP i.MX devices"
depends on V4L_PLATFORM_DRIVERS
depends on ARCH_MXC || COMPILE_TEST depends on ARCH_MXC || COMPILE_TEST
depends on VIDEO_DEV && VIDEO_V4L2 depends on VIDEO_DEV && VIDEO_V4L2
help help
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config VIDEO_CAFE_CCIC config VIDEO_CAFE_CCIC
tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support" tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"
depends on V4L_PLATFORM_DRIVERS
depends on PCI && I2C && VIDEO_V4L2 depends on PCI && I2C && VIDEO_V4L2
depends on COMMON_CLK depends on COMMON_CLK
select VIDEO_OV7670 select VIDEO_OV7670
...@@ -14,6 +15,7 @@ config VIDEO_CAFE_CCIC ...@@ -14,6 +15,7 @@ config VIDEO_CAFE_CCIC
config VIDEO_MMP_CAMERA config VIDEO_MMP_CAMERA
tristate "Marvell Armada 610 integrated camera controller support" tristate "Marvell Armada 610 integrated camera controller support"
depends on V4L_PLATFORM_DRIVERS
depends on I2C && VIDEO_V4L2 depends on I2C && VIDEO_V4L2
depends on ARCH_MMP || COMPILE_TEST depends on ARCH_MMP || COMPILE_TEST
depends on COMMON_CLK depends on COMMON_CLK
......
...@@ -6,6 +6,7 @@ config VIDEO_OMAP2_VOUT_VRFB ...@@ -6,6 +6,7 @@ config VIDEO_OMAP2_VOUT_VRFB
config VIDEO_OMAP2_VOUT config VIDEO_OMAP2_VOUT
tristate "OMAP2/OMAP3 V4L2-Display driver" tristate "OMAP2/OMAP3 V4L2-Display driver"
depends on V4L_PLATFORM_DRIVERS
depends on MMU depends on MMU
depends on FB_OMAP2 || (COMPILE_TEST && FB_OMAP2=n) depends on FB_OMAP2 || (COMPILE_TEST && FB_OMAP2=n)
depends on ARCH_OMAP2 || ARCH_OMAP3 || COMPILE_TEST depends on ARCH_OMAP2 || ARCH_OMAP3 || COMPILE_TEST
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
config VIDEO_RCAR_CSI2 config VIDEO_RCAR_CSI2
tristate "R-Car MIPI CSI-2 Receiver" tristate "R-Car MIPI CSI-2 Receiver"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && OF depends on VIDEO_V4L2 && OF
depends on ARCH_RENESAS || COMPILE_TEST depends on ARCH_RENESAS || COMPILE_TEST
select MEDIA_CONTROLLER select MEDIA_CONTROLLER
...@@ -16,6 +17,7 @@ config VIDEO_RCAR_CSI2 ...@@ -16,6 +17,7 @@ config VIDEO_RCAR_CSI2
config VIDEO_RCAR_VIN config VIDEO_RCAR_VIN
tristate "R-Car Video Input (VIN) Driver" tristate "R-Car Video Input (VIN) Driver"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && OF depends on VIDEO_V4L2 && OF
depends on ARCH_RENESAS || COMPILE_TEST depends on ARCH_RENESAS || COMPILE_TEST
select MEDIA_CONTROLLER select MEDIA_CONTROLLER
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config DVB_C8SECTPFE config DVB_C8SECTPFE
tristate "STMicroelectronics C8SECTPFE DVB support" tristate "STMicroelectronics C8SECTPFE DVB support"
depends on DVB_PLATFORM_DRIVERS
depends on PINCTRL && DVB_CORE && I2C depends on PINCTRL && DVB_CORE && I2C
depends on ARCH_STI || ARCH_MULTIPLATFORM || COMPILE_TEST depends on ARCH_STI || ARCH_MULTIPLATFORM || COMPILE_TEST
select FW_LOADER select FW_LOADER
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
config VIDEO_SUN4I_CSI config VIDEO_SUN4I_CSI
tristate "Allwinner A10 CMOS Sensor Interface Support" tristate "Allwinner A10 CMOS Sensor Interface Support"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && COMMON_CLK && HAS_DMA depends on VIDEO_V4L2 && COMMON_CLK && HAS_DMA
depends on ARCH_SUNXI || COMPILE_TEST depends on ARCH_SUNXI || COMPILE_TEST
select MEDIA_CONTROLLER select MEDIA_CONTROLLER
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config VIDEO_SUN6I_CSI config VIDEO_SUN6I_CSI
tristate "Allwinner V3s Camera Sensor Interface driver" tristate "Allwinner V3s Camera Sensor Interface driver"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && COMMON_CLK && HAS_DMA depends on VIDEO_V4L2 && COMMON_CLK && HAS_DMA
depends on ARCH_SUNXI || COMPILE_TEST depends on ARCH_SUNXI || COMPILE_TEST
select MEDIA_CONTROLLER select MEDIA_CONTROLLER
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
config VIDEO_XILINX config VIDEO_XILINX
tristate "Xilinx Video IP (EXPERIMENTAL)" tristate "Xilinx Video IP (EXPERIMENTAL)"
depends on V4L_PLATFORM_DRIVERS
depends on VIDEO_V4L2 && OF && HAS_DMA depends on VIDEO_V4L2 && OF && HAS_DMA
select MEDIA_CONTROLLER select MEDIA_CONTROLLER
select VIDEO_V4L2_SUBDEV_API select VIDEO_V4L2_SUBDEV_API
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment