diff options
author | Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> | 2010-06-17 07:36:13 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-08-05 08:26:04 -0400 |
commit | 9e6f39698ac66e08017114a51600bf633becd011 (patch) | |
tree | 8541bf18a98af7cd8a7d5634b9d202a88d0df9b0 /arch | |
parent | eebacda40f2f9818c92f61b2228c7888e1f4926c (diff) |
MIPS: EMMA2RH: Remove EMMA2RH_CPU_CASCADE
Although all EMMAxxx SoCs can support IP2 and IP3 hardware interrupts,
current EMMA2RH plat_irq_dispatch() supports IP2 only. We can make it
configurable in the future, but for the time being, would like to make
things explicitly allcated to IP2 in accordance with plat_irq_dispatch().
Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/1388/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/emma/markeins/irq.c | 2 | ||||
-rw-r--r-- | arch/mips/include/asm/emma/emma2rh.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/emma/markeins/irq.c b/arch/mips/emma/markeins/irq.c index 1d1c806056c5..3a96799eb65f 100644 --- a/arch/mips/emma/markeins/irq.c +++ b/arch/mips/emma/markeins/irq.c | |||
@@ -301,7 +301,7 @@ void __init arch_init_irq(void) | |||
301 | /* setup cascade interrupts */ | 301 | /* setup cascade interrupts */ |
302 | setup_irq(EMMA2RH_IRQ_BASE + EMMA2RH_SW_CASCADE, &irq_cascade); | 302 | setup_irq(EMMA2RH_IRQ_BASE + EMMA2RH_SW_CASCADE, &irq_cascade); |
303 | setup_irq(EMMA2RH_IRQ_BASE + EMMA2RH_GPIO_CASCADE, &irq_cascade); | 303 | setup_irq(EMMA2RH_IRQ_BASE + EMMA2RH_GPIO_CASCADE, &irq_cascade); |
304 | setup_irq(MIPS_CPU_IRQ_BASE + CPU_EMMA2RH_CASCADE, &irq_cascade); | 304 | setup_irq(MIPS_CPU_IRQ_BASE + 2, &irq_cascade); |
305 | } | 305 | } |
306 | 306 | ||
307 | asmlinkage void plat_irq_dispatch(void) | 307 | asmlinkage void plat_irq_dispatch(void) |
diff --git a/arch/mips/include/asm/emma/emma2rh.h b/arch/mips/include/asm/emma/emma2rh.h index fcc0064d6a86..95d0b7e683ce 100644 --- a/arch/mips/include/asm/emma/emma2rh.h +++ b/arch/mips/include/asm/emma/emma2rh.h | |||
@@ -101,7 +101,6 @@ | |||
101 | 101 | ||
102 | #define NUM_EMMA2RH_IRQ 96 | 102 | #define NUM_EMMA2RH_IRQ 96 |
103 | 103 | ||
104 | #define CPU_EMMA2RH_CASCADE 2 | ||
105 | #define EMMA2RH_IRQ_BASE (MIPS_CPU_IRQ_BASE + 8) | 104 | #define EMMA2RH_IRQ_BASE (MIPS_CPU_IRQ_BASE + 8) |
106 | 105 | ||
107 | /* | 106 | /* |