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

Commit bdad0b9a authored by Nicolas Ferre's avatar Nicolas Ferre
Browse files

ARM: at91/dma: remove platform data from DMA controller 



DMA controller can deduce its configuration data from
the platform. Remove the platform data and match device
types with the compatible ones.

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 9918ceaf

arch/arm/mach-at91/at91sam9g45_devices.c

+1 −8
Original line number Diff line number Diff line
@@ -38,10 +38,6 @@ 
#if defined(CONFIG_AT_HDMAC) || defined(CONFIG_AT_HDMAC_MODULE)

static u64 hdmac_dmamask = DMA_BIT_MASK(32);



static struct at_dma_platform_data atdma_pdata = {

	.nr_channels	= 8,

};



static struct resource hdmac_resources[] = {

	[0] = {

		.start	= AT91SAM9G45_BASE_DMA,
@@ -56,12 +52,11 @@ static struct resource hdmac_resources[] = { 
};



static struct platform_device at_hdmac_device = {

	.name		= "at_hdmac",

	.name		= "at91sam9g45_dma",

	.id		= -1,

	.dev		= {

				.dma_mask		= &hdmac_dmamask,

				.coherent_dma_mask	= DMA_BIT_MASK(32),

				.platform_data		= &atdma_pdata,

	},

	.resource	= hdmac_resources,

	.num_resources	= ARRAY_SIZE(hdmac_resources),
@@ -69,8 +64,6 @@ static struct platform_device at_hdmac_device = { 


void __init at91_add_device_hdmac(void)

{

	dma_cap_set(DMA_MEMCPY, atdma_pdata.cap_mask);

	dma_cap_set(DMA_SLAVE, atdma_pdata.cap_mask);

	platform_device_register(&at_hdmac_device);

}

#else

arch/arm/mach-at91/at91sam9rl_devices.c

+1 −7
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ 
#if defined(CONFIG_AT_HDMAC) || defined(CONFIG_AT_HDMAC_MODULE)

static u64 hdmac_dmamask = DMA_BIT_MASK(32);



static struct at_dma_platform_data atdma_pdata = {

	.nr_channels	= 2,

};



static struct resource hdmac_resources[] = {

	[0] = {

		.start	= AT91SAM9RL_BASE_DMA,
@@ -51,12 +47,11 @@ static struct resource hdmac_resources[] = { 
};



static struct platform_device at_hdmac_device = {

	.name		= "at_hdmac",

	.name		= "at91sam9rl_dma",

	.id		= -1,

	.dev		= {

				.dma_mask		= &hdmac_dmamask,

				.coherent_dma_mask	= DMA_BIT_MASK(32),

				.platform_data		= &atdma_pdata,

	},

	.resource	= hdmac_resources,

	.num_resources	= ARRAY_SIZE(hdmac_resources),
@@ -64,7 +59,6 @@ static struct platform_device at_hdmac_device = { 


void __init at91_add_device_hdmac(void)

{

	dma_cap_set(DMA_MEMCPY, atdma_pdata.cap_mask);

	platform_device_register(&at_hdmac_device);

}

#else