Merge tag 'dmaengine-5.7-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[linux-2.6-microblaze.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 5142da4..0924836 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -616,8 +616,8 @@ config TXX9_DMAC
          integrated in chips such as the Toshiba TX4927/38/39.
 
 config TEGRA20_APB_DMA
-       bool "NVIDIA Tegra20 APB DMA support"
-       depends on ARCH_TEGRA
+       tristate "NVIDIA Tegra20 APB DMA support"
+       depends on ARCH_TEGRA || COMPILE_TEST
        select DMA_ENGINE
        help
          Support for the NVIDIA Tegra20 APB DMA controller driver. The
@@ -658,6 +658,17 @@ config UNIPHIER_MDMAC
          UniPhier platform.  This DMA controller is used as the external
          DMA engine of the SD/eMMC controllers of the LD4, Pro4, sLD8 SoCs.
 
+config UNIPHIER_XDMAC
+       tristate "UniPhier XDMAC support"
+       depends on ARCH_UNIPHIER || COMPILE_TEST
+       depends on OF
+       select DMA_ENGINE
+       select DMA_VIRTUAL_CHANNELS
+       help
+         Enable support for the XDMAC (external DMA controller) on the
+         UniPhier platform. This DMA controller can transfer data from
+         memory to memory, memory to peripheral and peripheral to memory.
+
 config XGENE_DMA
        tristate "APM X-Gene DMA support"
        depends on ARCH_XGENE || COMPILE_TEST