Merge branch 'topic/zxdma' into for-linus

diff --combined drivers/dma/Kconfig
index 0b114c8996af69028278a467bd232d9ba0026f13,bcbfc6b3b71b520d82f9c7e2732bfe21267e579d..84682538610e185ad91f26fd9ba6735268a7fd16
--- 1/drivers/dma/Kconfig
--- 2/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@@ -63,18 -63,9 +63,18 @@@ config AMBA_PL08
          Platform has a PL08x DMAC device
          which can provide DMA engine support
  
 +config LPC18XX_DMAMUX
 +      bool "NXP LPC18xx/43xx DMA MUX for PL080"
 +      depends on ARCH_LPC18XX || COMPILE_TEST
 +      depends on OF && AMBA_PL08X
 +      select MFD_SYSCON
 +      help
 +        Enable support for DMA on NXP LPC18xx/43xx platforms
 +        with PL080 and multiplexed DMA request lines.
 +
  config INTEL_IOATDMA
        tristate "Intel I/OAT DMA support"
 -      depends on PCI && X86
 +      depends on PCI && X86_64
        select DMA_ENGINE
        select DMA_ENGINE_RAID
        select DCA
@@@ -434,17 -425,6 +434,17 @@@ config XILINX_VDM
          channels, Memory Mapped to Stream (MM2S) and Stream to
          Memory Mapped (S2MM) for the data transfers.
  
 +config DMA_SUN4I
 +      tristate "Allwinner A10 DMA SoCs support"
 +      depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || COMPILE_TEST
 +      default (MACH_SUN4I || MACH_SUN5I || MACH_SUN7I)
 +      select DMA_ENGINE
 +      select DMA_OF
 +      select DMA_VIRTUAL_CHANNELS
 +      help
 +        Enable support for the DMA controller present in the sun4i,
 +        sun5i and sun7i Allwinner ARM SoCs.
 +
  config DMA_SUN6I
        tristate "Allwinner A31 SoCs DMA support"
        depends on MACH_SUN6I || MACH_SUN8I || COMPILE_TEST
@@@ -478,6 -458,13 +478,13 @@@ config XGENE_DM
        select ASYNC_TX_ENABLE_CHANNEL_SWITCH
        help
          Enable support for the APM X-Gene SoC DMA engine.
+ config ZX_DMA
+       tristate "ZTE ZX296702 DMA support"
+       depends on ARCH_ZX
+       select DMA_ENGINE
+       select DMA_VIRTUAL_CHANNELS
+       help
+         Support the DMA engine for ZTE ZX296702 platform devices.
  
  config DMA_ENGINE
        bool

diff --combined drivers/dma/Makefile
index e707ff956164cfafe9de63e62d2b6ef2afede9a2,c4c1ccb0013845bfb1ca6d6d33bf3870559f46d4..d056a8ad6ab170a8cde67c781ca13b7547b9007a
--- 1/drivers/dma/Makefile
--- 2/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@@ -32,7 -32,6 +32,7 @@@ obj-$(CONFIG_TI_EDMA) += edma.
  obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o
  obj-$(CONFIG_TEGRA20_APB_DMA) += tegra20-apb-dma.o
  obj-$(CONFIG_S3C24XX_DMAC) += s3c24xx-dma.o
 +obj-$(CONFIG_LPC18XX_DMAMUX) += lpc18xx-dmamux.o
  obj-$(CONFIG_PL330_DMA) += pl330.o
  obj-$(CONFIG_PCH_DMA) += pch_dma.o
  obj-$(CONFIG_AMBA_PL08X) += amba-pl08x.o
@@@ -55,6 -54,6 +55,7 @@@ obj-y += xilinx
  obj-$(CONFIG_INTEL_MIC_X100_DMA) += mic_x100_dma.o
  obj-$(CONFIG_NBPFAXI_DMA) += nbpfaxi.o
  obj-$(CONFIG_DMA_SUN6I) += sun6i-dma.o
 +obj-$(CONFIG_DMA_SUN4I) += sun4i-dma.o
  obj-$(CONFIG_IMG_MDC_DMA) += img-mdc-dma.o
  obj-$(CONFIG_XGENE_DMA) += xgene-dma.o
+ obj-$(CONFIG_ZX_DMA) += zx296702_dma.o