From: Olof Johansson <olof@lixom.net>
Date: Mon, 28 Jan 2013 21:37:09 +0000 (-0800)
Subject: Merge tag 'coh901318-for-arm-soc' of http://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~3680^2~1073^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=43243322139194c2fea606095f82498e07536c27;p=firefly-linux-kernel-4.4.55.git

Merge tag 'coh901318-for-arm-soc' of git./linux/kernel/git/linusw/linux-stericsson into next/drivers

This pushes the platform data for the U300 COH901318
DMA controller down into the driver and cleans up in
the <mach/*> namespace for the U300 platform.

* tag 'coh901318-for-arm-soc' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  dma: coh901318: cut down on platform data abstraction
  dma: coh901318: merge header files
  dma: coh901318: push definitions into driver
  dma: coh901318: push header down into the DMA subsystem
  dma: coh901318: skip hard-coded addresses
  dma: coh901318: remove hardcoded target addresses
  dma: coh901318: push platform data into driver
  dma: coh901318: create a proper platform data file

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/mach-u300/core.c
---

43243322139194c2fea606095f82498e07536c27
diff --cc arch/arm/mach-u300/core.c
index 12060ae4e8f1,19f5c5311f47..a683d17b2ce4
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@@ -31,7 -31,7 +31,8 @@@
  #include <linux/dma-mapping.h>
  #include <linux/platform_data/clk-u300.h>
  #include <linux/platform_data/pinctrl-coh901.h>
+ #include <linux/platform_data/dma-coh901318.h>
 +#include <linux/irqchip/arm-vic.h>
  
  #include <asm/types.h>
  #include <asm/setup.h>