diff options
| author | Magnus Damm <damm@opensource.se> | 2010-03-19 04:47:10 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-23 17:20:06 +0900 |
| commit | b2623a61cfd3c6badb8396dc85ab5a70f4a05f61 (patch) | |
| tree | 186d032c4005f37be7af1d657f193405cd7d3af3 /drivers/dma | |
| parent | f354a38175f5219146f4675dca770e114cf3c502 (diff) | |
| download | linux-3.10-b2623a61cfd3c6badb8396dc85ab5a70f4a05f61.tar.gz linux-3.10-b2623a61cfd3c6badb8396dc85ab5a70f4a05f61.tar.bz2 linux-3.10-b2623a61cfd3c6badb8396dc85ab5a70f4a05f61.zip | |
dmaengine: shdma: Introduce include/linux/sh_dma.h
Create a common platform data header file for the
shdma dmaengine driver. This is done by moving
common structures from sh asm/dmaengine.h to
linux/sh_dma.h. DMA registers are also copied from
sh asm/dma-register.h to make the code architecture
independent.
The sh header file asm/dmaengine.h is still kept
with the slave id enum. This allows us to keep the
old processor specific code as is and slowly move
over to slave id enums in per-processor headers.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/shdma.c | 3 | ||||
| -rw-r--r-- | drivers/dma/shdma.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c index 83605389fb5..7a18b580f62 100644 --- a/drivers/dma/shdma.c +++ b/drivers/dma/shdma.c @@ -25,8 +25,7 @@ #include <linux/dma-mapping.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> - -#include <asm/dmaengine.h> +#include <linux/sh_dma.h> #include "shdma.h" diff --git a/drivers/dma/shdma.h b/drivers/dma/shdma.h index d7ddf6f4715..4021275a0a4 100644 --- a/drivers/dma/shdma.h +++ b/drivers/dma/shdma.h @@ -17,8 +17,7 @@ #include <linux/interrupt.h> #include <linux/list.h> -#include <asm/dmaengine.h> - +#define SH_DMAC_MAX_CHANNELS 6 #define SH_DMA_SLAVE_NUMBER 256 #define SH_DMA_TCR_MAX 0x00FFFFFF /* 16MB */ |