Merge branch 'mlxsw-fixes'

[linux-block.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index d96d87c56f2e13a6c85a815626f67b67c9940116..8c98779a12b134f3688e1076f1e11211c23e2623 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -332,7 +332,7 @@ config MPC512X_DMA
 
 config MV_XOR
        bool "Marvell XOR engine support"
-       depends on PLAT_ORION
+       depends on PLAT_ORION || ARCH_MVEBU || COMPILE_TEST
        select DMA_ENGINE
        select DMA_ENGINE_RAID
        select ASYNC_TX_ENABLE_CHANNEL_SWITCH
@@ -467,6 +467,20 @@ config TEGRA20_APB_DMA
          This DMA controller transfers data from memory to peripheral fifo
          or vice versa. It does not support memory to memory data transfer.
 
+config TEGRA210_ADMA
+       bool "NVIDIA Tegra210 ADMA support"
+       depends on ARCH_TEGRA_210_SOC
+       select DMA_ENGINE
+       select DMA_VIRTUAL_CHANNELS
+       select PM_CLK
+       help
+         Support for the NVIDIA Tegra210 ADMA controller driver. The
+         DMA controller has multiple DMA channels and is used to service
+         various audio clients in the Tegra210 audio processing engine
+         (APE). This DMA controller transfers data from memory to
+         peripheral and vice versa. It does not support memory to
+         memory data transfer.
+
 config TIMB_DMA
        tristate "Timberdale FPGA DMA support"
        depends on MFD_TIMBERDALE
@@ -507,7 +521,7 @@ config XGENE_DMA
 
 config XILINX_VDMA
        tristate "Xilinx AXI VDMA Engine"
-       depends on (ARCH_ZYNQ || MICROBLAZE)
+       depends on (ARCH_ZYNQ || MICROBLAZE || ARM64)
        select DMA_ENGINE
        help
          Enable support for Xilinx AXI VDMA Soft IP.