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

Commit 5bac942d authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Paul Mundt
Browse files

SH: constify multiple DMA related objects and references to them 



Lists of DMA channels and slaves are not changed, make them constant. Besides,
SH7724 channel and slave configuration of both DMA controllers is identical,
remove the extra copy of the configuration data.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 6b6b18e6

arch/sh/kernel/cpu/sh4a/setup-sh7722.c

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <cpu/dma-register.h>

#include <cpu/sh7722.h>



static struct sh_dmae_slave_config sh7722_dmae_slaves[] = {

static const struct sh_dmae_slave_config sh7722_dmae_slaves[] = {

	{

		.slave_id	= SHDMA_SLAVE_SCIF0_TX,

		.addr		= 0xffe0000c,
@@ -78,7 +78,7 @@ static struct sh_dmae_slave_config sh7722_dmae_slaves[] = { 
	},

};



static struct sh_dmae_channel sh7722_dmae_channels[] = {

static const struct sh_dmae_channel sh7722_dmae_channels[] = {

	{

		.offset = 0,

		.dmars = 0,
@@ -106,7 +106,7 @@ static struct sh_dmae_channel sh7722_dmae_channels[] = { 
	}

};



static unsigned int ts_shift[] = TS_SHIFT;

static const unsigned int ts_shift[] = TS_SHIFT;



static struct sh_dmae_pdata dma_platform_data = {

	.slave		= sh7722_dmae_slaves,

arch/sh/kernel/cpu/sh4a/setup-sh7724.c

+7 −47
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <cpu/sh7724.h>



/* DMA */

static struct sh_dmae_channel sh7724_dmae0_channels[] = {

static const struct sh_dmae_channel sh7724_dmae_channels[] = {

	{

		.offset = 0,

		.dmars = 0,
@@ -59,51 +59,11 @@ static struct sh_dmae_channel sh7724_dmae0_channels[] = { 
	}

};



static struct sh_dmae_channel sh7724_dmae1_channels[] = {

	{

		.offset = 0,

		.dmars = 0,

		.dmars_bit = 0,

	}, {

		.offset = 0x10,

		.dmars = 0,

		.dmars_bit = 8,

	}, {

		.offset = 0x20,

		.dmars = 4,

		.dmars_bit = 0,

	}, {

		.offset = 0x30,

		.dmars = 4,

		.dmars_bit = 8,

	}, {

		.offset = 0x50,

		.dmars = 8,

		.dmars_bit = 0,

	}, {

		.offset = 0x60,

		.dmars = 8,

		.dmars_bit = 8,

	}

};



static unsigned int ts_shift[] = TS_SHIFT;



static struct sh_dmae_pdata dma0_platform_data = {

	.channel	= sh7724_dmae0_channels,

	.channel_num	= ARRAY_SIZE(sh7724_dmae0_channels),

	.ts_low_shift	= CHCR_TS_LOW_SHIFT,

	.ts_low_mask	= CHCR_TS_LOW_MASK,

	.ts_high_shift	= CHCR_TS_HIGH_SHIFT,

	.ts_high_mask	= CHCR_TS_HIGH_MASK,

	.ts_shift	= ts_shift,

	.ts_shift_num	= ARRAY_SIZE(ts_shift),

	.dmaor_init	= DMAOR_INIT,

};

static const unsigned int ts_shift[] = TS_SHIFT;



static struct sh_dmae_pdata dma1_platform_data = {

	.channel	= sh7724_dmae1_channels,

	.channel_num	= ARRAY_SIZE(sh7724_dmae1_channels),

static struct sh_dmae_pdata dma_platform_data = {

	.channel	= sh7724_dmae_channels,

	.channel_num	= ARRAY_SIZE(sh7724_dmae_channels),

	.ts_low_shift	= CHCR_TS_LOW_SHIFT,

	.ts_low_mask	= CHCR_TS_LOW_MASK,

	.ts_high_shift	= CHCR_TS_HIGH_SHIFT,
@@ -187,7 +147,7 @@ static struct platform_device dma0_device = { 
	.resource	= sh7724_dmae0_resources,

	.num_resources	= ARRAY_SIZE(sh7724_dmae0_resources),

	.dev		= {

		.platform_data	= &dma0_platform_data,

		.platform_data	= &dma_platform_data,

	},

	.archdata = {

		.hwblk_id = HWBLK_DMAC0,
@@ -200,7 +160,7 @@ static struct platform_device dma1_device = { 
	.resource	= sh7724_dmae1_resources,

	.num_resources	= ARRAY_SIZE(sh7724_dmae1_resources),

	.dev		= {

		.platform_data	= &dma1_platform_data,

		.platform_data	= &dma_platform_data,

	},

	.archdata = {

		.hwblk_id = HWBLK_DMAC1,

arch/sh/kernel/cpu/sh4a/setup-sh7780.c

+3 −3
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static struct platform_device rtc_device = { 
};



/* DMA */

static struct sh_dmae_channel sh7780_dmae0_channels[] = {

static const struct sh_dmae_channel sh7780_dmae0_channels[] = {

	{

		.offset = 0,

		.dmars = 0,
@@ -261,7 +261,7 @@ static struct sh_dmae_channel sh7780_dmae0_channels[] = { 
	}

};



static struct sh_dmae_channel sh7780_dmae1_channels[] = {

static const struct sh_dmae_channel sh7780_dmae1_channels[] = {

	{

		.offset = 0,

	}, {
@@ -277,7 +277,7 @@ static struct sh_dmae_channel sh7780_dmae1_channels[] = { 
	}

};



static unsigned int ts_shift[] = TS_SHIFT;

static const unsigned int ts_shift[] = TS_SHIFT;



static struct sh_dmae_pdata dma0_platform_data = {

	.channel	= sh7780_dmae0_channels,

arch/sh/kernel/cpu/sh4a/setup-sh7785.c

+3 −3
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static struct platform_device tmu5_device = { 
};



/* DMA */

static struct sh_dmae_channel sh7785_dmae0_channels[] = {

static const struct sh_dmae_channel sh7785_dmae0_channels[] = {

	{

		.offset = 0,

		.dmars = 0,
@@ -303,7 +303,7 @@ static struct sh_dmae_channel sh7785_dmae0_channels[] = { 
	}

};



static struct sh_dmae_channel sh7785_dmae1_channels[] = {

static const struct sh_dmae_channel sh7785_dmae1_channels[] = {

	{

		.offset = 0,

	}, {
@@ -319,7 +319,7 @@ static struct sh_dmae_channel sh7785_dmae1_channels[] = { 
	}

};



static unsigned int ts_shift[] = TS_SHIFT;

static const unsigned int ts_shift[] = TS_SHIFT;



static struct sh_dmae_pdata dma0_platform_data = {

	.channel	= sh7785_dmae0_channels,

arch/sh/kernel/cpu/sh4a/setup-sh7786.c

+2 −2
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ static struct platform_device tmu11_device = { 
	.num_resources	= ARRAY_SIZE(tmu11_resources),

};



static struct sh_dmae_channel dmac0_channels[] = {

static const struct sh_dmae_channel dmac0_channels[] = {

	{

		.offset = 0,

		.dmars = 0,
@@ -473,7 +473,7 @@ static struct sh_dmae_channel dmac0_channels[] = { 
	}

};



static unsigned int ts_shift[] = TS_SHIFT;

static const unsigned int ts_shift[] = TS_SHIFT;



static struct sh_dmae_pdata dma0_platform_data = {

	.channel	= dmac0_channels,