These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / platform / Kconfig

diff --git a/kernel/drivers/media/platform/Kconfig b/kernel/drivers/media/platform/Kconfig
index 421f531..ccbc974 100644 (file)
--- a/kernel/drivers/media/platform/Kconfig
+++ b/kernel/drivers/media/platform/Kconfig
@@ -1,6 +1,6 @@
 #
 # Platform drivers
-#      All drivers here are currently for webcam support
+#      Most drivers here are currently for webcam support
 
 menuconfig V4L_PLATFORM_DRIVERS
        bool "V4L platform devices"
@@ -86,9 +86,9 @@ config VIDEO_M32R_AR_M64278
 config VIDEO_OMAP3
        tristate "OMAP 3 Camera support"
        depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3
-       depends on HAS_DMA
+       depends on HAS_DMA && OF
+       depends on OMAP_IOMMU
        select ARM_DMA_USE_IOMMU
-       select OMAP_IOMMU
        select VIDEOBUF2_DMA_CONTIG
        select MFD_SYSCON
        ---help---
@@ -212,6 +212,16 @@ config VIDEO_SAMSUNG_EXYNOS_GSC
        help
          This is a v4l2 driver for Samsung EXYNOS5 SoC G-Scaler.
 
+config VIDEO_STI_BDISP
+       tristate "STMicroelectronics BDISP 2D blitter driver"
+       depends on VIDEO_DEV && VIDEO_V4L2
+       depends on ARCH_STI || COMPILE_TEST
+       depends on HAVE_DMA_ATTRS
+       select VIDEOBUF2_DMA_CONTIG
+       select V4L2_MEM2MEM_DEV
+       help
+         This v4l2 mem2mem driver is a 2D blitter for STMicroelectronics SoC.
+
 config VIDEO_SH_VEU
        tristate "SuperH VEU mem2mem video processing driver"
        depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
@@ -221,6 +231,18 @@ config VIDEO_SH_VEU
            Support for the Video Engine Unit (VEU) on SuperH and
            SH-Mobile SoCs.
 
+config VIDEO_RENESAS_JPU
+       tristate "Renesas JPEG Processing Unit"
+       depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
+       depends on ARCH_SHMOBILE || COMPILE_TEST
+       select VIDEOBUF2_DMA_CONTIG
+       select V4L2_MEM2MEM_DEV
+       ---help---
+         This is a V4L2 driver for the Renesas JPEG Processing Unit.
+
+         To compile this driver as a module, choose M here: the module
+         will be called rcar_jpu.
+
 config VIDEO_RENESAS_VSP1
        tristate "Renesas VSP1 Video Processing Engine"
        depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA
@@ -270,3 +292,14 @@ config VIDEO_VIM2M
          This is a virtual test device for the memory-to-memory driver
          framework.
 endif #V4L_TEST_DRIVERS
+
+menuconfig DVB_PLATFORM_DRIVERS
+       bool "DVB platform devices"
+       depends on MEDIA_DIGITAL_TV_SUPPORT
+       default n
+       ---help---
+         Say Y here to enable support for platform-specific Digital TV drivers.
+
+if DVB_PLATFORM_DRIVERS
+source "drivers/media/platform/sti/c8sectpfe/Kconfig"
+endif #DVB_PLATFORM_DRIVERS