Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[deliverable/linux.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index f6c46d06cef72b42379f2fd767c28972ff954e3c..739f797b40d9843b7d75261e955439866c7aaa83 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -533,19 +533,31 @@ config XGENE_DMA
        help
          Enable support for the APM X-Gene SoC DMA engine.
 
-config XILINX_VDMA
-       tristate "Xilinx AXI VDMA Engine"
+config XILINX_DMA
+       tristate "Xilinx AXI DMAS Engine"
        depends on (ARCH_ZYNQ || MICROBLAZE || ARM64)
        select DMA_ENGINE
        help
          Enable support for Xilinx AXI VDMA Soft IP.
 
-         This engine provides high-bandwidth direct memory access
+         AXI VDMA engine provides high-bandwidth direct memory access
          between memory and AXI4-Stream video type target
          peripherals including peripherals which support AXI4-
          Stream Video Protocol.  It has two stream interfaces/
          channels, Memory Mapped to Stream (MM2S) and Stream to
          Memory Mapped (S2MM) for the data transfers.
+         AXI CDMA engine provides high-bandwidth direct memory access
+         between a memory-mapped source address and a memory-mapped
+         destination address.
+         AXI DMA engine provides high-bandwidth one dimensional direct
+         memory access between memory and AXI4-Stream target peripherals.
+
+config XILINX_ZYNQMP_DMA
+       tristate "Xilinx ZynqMP DMA Engine"
+       depends on (ARCH_ZYNQ || MICROBLAZE || ARM64)
+       select DMA_ENGINE
+       help
+         Enable support for Xilinx ZynqMP DMA controller.
 
 config ZX_DMA
        tristate "ZTE ZX296702 DMA support"