Merge tag 'ceph-for-5.11-rc1' of git://github.com/ceph/ceph-client

[linux-2.6-microblaze.git] / drivers / media / platform / Kconfig

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 7e152bb..35a18d3 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -147,6 +147,24 @@ config VIDEO_RENESAS_CEU
        help
          This is a v4l2 driver for the Renesas CEU Interface
 
+config VIDEO_ROCKCHIP_ISP1
+       tristate "Rockchip Image Signal Processing v1 Unit driver"
+       depends on VIDEO_V4L2 && OF
+       depends on ARCH_ROCKCHIP || COMPILE_TEST
+       select MEDIA_CONTROLLER
+       select VIDEO_V4L2_SUBDEV_API
+       select VIDEOBUF2_DMA_CONTIG
+       select VIDEOBUF2_VMALLOC
+       select V4L2_FWNODE
+       select GENERIC_PHY_MIPI_DPHY
+       default n
+       help
+         Enable this to support the Image Signal Processing (ISP) module
+         present in RK3399 SoCs.
+
+         To compile this driver as a module, choose M here: the module
+         will be called rockchip-isp1.
+
 source "drivers/media/platform/exynos4-is/Kconfig"
 source "drivers/media/platform/am437x/Kconfig"
 source "drivers/media/platform/xilinx/Kconfig"
@@ -183,7 +201,7 @@ 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 VIDEO_DEV && VIDEO_V4L2 && OF && (ARCH_MXC || COMPILE_TEST)
        select SRAM
        select VIDEOBUF2_DMA_CONTIG
        select VIDEOBUF2_VMALLOC
@@ -288,6 +306,19 @@ config VIDEO_MEM2MEM_DEINTERLACE
        help
            Generic deinterlacing V4L2 driver.
 
+config VIDEO_MESON_GE2D
+       tristate "Amlogic 2D Graphic Acceleration Unit"
+       depends on VIDEO_DEV && VIDEO_V4L2
+       depends on ARCH_MESON || COMPILE_TEST
+       select VIDEOBUF2_DMA_CONTIG
+       select V4L2_MEM2MEM_DEV
+       help
+         This is a v4l2 driver for Amlogic GE2D 2D graphics accelerator.
+         GE2D is a standalone 2D graphic acceleration unit, with color converter,
+         image scaling, BitBLT & alpha blending operations.
+
+         To compile this driver as a module choose m here.
+
 config VIDEO_SAMSUNG_S5P_G2D
        tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
        depends on VIDEO_DEV && VIDEO_V4L2