Merge branch 'dmaengine' of git://git.linaro.org/people/rmk/linux-arm

[karo-tx-linux.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 6f93365d9d04727f33c80109058ed892b3ead51c..d06ea2950dd9ffb9ad266bcedbb2db934e020376 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -149,6 +149,20 @@ config TXX9_DMAC
          Support the TXx9 SoC internal DMA controller.  This can be
          integrated in chips such as the Toshiba TX4927/38/39.
 
+config TEGRA20_APB_DMA
+       bool "NVIDIA Tegra20 APB DMA support"
+       depends on ARCH_TEGRA
+       select DMA_ENGINE
+       help
+         Support for the NVIDIA Tegra20 APB DMA controller driver. The
+         DMA controller is having multiple DMA channel which can be
+         configured for different peripherals like audio, UART, SPI,
+         I2C etc which is in APB bus.
+         This DMA controller transfers data from memory to peripheral fifo
+         or vice versa. It does not support memory to memory data transfer.
+
+
+
 config SH_DMAE
        tristate "Renesas SuperH DMAC support"
        depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE)
@@ -238,7 +252,7 @@ config IMX_DMA
 
 config MXS_DMA
        bool "MXS DMA support"
-       depends on SOC_IMX23 || SOC_IMX28
+       depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q
        select STMP_DEVICE
        select DMA_ENGINE
        help
@@ -262,6 +276,16 @@ config DMA_SA11X0
          SA-1110 SoCs.  This DMA engine can only be used with on-chip
          devices.
 
+config MMP_TDMA
+       bool "MMP Two-Channel DMA support"
+       depends on ARCH_MMP
+       select DMA_ENGINE
+       help
+         Support the MMP Two-Channel DMA engine.
+         This engine used for MMP Audio DMA and pxa910 SQU.
+
+         Say Y here if you enabled MMP ADMA, otherwise say N.
+
 config DMA_OMAP
        tristate "OMAP DMA support"
        depends on ARCH_OMAP