Merge tag 'media/v4.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[sfrench/cifs-2.6.git] / drivers / media / platform / Kconfig

diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 54fe90acb5b2962432140949a17e1630361e08ca..70c4f6c54881cc097f8d90c8cea3bb61115a44ab 100644 (file)
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -58,6 +58,7 @@ config VIDEO_MUX
        select MULTIPLEXER
        depends on VIDEO_V4L2 && OF && VIDEO_V4L2_SUBDEV_API && MEDIA_CONTROLLER
        select REGMAP
+       select V4L2_FWNODE
        help
          This driver provides support for N:1 video bus multiplexers.
 
@@ -181,6 +182,15 @@ config VIDEO_CODA
 config VIDEO_IMX_VDOA
        def_tristate VIDEO_CODA if SOC_IMX6Q || COMPILE_TEST
 
+config VIDEO_IMX_PXP
+       tristate "i.MX Pixel Pipeline (PXP)"
+       depends on VIDEO_DEV && VIDEO_V4L2 && (ARCH_MXC || COMPILE_TEST)
+       select VIDEOBUF2_DMA_CONTIG
+       select V4L2_MEM2MEM_DEV
+       help
+         The i.MX Pixel Pipeline is a memory-to-memory engine for scaling,
+         color space conversion, and rotation.
+
 config VIDEO_MEDIATEK_JPEG
        tristate "Mediatek JPEG Codec driver"
        depends on MTK_IOMMU_V1 || COMPILE_TEST