diff options
Diffstat (limited to 'arch/mips/loongson/fuloong-2e')
-rw-r--r-- | arch/mips/loongson/fuloong-2e/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/loongson/fuloong-2e/irq.c | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/arch/mips/loongson/fuloong-2e/Makefile b/arch/mips/loongson/fuloong-2e/Makefile index 3aba5fcc09dc..b7622720c1ad 100644 --- a/arch/mips/loongson/fuloong-2e/Makefile +++ b/arch/mips/loongson/fuloong-2e/Makefile | |||
@@ -3,5 +3,3 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y += irq.o reset.o | 5 | obj-y += irq.o reset.o |
6 | |||
7 | EXTRA_CFLAGS += -Werror | ||
diff --git a/arch/mips/loongson/fuloong-2e/irq.c b/arch/mips/loongson/fuloong-2e/irq.c index 320e9379bdd7..d61a04222b87 100644 --- a/arch/mips/loongson/fuloong-2e/irq.c +++ b/arch/mips/loongson/fuloong-2e/irq.c | |||
@@ -30,7 +30,7 @@ asmlinkage void mach_irq_dispatch(unsigned int pending) | |||
30 | if (pending & CAUSEF_IP7) | 30 | if (pending & CAUSEF_IP7) |
31 | do_IRQ(MIPS_CPU_IRQ_BASE + 7); | 31 | do_IRQ(MIPS_CPU_IRQ_BASE + 7); |
32 | else if (pending & CAUSEF_IP6) /* perf counter loverflow */ | 32 | else if (pending & CAUSEF_IP6) /* perf counter loverflow */ |
33 | do_IRQ(LOONGSON2_PERFCNT_IRQ); | 33 | do_perfcnt_IRQ(); |
34 | else if (pending & CAUSEF_IP5) | 34 | else if (pending & CAUSEF_IP5) |
35 | i8259_irqdispatch(); | 35 | i8259_irqdispatch(); |
36 | else if (pending & CAUSEF_IP2) | 36 | else if (pending & CAUSEF_IP2) |
@@ -44,13 +44,6 @@ static struct irqaction cascade_irqaction = { | |||
44 | .name = "cascade", | 44 | .name = "cascade", |
45 | }; | 45 | }; |
46 | 46 | ||
47 | void __init set_irq_trigger_mode(void) | ||
48 | { | ||
49 | /* most bonito irq should be level triggered */ | ||
50 | LOONGSON_INTEDGE = LOONGSON_ICU_SYSTEMERR | LOONGSON_ICU_MASTERERR | | ||
51 | LOONGSON_ICU_RETRYERR | LOONGSON_ICU_MBOXES; | ||
52 | } | ||
53 | |||
54 | void __init mach_init_irq(void) | 47 | void __init mach_init_irq(void) |
55 | { | 48 | { |
56 | /* init all controller | 49 | /* init all controller |
@@ -59,6 +52,10 @@ void __init mach_init_irq(void) | |||
59 | * 32-63 ------> bonito irq | 52 | * 32-63 ------> bonito irq |
60 | */ | 53 | */ |
61 | 54 | ||
55 | /* most bonito irq should be level triggered */ | ||
56 | LOONGSON_INTEDGE = LOONGSON_ICU_SYSTEMERR | LOONGSON_ICU_MASTERERR | | ||
57 | LOONGSON_ICU_RETRYERR | LOONGSON_ICU_MBOXES; | ||
58 | |||
62 | /* Sets the first-level interrupt dispatcher. */ | 59 | /* Sets the first-level interrupt dispatcher. */ |
63 | mips_cpu_irq_init(); | 60 | mips_cpu_irq_init(); |
64 | init_i8259_irqs(); | 61 | init_i8259_irqs(); |