Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cff79e9 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Mauro Carvalho Chehab
Browse files

media: Remove depends on HAS_DMA in case of platform dependency 



Remove dependencies on HAS_DMA where a Kconfig symbol depends on another
symbol that implies HAS_DMA, and, optionally, on "|| COMPILE_TEST".
In most cases this other symbol is an architecture or platform specific
symbol, or PCI.

Generic symbols and drivers without platform dependencies keep their
dependencies on HAS_DMA, to prevent compiling subsystems or drivers that
cannot work anyway.

This simplifies the dependencies, and allows to improve compile-testing.

Note:
  - The various VIDEOBUF*DMA* symbols had to loose their dependencies on
    HAS_DMA, as they are selected by several individual drivers.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 9329e7b0

drivers/media/common/videobuf2/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ config VIDEOBUF2_MEMOPS 


config VIDEOBUF2_DMA_CONTIG

	tristate

	depends on HAS_DMA

	select VIDEOBUF2_CORE

	select VIDEOBUF2_MEMOPS

	select DMA_SHARED_BUFFER
@@ -25,7 +24,6 @@ config VIDEOBUF2_VMALLOC 


config VIDEOBUF2_DMA_SG

	tristate

	depends on HAS_DMA

	select VIDEOBUF2_CORE

	select VIDEOBUF2_MEMOPS

drivers/media/pci/dt3155/Kconfig

+0 −1
Original line number Diff line number Diff line 
config VIDEO_DT3155

	tristate "DT3155 frame grabber"

	depends on PCI && VIDEO_DEV && VIDEO_V4L2

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	default n

	---help---

drivers/media/pci/intel/ipu3/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ config VIDEO_IPU3_CIO2 
	depends on VIDEO_V4L2_SUBDEV_API

	depends on (X86 && ACPI) || COMPILE_TEST

	depends on MEDIA_CONTROLLER

	depends on HAS_DMA

	select V4L2_FWNODE

	select VIDEOBUF2_DMA_SG

drivers/media/pci/solo6x10/Kconfig

+0 −1
Original line number Diff line number Diff line 
config VIDEO_SOLO6X10

	tristate "Bluecherry / Softlogic 6x10 capture cards (MPEG-4/H.264)"

	depends on PCI && VIDEO_DEV && SND && I2C

	depends on HAS_DMA

	select BITREVERSE

	select FONT_SUPPORT

	select FONT_8x16

drivers/media/pci/sta2x11/Kconfig

+0 −1
Original line number Diff line number Diff line 
config STA2X11_VIP

	tristate "STA2X11 VIP Video For Linux"

	depends on STA2X11 || COMPILE_TEST

	depends on HAS_DMA

	select VIDEO_ADV7180 if MEDIA_SUBDRV_AUTOSELECT

	select VIDEOBUF2_DMA_CONTIG

	depends on PCI && VIDEO_V4L2 && VIRT_TO_BUS