Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02ca5083 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

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: default avatarMagnus Damm <damm@opensource.se>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 4bab9d42

arch/sh/include/asm/dmaengine.h

+0 −1
Original line number Diff line number Diff line
@@ -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 {

drivers/dma/shdma.c

+2 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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++)

drivers/dma/shdma.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <asm/dmaengine.h>



#define SH_DMA_SLAVE_NUMBER 256

#define SH_DMA_TCR_MAX 0x00FFFFFF	/* 16MB */



struct device;