]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ARM: davinci: dm646x: Clean up the McASP DMA resources
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Thu, 12 Mar 2015 08:06:29 +0000 (10:06 +0200)
committerSekhar Nori <nsekhar@ti.com>
Wed, 18 Mar 2015 10:22:05 +0000 (15:52 +0530)
Add names to the DMA resources and remove the RX DMA dummy part for McASP1.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
arch/arm/mach-davinci/dm646x.c

index 6c3bbea7d77d8f8f2432ec9321936cedf2e942f5..d2a2619aee81d7d844b3473f0c8289f94e0cc27f 100644 (file)
@@ -610,19 +610,21 @@ static struct resource dm646x_mcasp0_resources[] = {
                .end    = DAVINCI_DM646X_MCASP0_REG_BASE + (SZ_1K << 1) - 1,
                .flags  = IORESOURCE_MEM,
        },
-       /* first TX, then RX */
        {
+               .name   = "tx",
                .start  = DAVINCI_DM646X_DMA_MCASP0_AXEVT0,
                .end    = DAVINCI_DM646X_DMA_MCASP0_AXEVT0,
                .flags  = IORESOURCE_DMA,
        },
        {
+               .name   = "rx",
                .start  = DAVINCI_DM646X_DMA_MCASP0_AREVT0,
                .end    = DAVINCI_DM646X_DMA_MCASP0_AREVT0,
                .flags  = IORESOURCE_DMA,
        },
 };
 
+/* DIT mode only, rx is not supported */
 static struct resource dm646x_mcasp1_resources[] = {
        {
                .name   = "mpu",
@@ -630,18 +632,12 @@ static struct resource dm646x_mcasp1_resources[] = {
                .end    = DAVINCI_DM646X_MCASP1_REG_BASE + (SZ_1K << 1) - 1,
                .flags  = IORESOURCE_MEM,
        },
-       /* DIT mode, only TX event */
        {
+               .name   = "tx",
                .start  = DAVINCI_DM646X_DMA_MCASP1_AXEVT1,
                .end    = DAVINCI_DM646X_DMA_MCASP1_AXEVT1,
                .flags  = IORESOURCE_DMA,
        },
-       /* DIT mode, dummy entry */
-       {
-               .start  = -1,
-               .end    = -1,
-               .flags  = IORESOURCE_DMA,
-       },
 };
 
 static struct platform_device dm646x_mcasp0_device = {