aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2015-03-12 04:06:29 -0400
committerSekhar Nori <nsekhar@ti.com>2015-03-18 06:22:05 -0400
commit256b20a54a13962a9fcffabbc08903301fa4c259 (patch)
treeeb83476a2cbe79cb260e438fa06bc5b37646b4ba
parent3775c31376329830b547fa5e11f966bec2a92cbe (diff)
ARM: davinci: dm646x: Clean up the McASP DMA resources
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>
-rw-r--r--arch/arm/mach-davinci/dm646x.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 6c3bbea7d77d..d2a2619aee81 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -610,19 +610,21 @@ static struct resource dm646x_mcasp0_resources[] = {
610 .end = DAVINCI_DM646X_MCASP0_REG_BASE + (SZ_1K << 1) - 1, 610 .end = DAVINCI_DM646X_MCASP0_REG_BASE + (SZ_1K << 1) - 1,
611 .flags = IORESOURCE_MEM, 611 .flags = IORESOURCE_MEM,
612 }, 612 },
613 /* first TX, then RX */
614 { 613 {
614 .name = "tx",
615 .start = DAVINCI_DM646X_DMA_MCASP0_AXEVT0, 615 .start = DAVINCI_DM646X_DMA_MCASP0_AXEVT0,
616 .end = DAVINCI_DM646X_DMA_MCASP0_AXEVT0, 616 .end = DAVINCI_DM646X_DMA_MCASP0_AXEVT0,
617 .flags = IORESOURCE_DMA, 617 .flags = IORESOURCE_DMA,
618 }, 618 },
619 { 619 {
620 .name = "rx",
620 .start = DAVINCI_DM646X_DMA_MCASP0_AREVT0, 621 .start = DAVINCI_DM646X_DMA_MCASP0_AREVT0,
621 .end = DAVINCI_DM646X_DMA_MCASP0_AREVT0, 622 .end = DAVINCI_DM646X_DMA_MCASP0_AREVT0,
622 .flags = IORESOURCE_DMA, 623 .flags = IORESOURCE_DMA,
623 }, 624 },
624}; 625};
625 626
627/* DIT mode only, rx is not supported */
626static struct resource dm646x_mcasp1_resources[] = { 628static struct resource dm646x_mcasp1_resources[] = {
627 { 629 {
628 .name = "mpu", 630 .name = "mpu",
@@ -630,18 +632,12 @@ static struct resource dm646x_mcasp1_resources[] = {
630 .end = DAVINCI_DM646X_MCASP1_REG_BASE + (SZ_1K << 1) - 1, 632 .end = DAVINCI_DM646X_MCASP1_REG_BASE + (SZ_1K << 1) - 1,
631 .flags = IORESOURCE_MEM, 633 .flags = IORESOURCE_MEM,
632 }, 634 },
633 /* DIT mode, only TX event */
634 { 635 {
636 .name = "tx",
635 .start = DAVINCI_DM646X_DMA_MCASP1_AXEVT1, 637 .start = DAVINCI_DM646X_DMA_MCASP1_AXEVT1,
636 .end = DAVINCI_DM646X_DMA_MCASP1_AXEVT1, 638 .end = DAVINCI_DM646X_DMA_MCASP1_AXEVT1,
637 .flags = IORESOURCE_DMA, 639 .flags = IORESOURCE_DMA,
638 }, 640 },
639 /* DIT mode, dummy entry */
640 {
641 .start = -1,
642 .end = -1,
643 .flags = IORESOURCE_DMA,
644 },
645}; 641};
646 642
647static struct platform_device dm646x_mcasp0_device = { 643static struct platform_device dm646x_mcasp0_device = {