aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2015-03-12 04:06:30 -0400
committerSekhar Nori <nsekhar@ti.com>2015-03-18 07:47:36 -0400
commitb38434145b341c148b8d98cfbfc1e87bb4d9e2d9 (patch)
treee67a0ef7589fb46e0a9f7d8ab915144dd6102eb0 /arch
parent256b20a54a13962a9fcffabbc08903301fa4c259 (diff)
ARM: davinci: irqs: Correct McASP1 TX interrupt definition for DM646x
McASP1 TX interrupt is 30, not 32 on DM646x DMSoC. While at it remove the bogus AEMIF interrupt entry from dm646x_default_priorities[]. AEMIF interrupt on DM6467 is 60 not 30 and the entry for the correct interrupt number is already present in the same table. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> [nsekhar@ti.com: remove bogus entry from dm646x_default_priorities[]] Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-davinci/dm646x.c1
-rw-r--r--arch/arm/mach-davinci/include/mach/irqs.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index d2a2619aee81..58769eddd3c3 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -493,7 +493,6 @@ static u8 dm646x_default_priorities[DAVINCI_N_AINTC_IRQ] = {
493 [IRQ_DM646X_EMACMISCINT] = 7, 493 [IRQ_DM646X_EMACMISCINT] = 7,
494 [IRQ_DM646X_MCASP0TXINT] = 7, 494 [IRQ_DM646X_MCASP0TXINT] = 7,
495 [IRQ_DM646X_MCASP0RXINT] = 7, 495 [IRQ_DM646X_MCASP0RXINT] = 7,
496 [IRQ_AEMIFINT] = 7,
497 [IRQ_DM646X_RESERVED_3] = 7, 496 [IRQ_DM646X_RESERVED_3] = 7,
498 [IRQ_DM646X_MCASP1TXINT] = 7, /* clockevent */ 497 [IRQ_DM646X_MCASP1TXINT] = 7, /* clockevent */
499 [IRQ_TINT0_TINT34] = 7, /* clocksource */ 498 [IRQ_TINT0_TINT34] = 7, /* clocksource */
diff --git a/arch/arm/mach-davinci/include/mach/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h
index 354af71798dc..edb2ca62321a 100644
--- a/arch/arm/mach-davinci/include/mach/irqs.h
+++ b/arch/arm/mach-davinci/include/mach/irqs.h
@@ -129,8 +129,8 @@
129#define IRQ_DM646X_EMACMISCINT 27 129#define IRQ_DM646X_EMACMISCINT 27
130#define IRQ_DM646X_MCASP0TXINT 28 130#define IRQ_DM646X_MCASP0TXINT 28
131#define IRQ_DM646X_MCASP0RXINT 29 131#define IRQ_DM646X_MCASP0RXINT 29
132#define IRQ_DM646X_MCASP1TXINT 30
132#define IRQ_DM646X_RESERVED_3 31 133#define IRQ_DM646X_RESERVED_3 31
133#define IRQ_DM646X_MCASP1TXINT 32
134#define IRQ_DM646X_VLQINT 38 134#define IRQ_DM646X_VLQINT 38
135#define IRQ_DM646X_UARTINT2 42 135#define IRQ_DM646X_UARTINT2 42
136#define IRQ_DM646X_SPINT0 43 136#define IRQ_DM646X_SPINT0 43