Merge tag 'media/v4.12-2' into patchwork

[karo-tx-linux.git] / drivers / media / platform / Kconfig

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 041cb80a26b1ff22f049abaed44b0a62c9b91a9c..288d3b0dc81266565fee8f8acf1c02d2a62582bf 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -82,6 +82,7 @@ config VIDEO_OMAP3
        select ARM_DMA_USE_IOMMU
        select VIDEOBUF2_DMA_CONTIG
        select MFD_SYSCON
+       select V4L2_FWNODE
        ---help---
          Driver for an OMAP 3 camera controller.
 
@@ -97,6 +98,7 @@ config VIDEO_PXA27x
        depends on PXA27x || COMPILE_TEST
        select VIDEOBUF2_DMA_SG
        select SG_SPLIT
+       select V4L2_FWNODE
        ---help---
          This is a v4l2 driver for the PXA27x Quick Capture Interface
 
@@ -114,6 +116,19 @@ config VIDEO_S3C_CAMIF
          To compile this driver as a module, choose M here: the module
          will be called s3c-camif.
 
+config VIDEO_STM32_DCMI
+       tristate "STM32 Digital Camera Memory Interface (DCMI) support"
+       depends on VIDEO_V4L2 && OF && HAS_DMA
+       depends on ARCH_STM32 || COMPILE_TEST
+       select VIDEOBUF2_DMA_CONTIG
+       select V4L2_FWNODE
+       ---help---
+         This module makes the STM32 Digital Camera Memory Interface (DCMI)
+         available as a v4l2 device.
+
+         To compile this driver as a module, choose M here: the module
+         will be called stm32-dcmi.
+
 source "drivers/media/platform/soc_camera/Kconfig"
 source "drivers/media/platform/exynos4-is/Kconfig"
 source "drivers/media/platform/am437x/Kconfig"
@@ -127,6 +142,7 @@ config VIDEO_TI_CAL
        depends on SOC_DRA7XX || COMPILE_TEST
        depends on HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
+       select V4L2_FWNODE
        default n
        ---help---
          Support for the TI CAL (Camera Adaptation Layer) block