From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Nov 2011 01:02:25 +0000 (-0700)
Subject: Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v3.2-rc1~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fba9569924e06da076cb2ad12474bbd82d69f54d;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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
---

fba9569924e06da076cb2ad12474bbd82d69f54d
diff --cc arch/arm/mach-exynos4/Kconfig
index a652735,9f00cf3..44013e0
--- a/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 0d59be3,fee2dd8..e21952d
--- a/arch/arm/mach-exynos4/clock.c
+++ b/arch/arm/mach-exynos4/clock.c
@@@ -503,7 -454,12 +508,7 @@@ static struct clk init_clocks_off[] = 
  		.enable		= exynos4_clk_ip_fsys_ctrl,
  		.ctrlbit	= (1 << 9),
  	}, {
- 		.name		= "pdma",
 -		.name		= "sata",
 -		.parent		= &clk_aclk_133.clk,
 -		.enable		= exynos4_clk_ip_fsys_ctrl,
 -		.ctrlbit	= (1 << 10),
 -	}, {
+ 		.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-s5p64x0/dma.c
index 0e5b3e6,aebf3fc..442dd4a
--- a/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 aaeb44a,d960090..e3ebe96
--- a/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