Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[GitHub/moto-9609/android_kernel_motorola_exynos9610.git] / drivers / dma / Kconfig

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 6ada8b33e46a1c6f66fce9bd5d81a6c9898089da..dd2874ec1927a6dae0e97defce4dfc05aef38d87 100644 (file)
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -154,6 +154,18 @@ 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.
 
          This DMA controller transfers data from memory to peripheral fifo
          or vice versa. It does not support memory to memory data transfer.
 

+config S3C24XX_DMAC
+       tristate "Samsung S3C24XX DMA support"
+       depends on ARCH_S3C24XX && !S3C24XX_DMA
+       select DMA_ENGINE
+       select DMA_VIRTUAL_CHANNELS
+       help
+         Support for the Samsung S3C24XX DMA controller driver. The
+         DMA controller is having multiple DMA channels which can be
+         configured for different peripherals like audio, UART, SPI.
+         The DMA controller can transfer data from memory to peripheral,
+         periphal to memory, periphal to periphal and memory to memory.
+

 source "drivers/dma/sh/Kconfig"
 
 config COH901318
 source "drivers/dma/sh/Kconfig"
 
 config COH901318


@@ -195,9 +207,10 @@ config SIRF_DMA
 
 config TI_EDMA
        bool "TI EDMA support"
 
 config TI_EDMA
        bool "TI EDMA support"

-       depends on ARCH_DAVINCI || ARCH_OMAP
+       depends on ARCH_DAVINCI || ARCH_OMAP || ARCH_KEYSTONE

        select DMA_ENGINE
        select DMA_VIRTUAL_CHANNELS
        select DMA_ENGINE
        select DMA_VIRTUAL_CHANNELS

+       select TI_PRIV_EDMA

        default n
        help
          Enable support for the TI EDMA controller. This DMA
        default n
        help
          Enable support for the TI EDMA controller. This DMA


@@ -308,6 +321,15 @@ config DMA_JZ4740
        select DMA_ENGINE
        select DMA_VIRTUAL_CHANNELS
 
        select DMA_ENGINE
        select DMA_VIRTUAL_CHANNELS
 

+config K3_DMA
+       tristate "Hisilicon K3 DMA support"
+       depends on ARCH_HI3xxx
+       select DMA_ENGINE
+       select DMA_VIRTUAL_CHANNELS
+       help
+         Support the DMA engine for Hisilicon K3 platform
+         devices.
+

 config DMA_ENGINE
        bool
 
 config DMA_ENGINE
        bool