Merge branch 'patchwork' into topic/docs-next

[cascardo/linux.git] / drivers / media / platform / Kconfig

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 84e041c..f25344b 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -110,6 +110,7 @@ source "drivers/media/platform/exynos4-is/Kconfig"
 source "drivers/media/platform/s5p-tv/Kconfig"
 source "drivers/media/platform/am437x/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"
+source "drivers/media/platform/rcar-vin/Kconfig"
 
 config VIDEO_TI_CAL
        tristate "TI CAL (Camera Adaptation Layer) driver"
@@ -152,6 +153,36 @@ config VIDEO_CODA
           Coda is a range of video codec IPs that supports
           H.264, MPEG-4, and other video formats.
 
+config VIDEO_MEDIATEK_VPU
+       tristate "Mediatek Video Processor Unit"
+       depends on VIDEO_DEV && VIDEO_V4L2
+       depends on ARCH_MEDIATEK || COMPILE_TEST
+       ---help---
+           This driver provides downloading VPU firmware and
+           communicating with VPU. This driver for hw video
+           codec embedded in Mediatek's MT8173 SOCs. It is able
+           to handle video decoding/encoding in a range of formats.
+
+           To compile this driver as a module, choose M here: the
+           module will be called mtk-vpu.
+
+config VIDEO_MEDIATEK_VCODEC
+       tristate "Mediatek Video Codec driver"
+       depends on MTK_IOMMU || COMPILE_TEST
+       depends on VIDEO_DEV && VIDEO_V4L2
+       depends on ARCH_MEDIATEK || COMPILE_TEST
+       select VIDEOBUF2_DMA_CONTIG
+       select V4L2_MEM2MEM_DEV
+       select VIDEO_MEDIATEK_VPU
+       default n
+       ---help---
+           Mediatek video codec driver provides HW capability to
+           encode and decode in a range of video formats
+           This driver rely on VPU driver to communicate with VPU.
+
+           To compile this driver as a module, choose M here: the
+           module will be called mtk-vcodec
+
 config VIDEO_MEM2MEM_DEINTERLACE
        tristate "Deinterlace support"
        depends on VIDEO_DEV && VIDEO_V4L2 && DMA_ENGINE
@@ -247,10 +278,24 @@ config VIDEO_RENESAS_JPU
          To compile this driver as a module, choose M here: the module
          will be called rcar_jpu.
 
+config VIDEO_RENESAS_FCP
+       tristate "Renesas Frame Compression Processor"
+       depends on ARCH_RENESAS || COMPILE_TEST
+       depends on OF
+       ---help---
+         This is a driver for the Renesas Frame Compression Processor (FCP).
+         The FCP is a companion module of video processing modules in the
+         Renesas R-Car Gen3 SoCs. It handles memory access for the codec,
+         VSP and FDP modules.
+
+         To compile this driver as a module, choose M here: the module
+         will be called rcar-fcp.
+
 config VIDEO_RENESAS_VSP1
        tristate "Renesas VSP1 Video Processing Engine"
        depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA
        depends on (ARCH_RENESAS && OF) || COMPILE_TEST
+       depends on (!ARM64 && !VIDEO_RENESAS_FCP) || VIDEO_RENESAS_FCP
        select VIDEOBUF2_DMA_CONTIG
        ---help---
          This is a V4L2 driver for the Renesas VSP1 video processing engine.