Skip to content

Commit

Permalink
dmaengine: shdma: Common SH_DMA_SLAVE_NUMBER
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Magnus Damm authored and Paul Mundt committed Mar 23, 2010
1 parent 4bab9d4 commit 02ca508
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
1 change: 0 additions & 1 deletion arch/sh/include/asm/dmaengine.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ enum {
SHDMA_SLAVE_SIUA_RX,
SHDMA_SLAVE_SIUB_TX,
SHDMA_SLAVE_SIUB_RX,
SHDMA_SLAVE_NUMBER, /* Must stay last */
};

struct sh_dmae_slave_config {
Expand Down
4 changes: 2 additions & 2 deletions drivers/dma/shdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ enum sh_dmae_desc_status {
#define LOG2_DEFAULT_XFER_SIZE 2

/* 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);

Expand Down Expand Up @@ -274,7 +274,7 @@ static struct sh_dmae_slave_config *sh_dmae_find_slave(
struct sh_dmae_pdata *pdata = shdev->pdata;
int i;

if (param->slave_id >= SHDMA_SLAVE_NUMBER)
if (param->slave_id >= SH_DMA_SLAVE_NUMBER)
return NULL;

for (i = 0; i < pdata->slave_num; i++)
Expand Down
1 change: 1 addition & 0 deletions drivers/dma/shdma.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

#include <asm/dmaengine.h>

#define SH_DMA_SLAVE_NUMBER 256
#define SH_DMA_TCR_MAX 0x00FFFFFF /* 16MB */

struct device;
Expand Down

0 comments on commit 02ca508

Please sign in to comment.