aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/dec
diff options
context:
space:
mode:
authorMaciej W. Rozycki <macro@linux-mips.org>2014-04-06 17:06:28 -0400
committerRalf Baechle <ralf@linux-mips.org>2014-05-30 15:01:08 -0400
commit76ad023b8925d8b849a9377b77bcfa9a49f57082 (patch)
tree80e5f13553edbc66d82727acdc4d704113259074 /arch/mips/dec
parent81d10bad0a5c5d82b1b5fea70fc84f71492e9235 (diff)
MIPS: DEC: Remove the Halt button interrupt on R4k systems
On R4k DECstations the Halt button is wired to the NMI processor input rather than an ordinary interrupt input such as on R3k DECstations. This is possible with a different design of the CPU daughtercard that routes the Halt button line from the baseboard connector. Additionally the interrupt input has been reused for a different purpose on the KN04 and KN05 R4k CPU daughtercards so it is better kept masked. Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/6705/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/dec')
-rw-r--r--arch/mips/dec/setup.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c
index 56e6e2c23683..41bbffd9cc0e 100644
--- a/arch/mips/dec/setup.c
+++ b/arch/mips/dec/setup.c
@@ -23,6 +23,7 @@
23#include <asm/bootinfo.h> 23#include <asm/bootinfo.h>
24#include <asm/cpu.h> 24#include <asm/cpu.h>
25#include <asm/cpu-features.h> 25#include <asm/cpu-features.h>
26#include <asm/cpu-type.h>
26#include <asm/irq.h> 27#include <asm/irq.h>
27#include <asm/irq_cpu.h> 28#include <asm/irq_cpu.h>
28#include <asm/mipsregs.h> 29#include <asm/mipsregs.h>
@@ -748,6 +749,10 @@ void __init arch_init_irq(void)
748 cpu_fpu_mask = 0; 749 cpu_fpu_mask = 0;
749 dec_interrupt[DEC_IRQ_FPU] = -1; 750 dec_interrupt[DEC_IRQ_FPU] = -1;
750 } 751 }
752 /* Free the halt interrupt unused on R4k systems. */
753 if (current_cpu_type() == CPU_R4000SC ||
754 current_cpu_type() == CPU_R4400SC)
755 dec_interrupt[DEC_IRQ_HALT] = -1;
751 756
752 /* Register board interrupts: FPU and cascade. */ 757 /* Register board interrupts: FPU and cascade. */
753 if (dec_interrupt[DEC_IRQ_FPU] >= 0) 758 if (dec_interrupt[DEC_IRQ_FPU] >= 0)