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

* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (63 commits)
  dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle
  dmaengine/ep93xx_dma: add module.h include
  pch_dma: Reduce wasting memory
  pch_dma: Fix suspend issue
  dma/timberdale: free_irq() on an error path
  dma: shdma: transfer based runtime PM
  dmaengine: shdma: protect against the IRQ handler
  dmaengine i.MX DMA/SDMA: add missing include of linux/module.h
  dmaengine: delete redundant chan_id and chancnt initialization in dma drivers
  dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool
  dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers
  serial: sh-sci: don't filter on DMA device, use only channel ID
  ARM: SAMSUNG: Remove Samsung specific enum type for dma direction
  ASoC: Samsung: Update DMA interface
  spi/s3c64xx: Merge dma control code
  spi/s3c64xx: Add support DMA engine API
  ARM: SAMSUNG: Remove S3C-PL330-DMA driver
  ARM: S5P64X0: Use generic DMA PL330 driver
  ARM: S5PC100: Use generic DMA PL330 driver
  ARM: S5PV210: Use generic DMA PL330 driver
  ...

Fix up fairly trivial conflicts in
 - arch/arm/mach-exynos4/{Kconfig,clock.c}
 - arch/arm/mach-s5p64x0/dma.c

diff --cc arch/arm/mach-exynos4/Kconfig
index a65273598036011e4d05af2d58a544532adfa830,9f00cf3450dff75a26296f95c74937e9c63c0465..44013e0672fed751614e48528238f51f9061df8b
--- 1/arch/arm/mach-exynos4/Kconfig
--- 2/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@@ -11,8 -11,7 +11,8 @@@ if ARCH_EXYNOS
  
  config CPU_EXYNOS4210
        bool
-       select S3C_PL330_DMA
+       select SAMSUNG_DMADEV
 +      select ARM_CPU_SUSPEND if PM
        help
          Enable EXYNOS4210 CPU support
  

diff --cc arch/arm/mach-exynos4/clock.c
index 0d59be3fa1fea777fe5696bc307ceb3ce6dd7b67,fee2dd8791d01ba4e3f46e782b7ed3d7db1b0fd7..e21952dfb7e196d4c08d44d71548966aad8e8162
--- 1/arch/arm/mach-exynos4/clock.c
--- 2/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.c
@@@ -502,8 -453,13 +507,8 @@@ static struct clk init_clocks_off[] = 
                .parent         = &clk_aclk_133.clk,
                .enable         = exynos4_clk_ip_fsys_ctrl,
                .ctrlbit        = (1 << 9),
 -      }, {
 -              .name           = "sata",
 -              .parent         = &clk_aclk_133.clk,
 -              .enable         = exynos4_clk_ip_fsys_ctrl,
 -              .ctrlbit        = (1 << 10),
        }, {
-               .name           = "pdma",
+               .name           = "dma",
                .devname        = "s3c-pl330.0",
                .enable         = exynos4_clk_ip_fsys_ctrl,
                .ctrlbit        = (1 << 0),
@@@ -1281,6 -1215,7 +1286,11 @@@ void __init exynos4_register_clocks(voi
        s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
        s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
  
++<<<<<<< HEAD
 +      register_syscore_ops(&exynos4_clock_syscore_ops);
++=======
+       s3c24xx_register_clock(&dummy_apb_pclk);
+ 
++>>>>>>> 4598fc2c94b68740e0269db03c98a1e7ad5af773
        s3c_pwmclk_init();
  }

diff --cc arch/arm/mach-s3c2412/dma.c
Simple merge

diff --cc arch/arm/mach-s5p64x0/dma.c
index 0e5b3e63e5b3f388382dc54cb68b31e05677b8f4,aebf3fcb1ebe19244833fee86a0f7a5bafa9ce92..442dd4ad12da61a02694e97923ca53386a7854ad
--- 1/arch/arm/mach-s5p64x0/dma.c
--- 2/arch/arm/mach-s5p64x0/dma.c
+++ b/arch/arm/mach-s5p64x0/dma.c
@@@ -27,10 -30,10 +30,11 @@@
  #include <mach/map.h>
  #include <mach/irqs.h>
  #include <mach/regs-clock.h>
+ #include <mach/dma.h>
  
 +#include <plat/cpu.h>
  #include <plat/devs.h>
- #include <plat/s3c-pl330-pdata.h>
+ #include <plat/irqs.h>
  
  static u64 dma_dmamask = DMA_BIT_MASK(32);
  

diff --cc arch/arm/mach-s5pv210/Kconfig
index aaeb44a73716349f5fa3e18a165b229ced31f18f,d960090e4656c7afcdc374cc284f8bcdce58e30c..e3ebe96923c8c2954570e7b3993c20d56295b9df
--- 1/arch/arm/mach-s5pv210/Kconfig
--- 2/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@@ -11,9 -11,10 +11,9 @@@ if ARCH_S5PV21
  
  config CPU_S5PV210
        bool
-       select S3C_PL330_DMA
+       select SAMSUNG_DMADEV
        select S5P_EXT_INT
        select S5P_HRT
 -      select S5PV210_PM if PM
        help
          Enable S5PV210 CPU support
  

diff --cc arch/arm/mach-s5pv210/clock.c
Simple merge

diff --cc arch/arm/plat-samsung/Kconfig
Simple merge

diff --cc arch/arm/plat-samsung/Makefile
Simple merge

diff --cc arch/arm/plat-samsung/include/plat/dma-s3c24xx.h
Simple merge

diff --cc drivers/mmc/host/s3cmci.c
Simple merge

diff --cc drivers/tty/serial/sh-sci.c
Simple merge

diff --cc sound/soc/samsung/ac97.c
Simple merge