On Mon, 2011-10-10 at 18:37 +0200, Nicolas Ferre wrote: > DMA controller can deduce its configuration data from > the platform. Remove the platform data and match device > types with the compatible ones. This looks like remove, you should fix the changelog of patch 1 then. > > Signed-off-by: Nicolas Ferre <[email protected]> > --- > arch/arm/mach-at91/at91sam9g45_devices.c | 9 +-------- > arch/arm/mach-at91/at91sam9rl_devices.c | 8 +------- > 2 files changed, 2 insertions(+), 15 deletions(-) > > diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c > b/arch/arm/mach-at91/at91sam9g45_devices.c > index 600bffb..c9b897f 100644 > --- a/arch/arm/mach-at91/at91sam9g45_devices.c > +++ b/arch/arm/mach-at91/at91sam9g45_devices.c > @@ -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 = AT91_BASE_SYS + AT91_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 > diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c > b/arch/arm/mach-at91/at91sam9rl_devices.c > index aacb19d..81954f7 100644 > --- a/arch/arm/mach-at91/at91sam9rl_devices.c > +++ b/arch/arm/mach-at91/at91sam9rl_devices.c > @@ -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 = AT91_BASE_SYS + AT91_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
-- ~Vinod _______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
