drivers/media/video/Kconfig: add VIDEO_DEV dependency as needed in drivers/media/video/Kconfig
PATCH 3/7 drivers/media/video/Kconfig: add VIDEO_DEV dependency as needed in drivers/media/video/Kconfig
From: Mike Pagano <[email protected]>
Add VIDEO_DEV as dependency of VIDEO_CAPTURE_DRIVERS and all of the devices listed under this setting.
---
drivers/media/video/Kconfig | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/media/video/Kconfig renamed from drivers/media/video/Kconfig~drivers-media-video-kconfig-add-video_dev-dependency-as-needed-in-drivers-media-video-kconfig +10 -10
@@ -51,14 +51,14 @@ config VIDEO_TUNER menuconfig VIDEO_CAPTURE_DRIVERS bool "Video capture adapters" - depends on VIDEO_V4L2 + depends on VIDEO_V4L2 && VIDEO_DEV default y ---help--- Say Y here to enable selecting the video adapters for webcams, analog TV, and hybrid analog/digital TV. Some of those devices also supports FM radio. -if VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2 +if VIDEO_DEV && VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2 config VIDEO_ADV_DEBUG bool "Enable advanced debug functionality"
@@ -500,7 +500,7 @@ endmenu # encoder / decoder chips config DISPLAY_DAVINCI_DM646X_EVM tristate "DM646x EVM Video Display" - depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM + depends on MACH_DAVINCI_DM6467_EVM select VIDEOBUF_DMA_CONTIG select VIDEO_DAVINCI_VPIF select VIDEO_ADV7343
@@ -513,7 +513,7 @@ config DISPLAY_DAVINCI_DM646X_EVM config CAPTURE_DAVINCI_DM646X_EVM tristate "DM646x EVM Video Capture" - depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM + depends on MACH_DAVINCI_DM6467_EVM select VIDEOBUF_DMA_CONTIG select VIDEO_DAVINCI_VPIF help
@@ -533,7 +533,7 @@ config VIDEO_DAVINCI_VPIF config VIDEO_VIVI tristate "Virtual Video Driver" - depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 + depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 select VIDEOBUF_VMALLOC default n ---help---
@@ -889,7 +889,7 @@ config MX1_VIDEO config VIDEO_MX1 tristate "i.MX1/i.MXL CMOS Sensor Interface driver" - depends on VIDEO_DEV && ARCH_MX1 && SOC_CAMERA + depends on ARCH_MX1 && SOC_CAMERA select FIQ select VIDEOBUF_DMA_CONTIG select MX1_VIDEO
@@ -901,7 +901,7 @@ config MX3_VIDEO config VIDEO_MX3 tristate "i.MX3x Camera Sensor Interface driver" - depends on VIDEO_DEV && MX3_IPU && SOC_CAMERA + depends on MX3_IPU && SOC_CAMERA select VIDEOBUF_DMA_CONTIG select MX3_VIDEO ---help---
@@ -909,21 +909,21 @@ config VIDEO_MX3 config VIDEO_PXA27x tristate "PXA27x Quick Capture Interface driver" - depends on VIDEO_DEV && PXA27x && SOC_CAMERA + depends on PXA27x && SOC_CAMERA select VIDEOBUF_DMA_SG ---help--- This is a v4l2 driver for the PXA27x Quick Capture Interface config VIDEO_SH_MOBILE_CEU tristate "SuperH Mobile CEU Interface driver" - depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK + depends on SOC_CAMERA && HAS_DMA && HAVE_CLK select VIDEOBUF_DMA_CONTIG ---help--- This is a v4l2 driver for the SuperH Mobile CEU Interface config VIDEO_OMAP2 tristate "OMAP2 Camera Capture Interface driver" - depends on VIDEO_DEV && ARCH_OMAP2 + depends on ARCH_OMAP2 select VIDEOBUF_DMA_SG ---help--- This is a v4l2 driver for the TI OMAP2 camera capture interface
_
Quoted 17 lines · [email protected] wrote:
From: Mike Pagano <[email protected]>
Add
VIDEO_DEVas dependency ofVIDEO_CAPTURE_DRIVERSand all of the devices listed under this setting.Signed-off-by Mike Pagano <[email protected]>Cc Mauro Carvalho Chehab <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
drivers/media/video/Kconfig | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)diff -puN
drivers/media/video/Kconfig~drivers-media-video-kconfig-add-video_dev-dependency-as-needed-in-drivers-media-video-kconfigdrivers/media/video/Kconfig
drivers/media/video/Kconfig config VIDEO_TUNER · line 54
Quoted 5 lines
drivers/media/video/Kconfig renamed from drivers/media/video/Kconfig~drivers-media-video-kconfig-add-video_dev-dependency-as-needed-in-drivers-media-video-kconfig +1
-1@@ -51,14 +51,14 @@ config VIDEO_TUNER menuconfig VIDEO_CAPTURE_DRIVERS bool "Video capture adapters" - depends on VIDEO_V4L2 + depends on VIDEO_V4L2 && VIDEO_DEV
VIDEO_V4L2 is defined as:
config VIDEO_V4L2_COMMON
tristate
depends on (I2C || I2C=n) && VIDEO_DEV
default (I2C || I2C=n) && VIDEO_DEVconfig VIDEO_V4L2
tristate
depends on VIDEO_DEV && VIDEO_V4L2_COMMON
default VIDEO_DEV && VIDEO_V4L2_COMMONAs VIDEO_V4L2 already depends on VIDEO_DEV, there's no need to add VIDEO_DEV for VIDEO_CAPTURE_DRIVERS.
drivers/media/video/Kconfig config VIDEO_TUNER · line 61
Quoted 8 lines
drivers/media/video/Kconfig renamed from drivers/media/video/Kconfig~drivers-media-video-kconfig-add-video_dev-dependency-as-needed-in-drivers-media-video-kconfig +1
-1default y ---help--- Say Y here to enable selecting the video adapters for webcams, analog TV, and hybrid analog/digital TV. Some of those devices also supports FM radio. -if VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2 +if VIDEO_DEV && VIDEO_CAPTURE_DRIVERS && VIDEO_V4L2
Idem.
Quoted 62 lines
drivers/media/video/Kconfig renamed from drivers/media/video/Kconfig~drivers-media-video-kconfig-add-video_dev-dependency-as-needed-in-drivers-media-video-kconfig +7
-7config VIDEO_ADV_DEBUG bool "Enable advanced debug functionality"@@ -500,7 +500,7 @@ endmenu # encoder / decoder chips config DISPLAY_DAVINCI_DM646X_EVM tristate "DM646x EVM Video Display" - depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM + depends on MACH_DAVINCI_DM6467_EVM select VIDEOBUF_DMA_CONTIG select VIDEO_DAVINCI_VPIF select VIDEO_ADV7343@@ -513,7 +513,7 @@ config DISPLAY_DAVINCI_DM646X_EVM config CAPTURE_DAVINCI_DM646X_EVM tristate "DM646x EVM Video Capture" - depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM + depends on MACH_DAVINCI_DM6467_EVM select VIDEOBUF_DMA_CONTIG select VIDEO_DAVINCI_VPIF help@@ -533,7 +533,7 @@ config VIDEO_DAVINCI_VPIF config VIDEO_VIVI tristate "Virtual Video Driver" - depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 + depends on VIDEO_V4L2 && !SPARC32 && !SPARC64 select VIDEOBUF_VMALLOC default n ---help---@@ -889,7 +889,7 @@ config MX1_VIDEO config VIDEO_MX1 tristate "i.MX1/i.MXL CMOS Sensor Interface driver" - depends on VIDEO_DEV && ARCH_MX1 && SOC_CAMERA + depends on ARCH_MX1 && SOC_CAMERA select FIQ select VIDEOBUF_DMA_CONTIG select MX1_VIDEO@@ -901,7 +901,7 @@ config MX3_VIDEO config VIDEO_MX3 tristate "i.MX3x Camera Sensor Interface driver" - depends on VIDEO_DEV && MX3_IPU && SOC_CAMERA + depends on MX3_IPU && SOC_CAMERA select VIDEOBUF_DMA_CONTIG select MX3_VIDEO ---help---@@ -909,21 +909,21 @@ config VIDEO_MX3 config VIDEO_PXA27x tristate "PXA27x Quick Capture Interface driver" - depends on VIDEO_DEV && PXA27x && SOC_CAMERA + depends on PXA27x && SOC_CAMERA select VIDEOBUF_DMA_SG ---help--- This is a v4l2 driver for the PXA27x Quick Capture Interface config VIDEO_SH_MOBILE_CEU tristate "SuperH Mobile CEU Interface driver" - depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK + depends on SOC_CAMERA && HAS_DMA && HAVE_CLK select VIDEOBUF_DMA_CONTIG
drivers/media/video/Kconfig config VIDEO_MX3 · line 929
Quoted 10 lines
drivers/media/video/Kconfig renamed from drivers/media/video/Kconfig~drivers-media-video-kconfig-add-video_dev-dependency-as-needed-in-drivers-media-video-kconfig +1
-1---help--- This is a v4l2 driver for the SuperH Mobile CEU Interface config VIDEO_OMAP2 tristate "OMAP2 Camera Capture Interface driver" - depends on VIDEO_DEV && ARCH_OMAP2 + depends on ARCH_OMAP2 select VIDEOBUF_DMA_SG ---help--- This is a v4l2 driver for the TI OMAP2 camera capture interface
I suspect that it is needed to keep at least some of the above dependencies, since VIDEO_DEV is tristate. Otherwise, someone may do things like selecting VIDEO_DEV=m, and select DISPLAY_DAVINCI_DM646X_EVM=y.
Yet, your proposed patch ringed the bells.
Extra care should be taken with drivers that depend on VIDEO_DEV instead of VIDEO_V4L2, due to the driver I2C dependencies. If I2C=m and VIDEO_DEV=y, and the driver has any call to an i2c core code, the driver should not be allowed to be compiled builtin.
So, if one of the above drivers that depend on VIDEO_DEV has access to i2c, it should depend, instead, of VIDEO_V4L2 (where the I2C particular case were already addressed).
I suspect that this is the case for soc_camera. So, the above dependencies should be, instead, VIDEO_V4L2. I'm not sure if all those DaVinci/OMAP drivers require i2c.
Guennadi/Murali,
Could you please double-check?
Signature · 2 lines
Cheers, Mauro