From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Oct 2012 02:46:21 +0000 (+1000)
Subject: Merge remote-tracking branch 'slave-dma/next'
X-Git-Tag: next-20121003~53
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b7a7e38cbab00951dc8c677ed3112b64e1ee6fe5;p=karo-tx-linux.git

Merge remote-tracking branch 'slave-dma/next'

Conflicts:
	drivers/dma/mmp_tdma.c
	drivers/mmc/host/davinci_mmc.c
	drivers/spi/spi-davinci.c
---

b7a7e38cbab00951dc8c677ed3112b64e1ee6fe5
diff --cc drivers/dma/mmp_tdma.c
index 07fa48688ba9,b93d73ca84ff..ff7b0f26c8a4
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@@ -19,7 -19,8 +19,8 @@@
  #include <linux/platform_device.h>
  #include <linux/device.h>
  #include <mach/regs-icu.h>
 -#include <mach/sram.h>
+ #include <linux/of_device.h>
 +#include <linux/platform_data/dma-mmp_tdma.h>
  
  #include "dmaengine.h"
  
diff --cc drivers/dma/pl330.c
index 5d3bbcd279b4,28322dced886..13cc576dd7ce
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@@ -2930,11 -2913,6 +2915,11 @@@ pl330_probe(struct amba_device *adev, c
  		num_chan = max_t(int, pi->pcfg.num_peri, pi->pcfg.num_chan);
  
  	pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);
 +	if (!pdmac->peripherals) {
 +		ret = -ENOMEM;
 +		dev_err(&adev->dev, "unable to allocate pdmac->peripherals\n");
- 		goto probe_err5;
++		goto probe_err4;
 +	}
  
  	for (i = 0; i < num_chan; i++) {
  		pch = &pdmac->peripherals[i];
diff --cc drivers/mmc/host/davinci_mmc.c
index 3dfd3473269d,c5e1eebcd588..20636772c09b
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@@ -30,11 -30,12 +30,12 @@@
  #include <linux/io.h>
  #include <linux/irq.h>
  #include <linux/delay.h>
+ #include <linux/dmaengine.h>
  #include <linux/dma-mapping.h>
+ #include <linux/edma.h>
  #include <linux/mmc/mmc.h>
  
 -#include <mach/mmc.h>
 +#include <linux/platform_data/mmc-davinci.h>
- #include <mach/edma.h>
  
  /*
   * Register Definitions
diff --cc drivers/spi/spi-davinci.c
index 3afe2f4f5b8e,c1ec52d46714..147dfa87a64b
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@@ -30,8 -32,7 +32,7 @@@
  #include <linux/spi/spi_bitbang.h>
  #include <linux/slab.h>
  
 -#include <mach/spi.h>
 +#include <linux/platform_data/spi-davinci.h>
- #include <mach/edma.h>
  
  #define SPI_NO_RESOURCE		((resource_size_t)-1)