Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine update from Vinod Koul:
 "This time we have a new dmaengine driver from the tegra folks.  Also
  we have Guennadi's cleanup of sh drivers which incudes a library for
  sh drivers.  And the usual odd fixes in bunch of drivers and some nice
  cleanup of dw_dmac from Andy."

Fix up conflicts in drivers/mmc/host/sh_mmcif.c

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits)
  dmaengine: Cleanup logging messages
  mmc: sh_mmcif: switch to the new DMA channel allocation and configuration
  dma: sh: provide a migration path for slave drivers to stop using .private
  dma: sh: use an integer slave ID to improve API compatibility
  dmaengine: shdma: prepare to stop using struct dma_chan::private
  sh: remove unused DMA device pointer from SIU platform data
  ASoC: siu: don't use DMA device for channel filtering
  dmaengine: shdma: (cosmetic) simplify a static function
  dmaengine: at_hdmac: add a few const qualifiers
  dw_dmac: use 'u32' for LLI structure members, not dma_addr_t
  dw_dmac: mark dwc_dump_lli inline
  dma: mxs-dma: Export missing symbols from mxs-dma.c
  dma: shdma: convert to the shdma base library
  ASoC: fsi: prepare for conversion to the shdma base library
  usb: renesas_usbhs: prepare for conversion to the shdma base library
  ASoC: siu: prepare for conversion to the shdma base library
  serial: sh-sci: prepare for conversion to the shdma base library
  mmc: sh_mobile_sdhi: prepare for conversion to the shdma base library
  mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare to shdma conversion
  dma: shdma: prepare for conversion to the shdma base library
  ...

1 files changed, 25 insertions, 1 deletions

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index aadeb5be9dba..d45cf1bcbde5 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -148,6 +148,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)
@@ -237,7 +251,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
@@ -260,6 +274,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_ENGINE
         bool