Merge branch 'topic/sprd' into for-linus

Kconfig and Makefile conflicts so put them in right order (sprd ones after
stm ones)

Signed-off-by: Vinod Koul <vinod.koul@intel.com>

diff --cc drivers/dma/Kconfig
index 4002d1c6522174202c7c26349f1c0d2626af71f7,a2aa7fe6b7a1a4f07b5d0df094b178bd0b9b9a14..27df3e2837fdec03212085a5dc433307989baea2
--- 1/drivers/dma/Kconfig
--- 2/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@@ -483,27 -483,14 +483,35 @@@ config STM32_DM
          If you have a board based on such a MCU and wish to use DMA say Y
          here.
  
 +config STM32_DMAMUX
 +      bool "STMicroelectronics STM32 dma multiplexer support"
 +      depends on STM32_DMA || COMPILE_TEST
 +      help
 +        Enable support for the on-chip DMA multiplexer on STMicroelectronics
 +        STM32 MCUs.
 +        If you have a board based on such a MCU and wish to use DMAMUX say Y
 +        here.
 +
 +config STM32_MDMA
 +      bool "STMicroelectronics STM32 master dma support"
 +      depends on ARCH_STM32 || COMPILE_TEST
 +      depends on OF
 +      select DMA_ENGINE
 +      select DMA_VIRTUAL_CHANNELS
 +      help
 +        Enable support for the on-chip MDMA controller on STMicroelectronics
 +        STM32 platforms.
 +        If you have a board based on STM32 SoC and wish to use the master DMA
 +        say Y here.
 +
+ config SPRD_DMA
+       tristate "Spreadtrum DMA support"
+       depends on ARCH_SPRD || COMPILE_TEST
+       select DMA_ENGINE
+       select DMA_VIRTUAL_CHANNELS
+       help
+         Enable support for the on-chip DMA controller on Spreadtrum platform.
+ 
  config S3C24XX_DMAC
        bool "Samsung S3C24XX DMA support"
        depends on ARCH_S3C24XX || COMPILE_TEST

diff --cc drivers/dma/Makefile
index 4d2376fdea019380e433cdc494fc6d8f07aedf5c,9e7ec340826a0da3e016fd305949d9facb003924..774546e89a400852b2eacc3e7d7a51223a6361ff
--- 1/drivers/dma/Makefile
--- 2/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@@ -59,8 -59,7 +59,9 @@@ obj-$(CONFIG_RENESAS_DMA) += sh
  obj-$(CONFIG_SIRF_DMA) += sirf-dma.o
  obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o
  obj-$(CONFIG_STM32_DMA) += stm32-dma.o
 +obj-$(CONFIG_STM32_DMAMUX) += stm32-dmamux.o
 +obj-$(CONFIG_STM32_MDMA) += stm32-mdma.o
+ obj-$(CONFIG_SPRD_DMA) += sprd-dma.o
  obj-$(CONFIG_S3C24XX_DMAC) += s3c24xx-dma.o
  obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
  obj-$(CONFIG_TEGRA20_APB_DMA) += tegra20-apb-dma.o