tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Geert Uytterhoeven and committed by
Mauro Carvalho Chehab 4cff79e9 9329e7b0

+20 -56
-2
drivers/media/common/videobuf2/Kconfig
··· 12 12 13 13 config VIDEOBUF2_DMA_CONTIG 14 14 tristate 15 - depends on HAS_DMA 16 15 select VIDEOBUF2_CORE 17 16 select VIDEOBUF2_MEMOPS 18 17 select DMA_SHARED_BUFFER ··· 24 25 25 26 config VIDEOBUF2_DMA_SG 26 27 tristate 27 - depends on HAS_DMA 28 28 select VIDEOBUF2_CORE 29 29 select VIDEOBUF2_MEMOPS 30 30
-1
drivers/media/pci/dt3155/Kconfig
··· 1 1 config VIDEO_DT3155 2 2 tristate "DT3155 frame grabber" 3 3 depends on PCI && VIDEO_DEV && VIDEO_V4L2 4 - depends on HAS_DMA 5 4 select VIDEOBUF2_DMA_CONTIG 6 5 default n 7 6 ---help---
-1
drivers/media/pci/intel/ipu3/Kconfig
··· 4 4 depends on VIDEO_V4L2_SUBDEV_API 5 5 depends on (X86 && ACPI) || COMPILE_TEST 6 6 depends on MEDIA_CONTROLLER 7 - depends on HAS_DMA 8 7 select V4L2_FWNODE 9 8 select VIDEOBUF2_DMA_SG 10 9
-1
drivers/media/pci/solo6x10/Kconfig
··· 1 1 config VIDEO_SOLO6X10 2 2 tristate "Bluecherry / Softlogic 6x10 capture cards (MPEG-4/H.264)" 3 3 depends on PCI && VIDEO_DEV && SND && I2C 4 - depends on HAS_DMA 5 4 select BITREVERSE 6 5 select FONT_SUPPORT 7 6 select FONT_8x16
-1
drivers/media/pci/sta2x11/Kconfig
··· 1 1 config STA2X11_VIP 2 2 tristate "STA2X11 VIP Video For Linux" 3 3 depends on STA2X11 || COMPILE_TEST 4 - depends on HAS_DMA 5 4 select VIDEO_ADV7180 if MEDIA_SUBDRV_AUTOSELECT 6 5 select VIDEOBUF2_DMA_CONTIG 7 6 depends on PCI && VIDEO_V4L2 && VIRT_TO_BUS
-1
drivers/media/pci/tw5864/Kconfig
··· 1 1 config VIDEO_TW5864 2 2 tristate "Techwell TW5864 video/audio grabber and encoder" 3 3 depends on VIDEO_DEV && PCI && VIDEO_V4L2 4 - depends on HAS_DMA 5 4 select VIDEOBUF2_DMA_CONTIG 6 5 ---help--- 7 6 Support for boards based on Techwell TW5864 chip which provides
-1
drivers/media/pci/tw686x/Kconfig
··· 1 1 config VIDEO_TW686X 2 2 tristate "Intersil/Techwell TW686x video capture cards" 3 3 depends on PCI && VIDEO_DEV && VIDEO_V4L2 && SND 4 - depends on HAS_DMA 5 4 select VIDEOBUF2_VMALLOC 6 5 select VIDEOBUF2_DMA_CONTIG 7 6 select VIDEOBUF2_DMA_SG
+14 -29
drivers/media/platform/Kconfig
··· 35 35 config VIDEO_SH_VOU 36 36 tristate "SuperH VOU video output driver" 37 37 depends on MEDIA_CAMERA_SUPPORT 38 - depends on VIDEO_DEV && I2C && HAS_DMA 38 + depends on VIDEO_DEV && I2C 39 39 depends on ARCH_SHMOBILE || COMPILE_TEST 40 40 select VIDEOBUF2_DMA_CONTIG 41 41 help ··· 65 65 tristate "OMAP 3 Camera support" 66 66 depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API 67 67 depends on (ARCH_OMAP3 && OMAP_IOMMU) || COMPILE_TEST 68 - depends on COMMON_CLK 69 - depends on HAS_DMA && OF 68 + depends on COMMON_CLK && OF 70 69 select ARM_DMA_USE_IOMMU if OMAP_IOMMU 71 70 select VIDEOBUF2_DMA_CONTIG 72 71 select MFD_SYSCON ··· 81 82 82 83 config VIDEO_PXA27x 83 84 tristate "PXA27x Quick Capture Interface driver" 84 - depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA 85 + depends on VIDEO_DEV && VIDEO_V4L2 85 86 depends on PXA27x || COMPILE_TEST 86 87 select VIDEOBUF2_DMA_SG 87 88 select SG_SPLIT ··· 91 92 92 93 config VIDEO_QCOM_CAMSS 93 94 tristate "Qualcomm 8x16 V4L2 Camera Subsystem driver" 94 - depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA 95 + depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API 95 96 depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST 96 97 select VIDEOBUF2_DMA_SG 97 98 select V4L2_FWNODE ··· 101 102 depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API 102 103 depends on PM 103 104 depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST 104 - depends on HAS_DMA 105 105 select VIDEOBUF2_DMA_CONTIG 106 106 ---help--- 107 107 This is a v4l2 driver for s3c24xx and s3c64xx SoC series camera ··· 111 113 112 114 config VIDEO_STM32_DCMI 113 115 tristate "STM32 Digital Camera Memory Interface (DCMI) support" 114 - depends on VIDEO_V4L2 && OF && HAS_DMA 116 + depends on VIDEO_V4L2 && OF 115 117 depends on ARCH_STM32 || COMPILE_TEST 116 118 select VIDEOBUF2_DMA_CONTIG 117 119 select V4L2_FWNODE ··· 124 126 125 127 config VIDEO_RENESAS_CEU 126 128 tristate "Renesas Capture Engine Unit (CEU) driver" 127 - depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA 129 + depends on VIDEO_DEV && VIDEO_V4L2 128 130 depends on ARCH_SHMOBILE || ARCH_R7S72100 || COMPILE_TEST 129 131 select VIDEOBUF2_DMA_CONTIG 130 132 select V4L2_FWNODE ··· 142 144 tristate "TI CAL (Camera Adaptation Layer) driver" 143 145 depends on VIDEO_DEV && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API 144 146 depends on SOC_DRA7XX || COMPILE_TEST 145 - depends on HAS_DMA 146 147 select VIDEOBUF2_DMA_CONTIG 147 148 select V4L2_FWNODE 148 149 default n ··· 169 172 config VIDEO_CODA 170 173 tristate "Chips&Media Coda multi-standard codec IP" 171 174 depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST) 172 - depends on HAS_DMA 173 175 select SRAM 174 176 select VIDEOBUF2_DMA_CONTIG 175 177 select VIDEOBUF2_VMALLOC ··· 186 190 depends on MTK_IOMMU_V1 || COMPILE_TEST 187 191 depends on VIDEO_DEV && VIDEO_V4L2 188 192 depends on ARCH_MEDIATEK || COMPILE_TEST 189 - depends on HAS_DMA 190 193 select VIDEOBUF2_DMA_CONTIG 191 194 select V4L2_MEM2MEM_DEV 192 195 ---help--- ··· 197 202 198 203 config VIDEO_MEDIATEK_VPU 199 204 tristate "Mediatek Video Processor Unit" 200 - depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA 205 + depends on VIDEO_DEV && VIDEO_V4L2 201 206 depends on ARCH_MEDIATEK || COMPILE_TEST 202 207 ---help--- 203 208 This driver provides downloading VPU firmware and ··· 213 218 depends on MTK_IOMMU || COMPILE_TEST 214 219 depends on VIDEO_DEV && VIDEO_V4L2 215 220 depends on ARCH_MEDIATEK || COMPILE_TEST 216 - depends on HAS_DMA 217 221 select VIDEOBUF2_DMA_CONTIG 218 222 select V4L2_MEM2MEM_DEV 219 223 select VIDEO_MEDIATEK_VPU ··· 227 233 config VIDEO_MEDIATEK_VCODEC 228 234 tristate "Mediatek Video Codec driver" 229 235 depends on MTK_IOMMU || COMPILE_TEST 230 - depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA 236 + depends on VIDEO_DEV && VIDEO_V4L2 231 237 depends on ARCH_MEDIATEK || COMPILE_TEST 232 238 select VIDEOBUF2_DMA_CONTIG 233 239 select V4L2_MEM2MEM_DEV ··· 254 260 tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver" 255 261 depends on VIDEO_DEV && VIDEO_V4L2 256 262 depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST 257 - depends on HAS_DMA 258 263 select VIDEOBUF2_DMA_CONTIG 259 264 select V4L2_MEM2MEM_DEV 260 265 default n ··· 265 272 tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver" 266 273 depends on VIDEO_DEV && VIDEO_V4L2 267 274 depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST 268 - depends on HAS_DMA 269 275 select VIDEOBUF2_DMA_CONTIG 270 276 select V4L2_MEM2MEM_DEV 271 277 ---help--- ··· 275 283 tristate "Samsung S5P MFC Video Codec" 276 284 depends on VIDEO_DEV && VIDEO_V4L2 277 285 depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST 278 - depends on HAS_DMA 279 286 select VIDEOBUF2_DMA_CONTIG 280 287 default n 281 288 help ··· 284 293 tristate "MX2 eMMa-PrP support" 285 294 depends on VIDEO_DEV && VIDEO_V4L2 286 295 depends on SOC_IMX27 || COMPILE_TEST 287 - depends on HAS_DMA 288 296 select VIDEOBUF2_DMA_CONTIG 289 297 select V4L2_MEM2MEM_DEV 290 298 help ··· 295 305 tristate "Samsung Exynos G-Scaler driver" 296 306 depends on VIDEO_DEV && VIDEO_V4L2 297 307 depends on ARCH_EXYNOS || COMPILE_TEST 298 - depends on HAS_DMA 299 308 select VIDEOBUF2_DMA_CONTIG 300 309 select V4L2_MEM2MEM_DEV 301 310 help ··· 303 314 config VIDEO_STI_BDISP 304 315 tristate "STMicroelectronics BDISP 2D blitter driver" 305 316 depends on VIDEO_DEV && VIDEO_V4L2 306 - depends on HAS_DMA 307 317 depends on ARCH_STI || COMPILE_TEST 308 318 select VIDEOBUF2_DMA_CONTIG 309 319 select V4L2_MEM2MEM_DEV ··· 312 324 config VIDEO_STI_HVA 313 325 tristate "STMicroelectronics HVA multi-format video encoder V4L2 driver" 314 326 depends on VIDEO_DEV && VIDEO_V4L2 315 - depends on HAS_DMA 316 327 depends on ARCH_STI || COMPILE_TEST 317 328 select VIDEOBUF2_DMA_CONTIG 318 329 select V4L2_MEM2MEM_DEV ··· 338 351 tristate "STMicroelectronics DELTA multi-format video decoder V4L2 driver" 339 352 depends on VIDEO_DEV && VIDEO_V4L2 340 353 depends on ARCH_STI || COMPILE_TEST 341 - depends on HAS_DMA 342 354 help 343 355 This V4L2 driver enables DELTA multi-format video decoder 344 356 of STMicroelectronics STiH4xx SoC series allowing hardware ··· 383 397 384 398 config VIDEO_RENESAS_FDP1 385 399 tristate "Renesas Fine Display Processor" 386 - depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA 400 + depends on VIDEO_DEV && VIDEO_V4L2 387 401 depends on ARCH_SHMOBILE || COMPILE_TEST 388 402 depends on (!ARCH_RENESAS && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP 389 403 select VIDEOBUF2_DMA_CONTIG ··· 397 411 398 412 config VIDEO_RENESAS_JPU 399 413 tristate "Renesas JPEG Processing Unit" 400 - depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA 414 + depends on VIDEO_DEV && VIDEO_V4L2 401 415 depends on ARCH_RENESAS || COMPILE_TEST 402 416 select VIDEOBUF2_DMA_CONTIG 403 417 select V4L2_MEM2MEM_DEV ··· 422 436 423 437 config VIDEO_RENESAS_VSP1 424 438 tristate "Renesas VSP1 Video Processing Engine" 425 - depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA 439 + depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API 426 440 depends on ARCH_RENESAS || COMPILE_TEST 427 441 depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP 428 442 select VIDEOBUF2_DMA_CONTIG ··· 435 449 436 450 config VIDEO_ROCKCHIP_RGA 437 451 tristate "Rockchip Raster 2d Graphic Acceleration Unit" 438 - depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA 452 + depends on VIDEO_DEV && VIDEO_V4L2 439 453 depends on ARCH_ROCKCHIP || COMPILE_TEST 440 454 select VIDEOBUF2_DMA_SG 441 455 select V4L2_MEM2MEM_DEV ··· 452 466 tristate "TI VPE (Video Processing Engine) driver" 453 467 depends on VIDEO_DEV && VIDEO_V4L2 454 468 depends on SOC_DRA7XX || COMPILE_TEST 455 - depends on HAS_DMA 456 469 select VIDEOBUF2_DMA_CONTIG 457 470 select V4L2_MEM2MEM_DEV 458 471 select VIDEO_TI_VPDMA ··· 470 485 471 486 config VIDEO_QCOM_VENUS 472 487 tristate "Qualcomm Venus V4L2 encoder/decoder driver" 473 - depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA 488 + depends on VIDEO_DEV && VIDEO_V4L2 474 489 depends on (ARCH_QCOM && IOMMU_DMA) || COMPILE_TEST 475 490 select QCOM_MDT_LOADER if ARCH_QCOM 476 491 select QCOM_SCM if ARCH_QCOM ··· 612 627 613 628 config VIDEO_RCAR_DRIF 614 629 tristate "Renesas Digitial Radio Interface (DRIF)" 615 - depends on VIDEO_V4L2 && HAS_DMA 630 + depends on VIDEO_V4L2 616 631 depends on ARCH_RENESAS || COMPILE_TEST 617 632 select VIDEOBUF2_VMALLOC 618 633 ---help---
+1 -1
drivers/media/platform/am437x/Kconfig
··· 1 1 config VIDEO_AM437X_VPFE 2 2 tristate "TI AM437x VPFE video capture driver" 3 - depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA 3 + depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API 4 4 depends on SOC_AM43XX || COMPILE_TEST 5 5 select VIDEOBUF2_DMA_CONTIG 6 6 select V4L2_FWNODE
+2 -2
drivers/media/platform/atmel/Kconfig
··· 1 1 config VIDEO_ATMEL_ISC 2 2 tristate "ATMEL Image Sensor Controller (ISC) support" 3 - depends on VIDEO_V4L2 && COMMON_CLK && VIDEO_V4L2_SUBDEV_API && HAS_DMA 3 + depends on VIDEO_V4L2 && COMMON_CLK && VIDEO_V4L2_SUBDEV_API 4 4 depends on ARCH_AT91 || COMPILE_TEST 5 5 select VIDEOBUF2_DMA_CONTIG 6 6 select REGMAP_MMIO ··· 11 11 12 12 config VIDEO_ATMEL_ISI 13 13 tristate "ATMEL Image Sensor Interface (ISI) support" 14 - depends on VIDEO_V4L2 && OF && HAS_DMA 14 + depends on VIDEO_V4L2 && OF 15 15 depends on ARCH_AT91 || COMPILE_TEST 16 16 select VIDEOBUF2_DMA_CONTIG 17 17 select V4L2_FWNODE
-6
drivers/media/platform/davinci/Kconfig
··· 2 2 tristate "TI DaVinci VPIF V4L2-Display driver" 3 3 depends on VIDEO_V4L2 4 4 depends on ARCH_DAVINCI || COMPILE_TEST 5 - depends on HAS_DMA 6 5 depends on I2C 7 6 select VIDEOBUF2_DMA_CONTIG 8 7 select VIDEO_ADV7343 if MEDIA_SUBDRV_AUTOSELECT ··· 18 19 tristate "TI DaVinci VPIF video capture driver" 19 20 depends on VIDEO_V4L2 20 21 depends on ARCH_DAVINCI || COMPILE_TEST 21 - depends on HAS_DMA 22 22 depends on I2C 23 23 select VIDEOBUF2_DMA_CONTIG 24 24 select V4L2_FWNODE ··· 33 35 tristate "TI DM6446 CCDC video capture driver" 34 36 depends on VIDEO_V4L2 35 37 depends on ARCH_DAVINCI || COMPILE_TEST 36 - depends on HAS_DMA 37 38 depends on I2C 38 39 select VIDEOBUF_DMA_CONTIG 39 40 help ··· 49 52 tristate "TI DM355 CCDC video capture driver" 50 53 depends on VIDEO_V4L2 51 54 depends on ARCH_DAVINCI || COMPILE_TEST 52 - depends on HAS_DMA 53 55 depends on I2C 54 56 select VIDEOBUF_DMA_CONTIG 55 57 help ··· 65 69 tristate "TI DM365 ISIF video capture driver" 66 70 depends on VIDEO_V4L2 67 71 depends on ARCH_DAVINCI || COMPILE_TEST 68 - depends on HAS_DMA 69 72 depends on I2C 70 73 select VIDEOBUF_DMA_CONTIG 71 74 help ··· 79 84 tristate "TI DaVinci VPBE V4L2-Display driver" 80 85 depends on VIDEO_V4L2 81 86 depends on ARCH_DAVINCI || COMPILE_TEST 82 - depends on HAS_DMA 83 87 depends on I2C 84 88 select VIDEOBUF2_DMA_CONTIG 85 89 help
-2
drivers/media/platform/marvell-ccic/Kconfig
··· 1 1 config VIDEO_CAFE_CCIC 2 2 tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support" 3 3 depends on PCI && I2C && VIDEO_V4L2 4 - depends on HAS_DMA 5 4 select VIDEO_OV7670 6 5 select VIDEOBUF2_VMALLOC 7 6 select VIDEOBUF2_DMA_CONTIG ··· 13 14 config VIDEO_MMP_CAMERA 14 15 tristate "Marvell Armada 610 integrated camera controller support" 15 16 depends on I2C && VIDEO_V4L2 16 - depends on HAS_DMA 17 17 depends on ARCH_MMP || COMPILE_TEST 18 18 select VIDEO_OV7670 19 19 select I2C_GPIO
+1 -1
drivers/media/platform/rcar-vin/Kconfig
··· 12 12 13 13 config VIDEO_RCAR_VIN 14 14 tristate "R-Car Video Input (VIN) Driver" 15 - depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && OF && HAS_DMA && MEDIA_CONTROLLER 15 + depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && OF && MEDIA_CONTROLLER 16 16 depends on ARCH_RENESAS || COMPILE_TEST 17 17 select VIDEOBUF2_DMA_CONTIG 18 18 select V4L2_FWNODE
+1 -2
drivers/media/platform/soc_camera/Kconfig
··· 18 18 19 19 config VIDEO_SH_MOBILE_CEU 20 20 tristate "SuperH Mobile CEU Interface driver" 21 - depends on VIDEO_DEV && SOC_CAMERA && HAS_DMA && HAVE_CLK 21 + depends on VIDEO_DEV && SOC_CAMERA && HAVE_CLK 22 22 depends on ARCH_SHMOBILE || COMPILE_TEST 23 - depends on HAS_DMA 24 23 select VIDEOBUF2_DMA_CONTIG 25 24 select SOC_CAMERA_SCALE_CROP 26 25 ---help---
+1 -1
drivers/media/platform/sti/c8sectpfe/Kconfig
··· 1 1 config DVB_C8SECTPFE 2 2 tristate "STMicroelectronics C8SECTPFE DVB support" 3 - depends on PINCTRL && DVB_CORE && I2C && HAS_DMA 3 + depends on PINCTRL && DVB_CORE && I2C 4 4 depends on ARCH_STI || ARCH_MULTIPLATFORM || COMPILE_TEST 5 5 select FW_LOADER 6 6 select DEBUG_FS
-2
drivers/media/v4l2-core/Kconfig
··· 65 65 66 66 config VIDEOBUF_DMA_SG 67 67 tristate 68 - depends on HAS_DMA 69 68 select VIDEOBUF_GEN 70 69 71 70 config VIDEOBUF_VMALLOC ··· 73 74 74 75 config VIDEOBUF_DMA_CONTIG 75 76 tristate 76 - depends on HAS_DMA 77 77 select VIDEOBUF_GEN
-1
drivers/staging/media/davinci_vpfe/Kconfig
··· 2 2 tristate "DM365 VPFE Media Controller Capture Driver" 3 3 depends on VIDEO_V4L2 4 4 depends on (ARCH_DAVINCI_DM365 && !VIDEO_DM365_ISIF) || COMPILE_TEST 5 - depends on HAS_DMA 6 5 depends on VIDEO_V4L2_SUBDEV_API 7 6 depends on VIDEO_DAVINCI_VPBE_DISPLAY 8 7 select VIDEOBUF2_DMA_CONTIG
-1
drivers/staging/media/omap4iss/Kconfig
··· 2 2 tristate "OMAP 4 Camera support" 3 3 depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && I2C 4 4 depends on ARCH_OMAP4 || COMPILE_TEST 5 - depends on HAS_DMA 6 5 select MFD_SYSCON 7 6 select VIDEOBUF2_DMA_CONTIG 8 7 ---help---