lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmaengine: shdma: Common SH_DMA_SLAVE_NUMBER

Browse Source 
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>
This commit is contained in:
Magnus Damm
2010-03-19 04:46:47 +00:00
committed by Paul Mundt
parent 4bab9d426e
commit 02ca5083f6
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/sh/include/asm/dmaengine.h
View File

@@ -34,7 +34,6 @@ enum {
SHDMA_SLAVE_SIUA_RX, SHDMA_SLAVE_SIUA_RX,
SHDMA_SLAVE_SIUB_TX, SHDMA_SLAVE_SIUB_TX,
SHDMA_SLAVE_SIUB_RX, SHDMA_SLAVE_SIUB_RX,
SHDMA_SLAVE_NUMBER, /* Must stay last */
}; };
struct sh_dmae_slave_config { struct sh_dmae_slave_config {

4
drivers/dma/shdma.c
View File

@@ -44,7 +44,7 @@ enum sh_dmae_desc_status {
#define LOG2_DEFAULT_XFER_SIZE 2 #define LOG2_DEFAULT_XFER_SIZE 2
/* A bitmask with bits enough for enum sh_dmae_slave_chan_id */ /* A bitmask with bits enough for enum sh_dmae_slave_chan_id */
static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SHDMA_SLAVE_NUMBER)]; static unsigned long sh_dmae_slave_used[BITS_TO_LONGS(SH_DMA_SLAVE_NUMBER)];
static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all); static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all);
@@ -274,7 +274,7 @@ static struct sh_dmae_slave_config *sh_dmae_find_slave(
struct sh_dmae_pdata *pdata = shdev->pdata; struct sh_dmae_pdata *pdata = shdev->pdata;
int i; int i;
if (param->slave_id >= SHDMA_SLAVE_NUMBER) if (param->slave_id >= SH_DMA_SLAVE_NUMBER)
return NULL; return NULL;
for (i = 0; i < pdata->slave_num; i++) for (i = 0; i < pdata->slave_num; i++)

1
drivers/dma/shdma.h
View File

@@ -19,6 +19,7 @@
#include <asm/dmaengine.h> #include <asm/dmaengine.h>
#define SH_DMA_SLAVE_NUMBER 256
#define SH_DMA_TCR_MAX 0x00FFFFFF /* 16MB */ #define SH_DMA_TCR_MAX 0x00FFFFFF /* 16MB */
struct device; struct device;