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: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/common/videobuf2/Kconfig b/drivers/media/common/videobuf2/Kconfig
index 17c32ea58395d78f9fafe5525bbfbf1bdfe4b690..4ed11b46676ac4d01217b14d8595b73234f3874f 100644 (file)
--- a/drivers/media/common/videobuf2/Kconfig
+++ b/drivers/media/common/videobuf2/Kconfig
@@ -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
 

diff --git a/drivers/media/pci/dt3155/Kconfig b/drivers/media/pci/dt3155/Kconfig
index 5145e0dfa2aa9e126a45d747826432c52697090b..858b0f2f15bef9c80f3a88560f5dc085f196a3c5 100644 (file)
--- a/drivers/media/pci/dt3155/Kconfig
+++ b/drivers/media/pci/dt3155/Kconfig
@@ -1,7 +1,6 @@
 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---

diff --git a/drivers/media/pci/intel/ipu3/Kconfig b/drivers/media/pci/intel/ipu3/Kconfig
index fdae26b2bef0da17d4136b5c673297afc455dab9..715f77651482bc04a6468ddcab84246e390e9dcd 100644 (file)
--- a/drivers/media/pci/intel/ipu3/Kconfig
+++ b/drivers/media/pci/intel/ipu3/Kconfig
@@ -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
 

diff --git a/drivers/media/pci/solo6x10/Kconfig b/drivers/media/pci/solo6x10/Kconfig
index 0fb91dc7ca73529eda55bb894287cbdc084e8fd0..d9e06a6bf1ebc1a7de4b498361bac87f9cabe9d4 100644 (file)
--- a/drivers/media/pci/solo6x10/Kconfig
+++ b/drivers/media/pci/solo6x10/Kconfig
@@ -1,7 +1,6 @@
 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

diff --git a/drivers/media/pci/sta2x11/Kconfig b/drivers/media/pci/sta2x11/Kconfig
index 7af3f1cbcea824b9978b8a14aea5be21d3686be1..4407b9f881e400d893f67c55581edf44f7325fb5 100644 (file)
--- a/drivers/media/pci/sta2x11/Kconfig
+++ b/drivers/media/pci/sta2x11/Kconfig
@@ -1,7 +1,6 @@
 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

diff --git a/drivers/media/pci/tw5864/Kconfig b/drivers/media/pci/tw5864/Kconfig
index 87c8f327e2d49dfa2a570e32959db3f4243ef192..760fb11dfeaef47b203d48b669cae3ea4f30fae9 100644 (file)
--- a/drivers/media/pci/tw5864/Kconfig
+++ b/drivers/media/pci/tw5864/Kconfig
@@ -1,7 +1,6 @@
 config VIDEO_TW5864
        tristate "Techwell TW5864 video/audio grabber and encoder"
        depends on VIDEO_DEV && PCI && VIDEO_V4L2
-       depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        ---help---
          Support for boards based on Techwell TW5864 chip which provides

diff --git a/drivers/media/pci/tw686x/Kconfig b/drivers/media/pci/tw686x/Kconfig
index 34ff37712313b780a73d30b8b60617513ad29ee4..da8bfee71b44cca577f2431dfa97e33bec96892d 100644 (file)
--- a/drivers/media/pci/tw686x/Kconfig
+++ b/drivers/media/pci/tw686x/Kconfig
@@ -1,7 +1,6 @@
 config VIDEO_TW686X
        tristate "Intersil/Techwell TW686x video capture cards"
        depends on PCI && VIDEO_DEV && VIDEO_V4L2 && SND
-       depends on HAS_DMA
        select VIDEOBUF2_VMALLOC
        select VIDEOBUF2_DMA_CONTIG
        select VIDEOBUF2_DMA_SG

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 95a46570f5402459d8f8dc2042554f96dce57b7d..c1af9f737fd60911821cfdd3aab173b68e12b081 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -35,7 +35,7 @@ source "drivers/media/platform/omap/Kconfig"
 config VIDEO_SH_VOU
        tristate "SuperH VOU video output driver"
        depends on MEDIA_CAMERA_SUPPORT
-       depends on VIDEO_DEV && I2C && HAS_DMA
+       depends on VIDEO_DEV && I2C
        depends on ARCH_SHMOBILE || COMPILE_TEST
        select VIDEOBUF2_DMA_CONTIG
        help
@@ -65,8 +65,7 @@ config VIDEO_OMAP3
        tristate "OMAP 3 Camera support"
        depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
        depends on (ARCH_OMAP3 && OMAP_IOMMU) || COMPILE_TEST
-       depends on COMMON_CLK
-       depends on HAS_DMA && OF
+       depends on COMMON_CLK && OF
        select ARM_DMA_USE_IOMMU if OMAP_IOMMU
        select VIDEOBUF2_DMA_CONTIG
        select MFD_SYSCON
@@ -82,7 +81,7 @@ config VIDEO_OMAP3_DEBUG
 
 config VIDEO_PXA27x
        tristate "PXA27x Quick Capture Interface driver"
-       depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
+       depends on VIDEO_DEV && VIDEO_V4L2
        depends on PXA27x || COMPILE_TEST
        select VIDEOBUF2_DMA_SG
        select SG_SPLIT
@@ -92,7 +91,7 @@ config VIDEO_PXA27x
 
 config VIDEO_QCOM_CAMSS
        tristate "Qualcomm 8x16 V4L2 Camera Subsystem driver"
-       depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA
+       depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
        depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST
        select VIDEOBUF2_DMA_SG
        select V4L2_FWNODE
@@ -102,7 +101,6 @@ config VIDEO_S3C_CAMIF
        depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
        depends on PM
        depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST
-       depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        ---help---
          This is a v4l2 driver for s3c24xx and s3c64xx SoC series camera
@@ -113,7 +111,7 @@ config VIDEO_S3C_CAMIF
 
 config VIDEO_STM32_DCMI
        tristate "STM32 Digital Camera Memory Interface (DCMI) support"
-       depends on VIDEO_V4L2 && OF && HAS_DMA
+       depends on VIDEO_V4L2 && OF
        depends on ARCH_STM32 || COMPILE_TEST
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_FWNODE
@@ -126,7 +124,7 @@ config VIDEO_STM32_DCMI
 
 config VIDEO_RENESAS_CEU
        tristate "Renesas Capture Engine Unit (CEU) driver"
-       depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
+       depends on VIDEO_DEV && VIDEO_V4L2
        depends on ARCH_SHMOBILE || ARCH_R7S72100 || COMPILE_TEST
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_FWNODE
@@ -144,7 +142,6 @@ config VIDEO_TI_CAL
        tristate "TI CAL (Camera Adaptation Layer) driver"
        depends on VIDEO_DEV && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
        depends on SOC_DRA7XX || COMPILE_TEST
-       depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_FWNODE
        default n
@@ -172,7 +169,6 @@ if V4L_MEM2MEM_DRIVERS
 config VIDEO_CODA
        tristate "Chips&Media Coda multi-standard codec IP"
        depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST)
-       depends on HAS_DMA
        select SRAM
        select VIDEOBUF2_DMA_CONTIG
        select VIDEOBUF2_VMALLOC
@@ -190,7 +186,6 @@ config VIDEO_MEDIATEK_JPEG
        depends on MTK_IOMMU_V1 || COMPILE_TEST
        depends on VIDEO_DEV && VIDEO_V4L2
        depends on ARCH_MEDIATEK || COMPILE_TEST
-       depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
        ---help---
@@ -202,7 +197,7 @@ config VIDEO_MEDIATEK_JPEG
 
 config VIDEO_MEDIATEK_VPU
        tristate "Mediatek Video Processor Unit"
-       depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
+       depends on VIDEO_DEV && VIDEO_V4L2
        depends on ARCH_MEDIATEK || COMPILE_TEST
        ---help---
            This driver provides downloading VPU firmware and
@@ -218,7 +213,6 @@ config VIDEO_MEDIATEK_MDP
        depends on MTK_IOMMU || COMPILE_TEST
        depends on VIDEO_DEV && VIDEO_V4L2
        depends on ARCH_MEDIATEK || COMPILE_TEST
-       depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
        select VIDEO_MEDIATEK_VPU
@@ -233,7 +227,7 @@ config VIDEO_MEDIATEK_MDP
 config VIDEO_MEDIATEK_VCODEC
        tristate "Mediatek Video Codec driver"
        depends on MTK_IOMMU || COMPILE_TEST
-       depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
+       depends on VIDEO_DEV && VIDEO_V4L2
        depends on ARCH_MEDIATEK || COMPILE_TEST
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
@@ -260,7 +254,6 @@ config VIDEO_SAMSUNG_S5P_G2D
        tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
        depends on VIDEO_DEV && VIDEO_V4L2
        depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
-       depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
        default n
@@ -272,7 +265,6 @@ config VIDEO_SAMSUNG_S5P_JPEG
        tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"
        depends on VIDEO_DEV && VIDEO_V4L2
        depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
-       depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
        ---help---
@@ -283,7 +275,6 @@ config VIDEO_SAMSUNG_S5P_MFC
        tristate "Samsung S5P MFC Video Codec"
        depends on VIDEO_DEV && VIDEO_V4L2
        depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
-       depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        default n
        help
@@ -293,7 +284,6 @@ config VIDEO_MX2_EMMAPRP
        tristate "MX2 eMMa-PrP support"
        depends on VIDEO_DEV && VIDEO_V4L2
        depends on SOC_IMX27 || COMPILE_TEST
-       depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
        help
@@ -305,7 +295,6 @@ config VIDEO_SAMSUNG_EXYNOS_GSC
        tristate "Samsung Exynos G-Scaler driver"
        depends on VIDEO_DEV && VIDEO_V4L2
        depends on ARCH_EXYNOS || COMPILE_TEST
-       depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
        help
@@ -314,7 +303,6 @@ config VIDEO_SAMSUNG_EXYNOS_GSC
 config VIDEO_STI_BDISP
        tristate "STMicroelectronics BDISP 2D blitter driver"
        depends on VIDEO_DEV && VIDEO_V4L2
-       depends on HAS_DMA
        depends on ARCH_STI || COMPILE_TEST
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
@@ -324,7 +312,6 @@ config VIDEO_STI_BDISP
 config VIDEO_STI_HVA
        tristate "STMicroelectronics HVA multi-format video encoder V4L2 driver"
        depends on VIDEO_DEV && VIDEO_V4L2
-       depends on HAS_DMA
        depends on ARCH_STI || COMPILE_TEST
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
@@ -351,7 +338,6 @@ config VIDEO_STI_DELTA
        tristate "STMicroelectronics DELTA multi-format video decoder V4L2 driver"
        depends on VIDEO_DEV && VIDEO_V4L2
        depends on ARCH_STI || COMPILE_TEST
-       depends on HAS_DMA
        help
                This V4L2 driver enables DELTA multi-format video decoder
                of STMicroelectronics STiH4xx SoC series allowing hardware
@@ -397,7 +383,7 @@ config VIDEO_SH_VEU
 
 config VIDEO_RENESAS_FDP1
        tristate "Renesas Fine Display Processor"
-       depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
+       depends on VIDEO_DEV && VIDEO_V4L2
        depends on ARCH_SHMOBILE || COMPILE_TEST
        depends on (!ARCH_RENESAS && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP
        select VIDEOBUF2_DMA_CONTIG
@@ -411,7 +397,7 @@ config VIDEO_RENESAS_FDP1
 
 config VIDEO_RENESAS_JPU
        tristate "Renesas JPEG Processing Unit"
-       depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
+       depends on VIDEO_DEV && VIDEO_V4L2
        depends on ARCH_RENESAS || COMPILE_TEST
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
@@ -436,7 +422,7 @@ config VIDEO_RENESAS_FCP
 
 config VIDEO_RENESAS_VSP1
        tristate "Renesas VSP1 Video Processing Engine"
-       depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA
+       depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
        depends on ARCH_RENESAS || COMPILE_TEST
        depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP
        select VIDEOBUF2_DMA_CONTIG
@@ -449,7 +435,7 @@ config VIDEO_RENESAS_VSP1
 
 config VIDEO_ROCKCHIP_RGA
        tristate "Rockchip Raster 2d Graphic Acceleration Unit"
-       depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
+       depends on VIDEO_DEV && VIDEO_V4L2
        depends on ARCH_ROCKCHIP || COMPILE_TEST
        select VIDEOBUF2_DMA_SG
        select V4L2_MEM2MEM_DEV
@@ -466,7 +452,6 @@ config VIDEO_TI_VPE
        tristate "TI VPE (Video Processing Engine) driver"
        depends on VIDEO_DEV && VIDEO_V4L2
        depends on SOC_DRA7XX || COMPILE_TEST
-       depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_MEM2MEM_DEV
        select VIDEO_TI_VPDMA
@@ -485,7 +470,7 @@ config VIDEO_TI_VPE_DEBUG
 
 config VIDEO_QCOM_VENUS
        tristate "Qualcomm Venus V4L2 encoder/decoder driver"
-       depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
+       depends on VIDEO_DEV && VIDEO_V4L2
        depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST
        select QCOM_MDT_LOADER if ARCH_QCOM
        select QCOM_SCM if ARCH_QCOM
@@ -627,7 +612,7 @@ if SDR_PLATFORM_DRIVERS
 
 config VIDEO_RCAR_DRIF
        tristate "Renesas Digitial Radio Interface (DRIF)"
-       depends on VIDEO_V4L2 && HAS_DMA
+       depends on VIDEO_V4L2
        depends on ARCH_RENESAS || COMPILE_TEST
        select VIDEOBUF2_VMALLOC
        ---help---

diff --git a/drivers/media/platform/am437x/Kconfig b/drivers/media/platform/am437x/Kconfig
index 160e77e9a0fbfa61146f4364d4406aca40386d0d..f4ce1176e4dc8179e65b9ffd0bb84185d1895d98 100644 (file)
--- a/drivers/media/platform/am437x/Kconfig
+++ b/drivers/media/platform/am437x/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_AM437X_VPFE
        tristate "TI AM437x VPFE video capture driver"
-       depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA
+       depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
        depends on SOC_AM43XX || COMPILE_TEST
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_FWNODE

diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/atmel/Kconfig
index 55de751e5f51500b0f01851ae9a0746fa2708b84..a211ef20f77eadbaace25e69c64111bb3439a427 100644 (file)
--- a/drivers/media/platform/atmel/Kconfig
+++ b/drivers/media/platform/atmel/Kconfig
@@ -1,6 +1,6 @@
 config VIDEO_ATMEL_ISC
        tristate "ATMEL Image Sensor Controller (ISC) support"
-       depends on VIDEO_V4L2 && COMMON_CLK && VIDEO_V4L2_SUBDEV_API && HAS_DMA
+       depends on VIDEO_V4L2 && COMMON_CLK && VIDEO_V4L2_SUBDEV_API
        depends on ARCH_AT91 || COMPILE_TEST
        select VIDEOBUF2_DMA_CONTIG
        select REGMAP_MMIO
@@ -11,7 +11,7 @@ config VIDEO_ATMEL_ISC
 
 config VIDEO_ATMEL_ISI
        tristate "ATMEL Image Sensor Interface (ISI) support"
-       depends on VIDEO_V4L2 && OF && HAS_DMA
+       depends on VIDEO_V4L2 && OF
        depends on ARCH_AT91 || COMPILE_TEST
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_FWNODE

diff --git a/drivers/media/platform/davinci/Kconfig b/drivers/media/platform/davinci/Kconfig
index b463d1726335a51d3e1908c364dfe5d855576ddd..06b5e581f25f2416c05f4a6796a94e13afdddcdd 100644 (file)
--- a/drivers/media/platform/davinci/Kconfig
+++ b/drivers/media/platform/davinci/Kconfig
@@ -2,7 +2,6 @@ config VIDEO_DAVINCI_VPIF_DISPLAY
        tristate "TI DaVinci VPIF V4L2-Display driver"
        depends on VIDEO_V4L2
        depends on ARCH_DAVINCI || COMPILE_TEST
-       depends on HAS_DMA
        depends on I2C
        select VIDEOBUF2_DMA_CONTIG
        select VIDEO_ADV7343 if MEDIA_SUBDRV_AUTOSELECT
@@ -19,7 +18,6 @@ config VIDEO_DAVINCI_VPIF_CAPTURE
        tristate "TI DaVinci VPIF video capture driver"
        depends on VIDEO_V4L2
        depends on ARCH_DAVINCI || COMPILE_TEST
-       depends on HAS_DMA
        depends on I2C
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_FWNODE
@@ -35,7 +33,6 @@ config VIDEO_DM6446_CCDC
        tristate "TI DM6446 CCDC video capture driver"
        depends on VIDEO_V4L2
        depends on ARCH_DAVINCI || COMPILE_TEST
-       depends on HAS_DMA
        depends on I2C
        select VIDEOBUF_DMA_CONTIG
        help
@@ -52,7 +49,6 @@ config VIDEO_DM355_CCDC
        tristate "TI DM355 CCDC video capture driver"
        depends on VIDEO_V4L2
        depends on ARCH_DAVINCI || COMPILE_TEST
-       depends on HAS_DMA
        depends on I2C
        select VIDEOBUF_DMA_CONTIG
        help
@@ -69,7 +65,6 @@ config VIDEO_DM365_ISIF
        tristate "TI DM365 ISIF video capture driver"
        depends on VIDEO_V4L2
        depends on ARCH_DAVINCI || COMPILE_TEST
-       depends on HAS_DMA
        depends on I2C
        select VIDEOBUF_DMA_CONTIG
        help
@@ -84,7 +79,6 @@ config VIDEO_DAVINCI_VPBE_DISPLAY
        tristate "TI DaVinci VPBE V4L2-Display driver"
        depends on VIDEO_V4L2
        depends on ARCH_DAVINCI || COMPILE_TEST
-       depends on HAS_DMA
        depends on I2C
        select VIDEOBUF2_DMA_CONTIG
        help

diff --git a/drivers/media/platform/marvell-ccic/Kconfig b/drivers/media/platform/marvell-ccic/Kconfig
index 21dacef7c2fccdfc9dc373fd76bdb2941b6be820..60dbe6d1fae9c9d5e36739ed18ba763f1821786f 100644 (file)
--- a/drivers/media/platform/marvell-ccic/Kconfig
+++ b/drivers/media/platform/marvell-ccic/Kconfig
@@ -1,7 +1,6 @@
 config VIDEO_CAFE_CCIC
        tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"
        depends on PCI && I2C && VIDEO_V4L2
-       depends on HAS_DMA
        select VIDEO_OV7670
        select VIDEOBUF2_VMALLOC
        select VIDEOBUF2_DMA_CONTIG
@@ -14,7 +13,6 @@ config VIDEO_CAFE_CCIC
 config VIDEO_MMP_CAMERA
        tristate "Marvell Armada 610 integrated camera controller support"
        depends on I2C && VIDEO_V4L2
-       depends on HAS_DMA
        depends on ARCH_MMP || COMPILE_TEST
        select VIDEO_OV7670
        select I2C_GPIO

diff --git a/drivers/media/platform/rcar-vin/Kconfig b/drivers/media/platform/rcar-vin/Kconfig
index d5835da6d4100d870b0779412d797bb9470b349a..baf4eafff6e3877d4c623c5509095d6d6e94c2f5 100644 (file)
--- a/drivers/media/platform/rcar-vin/Kconfig
+++ b/drivers/media/platform/rcar-vin/Kconfig
@@ -12,7 +12,7 @@ config VIDEO_RCAR_CSI2
 
 config VIDEO_RCAR_VIN
        tristate "R-Car Video Input (VIN) Driver"
-       depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && OF && HAS_DMA && MEDIA_CONTROLLER
+       depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && OF && MEDIA_CONTROLLER
        depends on ARCH_RENESAS || COMPILE_TEST
        select VIDEOBUF2_DMA_CONTIG
        select V4L2_FWNODE

diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig
index f5979c12ad618f4aa187be9b8e9447c17e6d8533..669d116b8f09b2aa60129baf9778280b04e17a62 100644 (file)
--- a/drivers/media/platform/soc_camera/Kconfig
+++ b/drivers/media/platform/soc_camera/Kconfig
@@ -18,9 +18,8 @@ config SOC_CAMERA_PLATFORM
 
 config VIDEO_SH_MOBILE_CEU
        tristate "SuperH Mobile CEU Interface driver"
-       depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK
+       depends on VIDEO_DEV && SOC_CAMERA && HAVE_CLK
        depends on ARCH_SHMOBILE || COMPILE_TEST
-       depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        select SOC_CAMERA_SCALE_CROP
        ---help---

diff --git a/drivers/media/platform/sti/c8sectpfe/Kconfig b/drivers/media/platform/sti/c8sectpfe/Kconfig
index 740190f8a3b606d3b09542c7d2323add4e60e98c..7420a50572d347efe374c7b7be7facc6833c7a9f 100644 (file)
--- a/drivers/media/platform/sti/c8sectpfe/Kconfig
+++ b/drivers/media/platform/sti/c8sectpfe/Kconfig
@@ -1,6 +1,6 @@
 config DVB_C8SECTPFE
        tristate "STMicroelectronics C8SECTPFE DVB support"
-       depends on PINCTRL && DVB_CORE && I2C && HAS_DMA
+       depends on PINCTRL && DVB_CORE && I2C
        depends on ARCH_STI || ARCH_MULTIPLATFORM || COMPILE_TEST
        select FW_LOADER
        select DEBUG_FS

diff --git a/drivers/media/v4l2-core/Kconfig b/drivers/media/v4l2-core/Kconfig
index 2a56f37f186bbe4bc38e277d74bc3448860b5b15..b97090e859968c9962261780681efff870708fd3 100644 (file)
--- a/drivers/media/v4l2-core/Kconfig
+++ b/drivers/media/v4l2-core/Kconfig
@@ -65,7 +65,6 @@ config VIDEOBUF_GEN
 
 config VIDEOBUF_DMA_SG
        tristate
-       depends on HAS_DMA
        select VIDEOBUF_GEN
 
 config VIDEOBUF_VMALLOC
@@ -74,5 +73,4 @@ config VIDEOBUF_VMALLOC
 
 config VIDEOBUF_DMA_CONTIG
        tristate
-       depends on HAS_DMA
        select VIDEOBUF_GEN

diff --git a/drivers/staging/media/davinci_vpfe/Kconfig b/drivers/staging/media/davinci_vpfe/Kconfig
index bcba9a64c514bef6e6dc24275323c8d1dca27c6a..aea449a8dbf8a08a2e2e6b648d2228853ce66a70 100644 (file)
--- a/drivers/staging/media/davinci_vpfe/Kconfig
+++ b/drivers/staging/media/davinci_vpfe/Kconfig
@@ -2,7 +2,6 @@ config VIDEO_DM365_VPFE
        tristate "DM365 VPFE Media Controller Capture Driver"
        depends on VIDEO_V4L2
        depends on (ARCH_DAVINCI_DM365 && !VIDEO_DM365_ISIF) || COMPILE_TEST
-       depends on HAS_DMA
        depends on VIDEO_V4L2_SUBDEV_API
        depends on VIDEO_DAVINCI_VPBE_DISPLAY
        select VIDEOBUF2_DMA_CONTIG

diff --git a/drivers/staging/media/omap4iss/Kconfig b/drivers/staging/media/omap4iss/Kconfig
index 192ba0829128a76a6023cbab2ff61f5feddc27bd..dddd27335cb433bf956ceb8504620d119288d3ca 100644 (file)
--- a/drivers/staging/media/omap4iss/Kconfig
+++ b/drivers/staging/media/omap4iss/Kconfig
@@ -2,7 +2,6 @@ config VIDEO_OMAP4
        tristate "OMAP 4 Camera support"
        depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && I2C
        depends on ARCH_OMAP4 || COMPILE_TEST
-       depends on HAS_DMA
        select MFD_SYSCON
        select VIDEOBUF2_DMA_CONTIG
        ---help---