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

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/arm/mach-s3c64xx/dma.c b/arch/arm/mach-s3c64xx/dma.c
index 204bfafe4bfc..67c97fab62fd 100644
--- a/arch/arm/mach-s3c64xx/dma.c
+++ b/arch/arm/mach-s3c64xx/dma.c
@@ -147,14 +147,14 @@ static void s3c64xx_dma_fill_lli(struct s3c2410_dma_chan *chan,
         u32 control0, control1;
 
         switch (chan->source) {
-        case S3C2410_DMASRC_HW:
+        case DMA_FROM_DEVICE:
                 src = chan->dev_addr;
                 dst = data;
                 control0 = PL080_CONTROL_SRC_AHB2;
                 control0 |= PL080_CONTROL_DST_INCR;
                 break;
 
-        case S3C2410_DMASRC_MEM:
+        case DMA_TO_DEVICE:
                 src = data;
                 dst = chan->dev_addr;
                 control0 = PL080_CONTROL_DST_AHB2;
@@ -416,7 +416,7 @@ EXPORT_SYMBOL(s3c2410_dma_enqueue);
 
 
 int s3c2410_dma_devconfig(enum dma_ch channel,
-                          enum s3c2410_dmasrc source,
+                          enum dma_data_direction source,
                           unsigned long devaddr)
 {
         struct s3c2410_dma_chan *chan = s3c_dma_lookup_channel(channel);
@@ -437,11 +437,11 @@ int s3c2410_dma_devconfig(enum dma_ch channel,
         pr_debug("%s: peripheral %d\n", __func__, peripheral);
 
         switch (source) {
-        case S3C2410_DMASRC_HW:
+        case DMA_FROM_DEVICE:
                 config = 2 << PL080_CONFIG_FLOW_CONTROL_SHIFT;
                 config |= peripheral << PL080_CONFIG_SRC_SEL_SHIFT;
                 break;
-        case S3C2410_DMASRC_MEM:
+        case DMA_TO_DEVICE:
                 config = 1 << PL080_CONFIG_FLOW_CONTROL_SHIFT;
                 config |= peripheral << PL080_CONFIG_DST_SEL_SHIFT;
                 break;