ARM: davinci: remove mmc dma resources

The davinci_mmc driver no longer uses platform resources for getting dma
channels. Instead lookup is now done using dma_slave_map.

Signed-off-by: David Lechner <david@lechnology.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 725e693639d24a71046f63348515e3457d1347c4..add3771d38f640196a32b5be1deaf329de4dc329 100644 (file)
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -751,16 +751,6 @@ static struct resource da8xx_mmcsd0_resources[] = {
                .end    = IRQ_DA8XX_MMCSDINT0,
                .flags  = IORESOURCE_IRQ,
        },
-       {               /* DMA RX */
-               .start  = DA8XX_DMA_MMCSD0_RX,
-               .end    = DA8XX_DMA_MMCSD0_RX,
-               .flags  = IORESOURCE_DMA,
-       },
-       {               /* DMA TX */
-               .start  = DA8XX_DMA_MMCSD0_TX,
-               .end    = DA8XX_DMA_MMCSD0_TX,
-               .flags  = IORESOURCE_DMA,
-       },
 };
 
 static struct platform_device da8xx_mmcsd0_device = {
@@ -788,16 +778,6 @@ static struct resource da850_mmcsd1_resources[] = {
                .end    = IRQ_DA850_MMCSDINT0_1,
                .flags  = IORESOURCE_IRQ,
        },
-       {               /* DMA RX */
-               .start  = DA850_DMA_MMCSD1_RX,
-               .end    = DA850_DMA_MMCSD1_RX,
-               .flags  = IORESOURCE_DMA,
-       },
-       {               /* DMA TX */
-               .start  = DA850_DMA_MMCSD1_TX,
-               .end    = DA850_DMA_MMCSD1_TX,
-               .flags  = IORESOURCE_DMA,
-       },
 };
 
 static struct platform_device da850_mmcsd1_device = {

diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
index 6257aa4525688e7232c40f2cf87c0847c4ba9baf..67d26c5bda0b9f38d6f2368cb1da43deccaf6088 100644 (file)
--- a/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@ -144,14 +144,6 @@ static struct resource mmcsd0_resources[] = {
                .start = IRQ_SDIOINT,
                .flags = IORESOURCE_IRQ,
        },
-       /* DMA channels: RX, then TX */
-       {
-               .start = EDMA_CTLR_CHAN(0, DAVINCI_DMA_MMCRXEVT),
-               .flags = IORESOURCE_DMA,
-       }, {
-               .start = EDMA_CTLR_CHAN(0, DAVINCI_DMA_MMCTXEVT),
-               .flags = IORESOURCE_DMA,
-       },
 };
 
 static struct platform_device davinci_mmcsd0_device = {
@@ -181,14 +173,6 @@ static struct resource mmcsd1_resources[] = {
                .start = IRQ_DM355_SDIOINT1,
                .flags = IORESOURCE_IRQ,
        },
-       /* DMA channels: RX, then TX */
-       {
-               .start = EDMA_CTLR_CHAN(0, 30), /* rx */
-               .flags = IORESOURCE_DMA,
-       }, {
-               .start = EDMA_CTLR_CHAN(0, 31), /* tx */
-               .flags = IORESOURCE_DMA,
-       },
 };
 
 static struct platform_device davinci_mmcsd1_device = {