Merge tag 'dmaengine-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[platform/kernel/linux-rpi.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 08fdd0e..4ccae1a 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -474,25 +474,6 @@ config MXS_DMA
          Support the MXS DMA engine. This engine including APBH-DMA
          and APBX-DMA is integrated into some Freescale chips.
 
-config MX3_IPU
-       bool "MX3x Image Processing Unit support"
-       depends on ARCH_MXC
-       select DMA_ENGINE
-       default y
-       help
-         If you plan to use the Image Processing unit in the i.MX3x, say
-         Y here. If unsure, select Y.
-
-config MX3_IPU_IRQS
-       int "Number of dynamically mapped interrupts for IPU"
-       depends on MX3_IPU
-       range 2 137
-       default 4
-       help
-         Out of 137 interrupt sources on i.MX31 IPU only very few are used.
-         To avoid bloating the irq_desc[] array we allocate a sufficient
-         number of IRQ slots and map them dynamically to specific sources.
-
 config NBPFAXI_DMA
        tristate "Renesas Type-AXI NBPF DMA support"
        select DMA_ENGINE
@@ -699,7 +680,7 @@ config XGENE_DMA
 
 config XILINX_DMA
        tristate "Xilinx AXI DMAS Engine"
-       depends on (ARCH_ZYNQ || MICROBLAZE || ARM64)
+       depends on HAS_IOMEM
        select DMA_ENGINE
        help
          Enable support for Xilinx AXI VDMA Soft IP.