diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-07-16 20:10:54 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-07-16 20:10:54 +0530 |
| commit | ad31aa8fedafdd0b9854035fe71eb37994c2d2ce (patch) | |
| tree | 2733f9d27f4ed6229b4bdbe0d43375cf239d8bf7 /drivers/dma/Kconfig | |
| parent | 3b3fb1a19963a3b735960b0b7e1cce4e53a3e79b (diff) | |
| parent | 7cdd3587b8628215f377d5d73a39540d94f33dc1 (diff) | |
Merge branch 'topic/xilinx' into for-linus
Diffstat (limited to 'drivers/dma/Kconfig')
| -rw-r--r-- | drivers/dma/Kconfig | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index f6c46d06cef7..739f797b40d9 100644 --- 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" |