davinci: EDMA: multiple CCs, channel mapping and API changes

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-davinci / devices.c

diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
index de16f347566a7e21a63e0678f181c8f7c1d974b7..7a2f8ae89be2b46c7d9a28202da2777e9547d7ba 100644 (file)
--- a/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@ -82,10 +82,10 @@ static struct resource mmcsd0_resources[] = {
        },
        /* DMA channels: RX, then TX */
        {
-               .start = DAVINCI_DMA_MMCRXEVT,
+               .start = EDMA_CTLR_CHAN(0, DAVINCI_DMA_MMCRXEVT),
                .flags = IORESOURCE_DMA,
        }, {
-               .start = DAVINCI_DMA_MMCTXEVT,
+               .start = EDMA_CTLR_CHAN(0, DAVINCI_DMA_MMCTXEVT),
                .flags = IORESOURCE_DMA,
        },
 };
@@ -119,10 +119,10 @@ static struct resource mmcsd1_resources[] = {
        },
        /* DMA channels: RX, then TX */
        {
-               .start = 30,    /* rx */
+               .start = EDMA_CTLR_CHAN(0, 30), /* rx */
                .flags = IORESOURCE_DMA,
        }, {
-               .start = 31,    /* tx */
+               .start = EDMA_CTLR_CHAN(0, 31), /* tx */
                .flags = IORESOURCE_DMA,
        },
 };