Merge tag 'xfs-5.5-merge-17' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 7af874b69ffb9e3ea2cfa1cbcc7c4b46be7a4a39..6fa1eba9d4778775c57bdbef8f3c0bbb57b79bfc 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -15,19 +15,19 @@ menuconfig DMADEVICES
          be empty in some cases.
 
 config DMADEVICES_DEBUG
-        bool "DMA Engine debugging"
-        depends on DMADEVICES != n
-        help
-          This is an option for use by developers; most people should
-          say N here.  This enables DMA engine core and driver debugging.
+       bool "DMA Engine debugging"
+       depends on DMADEVICES != n
+       help
+         This is an option for use by developers; most people should
+         say N here.  This enables DMA engine core and driver debugging.
 
 config DMADEVICES_VDEBUG
-        bool "DMA Engine verbose debugging"
-        depends on DMADEVICES_DEBUG != n
-        help
-          This is an option for use by developers; most people should
-          say N here.  This enables deeper (more verbose) debugging of
-          the DMA engine core and drivers.
+       bool "DMA Engine verbose debugging"
+       depends on DMADEVICES_DEBUG != n
+       help
+         This is an option for use by developers; most people should
+         say N here.  This enables deeper (more verbose) debugging of
+         the DMA engine core and drivers.
 
 
 if DMADEVICES
@@ -215,28 +215,28 @@ config FSL_EDMA
          This module can be found on Freescale Vybrid and LS-1 SoCs.
 
 config FSL_QDMA
-       tristate "NXP Layerscape qDMA engine support"
-       depends on ARM || ARM64
-       select DMA_ENGINE
-       select DMA_VIRTUAL_CHANNELS
-       select DMA_ENGINE_RAID
-       select ASYNC_TX_ENABLE_CHANNEL_SWITCH
-       help
-         Support the NXP Layerscape qDMA engine with command queue and legacy mode.
-         Channel virtualization is supported through enqueuing of DMA jobs to,
-         or dequeuing DMA jobs from, different work queues.
-         This module can be found on NXP Layerscape SoCs.
+       tristate "NXP Layerscape qDMA engine support"
+       depends on ARM || ARM64
+       select DMA_ENGINE
+       select DMA_VIRTUAL_CHANNELS
+       select DMA_ENGINE_RAID
+       select ASYNC_TX_ENABLE_CHANNEL_SWITCH
+       help
+        Support the NXP Layerscape qDMA engine with command queue and legacy mode.
+        Channel virtualization is supported through enqueuing of DMA jobs to,
+        or dequeuing DMA jobs from, different work queues.
+        This module can be found on NXP Layerscape SoCs.
          The qdma driver only work on  SoCs with a DPAA hardware block.
 
 config FSL_RAID
-        tristate "Freescale RAID engine Support"
-        depends on FSL_SOC && !ASYNC_TX_ENABLE_CHANNEL_SWITCH
-        select DMA_ENGINE
-        select DMA_ENGINE_RAID
-        ---help---
-          Enable support for Freescale RAID Engine. RAID Engine is
-          available on some QorIQ SoCs (like P5020/P5040). It has
-          the capability to offload memcpy, xor and pq computation
+       tristate "Freescale RAID engine Support"
+       depends on FSL_SOC && !ASYNC_TX_ENABLE_CHANNEL_SWITCH
+       select DMA_ENGINE
+       select DMA_ENGINE_RAID
+       ---help---
+         Enable support for Freescale RAID Engine. RAID Engine is
+         available on some QorIQ SoCs (like P5020/P5040). It has
+         the capability to offload memcpy, xor and pq computation
          for raid5/6.
 
 config IMG_MDC_DMA
@@ -342,6 +342,26 @@ config MCF_EDMA
          minimal intervention from a host processor.
          This module can be found on Freescale ColdFire mcf5441x SoCs.
 
+config MILBEAUT_HDMAC
+       tristate "Milbeaut AHB DMA support"
+       depends on ARCH_MILBEAUT || COMPILE_TEST
+       depends on OF
+       select DMA_ENGINE
+       select DMA_VIRTUAL_CHANNELS
+       help
+         Say yes here to support the Socionext Milbeaut
+         HDMAC device.
+
+config MILBEAUT_XDMAC
+       tristate "Milbeaut AXI DMA support"
+       depends on ARCH_MILBEAUT || COMPILE_TEST
+       depends on OF
+       select DMA_ENGINE
+       select DMA_VIRTUAL_CHANNELS
+       help
+         Say yes here to support the Socionext Milbeaut
+         XDMAC device.
+
 config MMP_PDMA
        bool "MMP PDMA support"
        depends on ARCH_MMP || ARCH_PXA || COMPILE_TEST
@@ -635,6 +655,10 @@ config XILINX_DMA
          destination address.
          AXI DMA engine provides high-bandwidth one dimensional direct
          memory access between memory and AXI4-Stream target peripherals.
+         AXI MCDMA engine provides high-bandwidth direct memory access
+         between memory and AXI4-Stream target peripherals. It provides
+         the scatter gather interface with multiple channels independent
+         configuration support.
 
 config XILINX_ZYNQMP_DMA
        tristate "Xilinx ZynqMP DMA Engine"
@@ -665,10 +689,14 @@ source "drivers/dma/dw-edma/Kconfig"
 
 source "drivers/dma/hsu/Kconfig"
 
+source "drivers/dma/sf-pdma/Kconfig"
+
 source "drivers/dma/sh/Kconfig"
 
 source "drivers/dma/ti/Kconfig"
 
+source "drivers/dma/fsl-dpaa2-qdma/Kconfig"
+
 # clients
 comment "DMA Clients"
        depends on DMA_ENGINE