aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2010-03-19 00:46:47 -0400
committerPaul Mundt <lethal@linux-sh.org>2010-03-23 04:19:39 -0400
commit02ca5083f60521d09f13224596564a405108bc4c (patch)
tree610eae56f7731208b00dd3b95b534a1877296c83
parent4bab9d426e6dbd9ea09330919a33d35d5faab400 (diff)
dmaengine: shdma: Common SH_DMA_SLAVE_NUMBER
Move SHDMA_SLAVE_NUMBER from asm/dmaengine.h to shdma.h. Set it to 256 to support a wide range of processors. The amount of memory consumed by this change is limited to 256 bits. While at it, rename to SH_DMA_SLAVE_NUMBER to match with the rest of the file. Signed-off-by: Magnus Damm <damm@opensource.se> Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/include/asm/dmaengine.h1
-rw-r--r--drivers/dma/shdma.c4
-rw-r--r--drivers/dma/shdma.h1
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/include/asm/dmaengine.h b/arch/sh/include/asm/dmaengine.h
index 568e991442b0..abb8d660b6fb 100644
--- a/arch/sh/include/asm/dmaengine.h
+++ b/arch/sh/include/asm/dmaengine.h
@@ -34,7 +34,6 @@ enum {
34 SHDMA_SLAVE_SIUA_RX, 34 SHDMA_SLAVE_SIUA_RX,
35 SHDMA_SLAVE_SIUB_TX, 35 SHDMA_SLAVE_SIUB_TX,
36 SHDMA_SLAVE_SIUB_RX, 36 SHDMA_SLAVE_SIUB_RX,
37 SHDMA_SLAVE_NUMBER, /* Must stay last */
38}; 37};
39 38
40struct sh_dmae_slave_config { 39struct sh_dmae_slave_config {
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index e5588f4868ca..83605389fb56 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -44,7 +44,7 @@ enum sh_dmae_desc_status {
44#define LOG2_DEFAULT_XFER_SIZE 2 44#define LOG2_DEFAULT_XFER_SIZE 2
45 45
46/* A bitmask with bits enough for enum sh_dmae_slave_chan_id */ 46/* A bitmask with bits enough for enum sh_dmae_slave_chan_id */
47static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SHDMA_SLAVE_NUMBER)]; 47static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SH_DMA_SLAVE_NUMBER)];
48 48
49static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all); 49static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all);
50 50
@@ -274,7 +274,7 @@ static struct sh_dmae_slave_config *sh_dmae_find_slave(
274 struct sh_dmae_pdata *pdata = shdev->pdata; 274 struct sh_dmae_pdata *pdata = shdev->pdata;
275 int i; 275 int i;
276 276
277 if (param->slave_id >= SHDMA_SLAVE_NUMBER) 277 if (param->slave_id >= SH_DMA_SLAVE_NUMBER)
278 return NULL; 278 return NULL;
279 279
280 for (i = 0; i < pdata->slave_num; i++) 280 for (i = 0; i < pdata->slave_num; i++)
diff --git a/drivers/dma/shdma.h b/drivers/dma/shdma.h
index 153609a1e96c..d7ddf6f47154 100644
--- a/drivers/dma/shdma.h
+++ b/drivers/dma/shdma.h
@@ -19,6 +19,7 @@
19 19
20#include <asm/dmaengine.h> 20#include <asm/dmaengine.h>
21 21
22#define SH_DMA_SLAVE_NUMBER 256
22#define SH_DMA_TCR_MAX 0x00FFFFFF /* 16MB */ 23#define SH_DMA_TCR_MAX 0x00FFFFFF /* 16MB */
23 24
24struct device; 25struct device;