diff options
author | John Crispin <blogic@openwrt.org> | 2011-07-18 12:08:40 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2011-09-21 11:53:12 -0400 |
commit | 77fbdb30f045084f1c65b72bd457d7406343aad7 (patch) | |
tree | 763d2b9e2890ec073cca9207f8f0dfdda0e835c3 /arch | |
parent | d954ffe34a606d4ec34cd3c2b0b5974779759f25 (diff) |
MIPS: Lantiq: Fix external interrupt sources
The irq base offset needs to be ignored when matching irqs to external
interrupt pins. Taking the offset into account resulted in the EIU not
being brought up properly.
Signed-off-by: John Crispin <blogic@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2616/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/lantiq/irq.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/mips/lantiq/irq.c b/arch/mips/lantiq/irq.c index fc89795cafdb..f9737bb3c5ab 100644 --- a/arch/mips/lantiq/irq.c +++ b/arch/mips/lantiq/irq.c | |||
@@ -123,11 +123,10 @@ void ltq_enable_irq(struct irq_data *d) | |||
123 | static unsigned int ltq_startup_eiu_irq(struct irq_data *d) | 123 | static unsigned int ltq_startup_eiu_irq(struct irq_data *d) |
124 | { | 124 | { |
125 | int i; | 125 | int i; |
126 | int irq_nr = d->irq - INT_NUM_IRQ0; | ||
127 | 126 | ||
128 | ltq_enable_irq(d); | 127 | ltq_enable_irq(d); |
129 | for (i = 0; i < MAX_EIU; i++) { | 128 | for (i = 0; i < MAX_EIU; i++) { |
130 | if (irq_nr == ltq_eiu_irq[i]) { | 129 | if (d->irq == ltq_eiu_irq[i]) { |
131 | /* low level - we should really handle set_type */ | 130 | /* low level - we should really handle set_type */ |
132 | ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_C) | | 131 | ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_C) | |
133 | (0x6 << (i * 4)), LTQ_EIU_EXIN_C); | 132 | (0x6 << (i * 4)), LTQ_EIU_EXIN_C); |
@@ -147,11 +146,10 @@ static unsigned int ltq_startup_eiu_irq(struct irq_data *d) | |||
147 | static void ltq_shutdown_eiu_irq(struct irq_data *d) | 146 | static void ltq_shutdown_eiu_irq(struct irq_data *d) |
148 | { | 147 | { |
149 | int i; | 148 | int i; |
150 | int irq_nr = d->irq - INT_NUM_IRQ0; | ||
151 | 149 | ||
152 | ltq_disable_irq(d); | 150 | ltq_disable_irq(d); |
153 | for (i = 0; i < MAX_EIU; i++) { | 151 | for (i = 0; i < MAX_EIU; i++) { |
154 | if (irq_nr == ltq_eiu_irq[i]) { | 152 | if (d->irq == ltq_eiu_irq[i]) { |
155 | /* disable */ | 153 | /* disable */ |
156 | ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_INEN) & ~(1 << i), | 154 | ltq_eiu_w32(ltq_eiu_r32(LTQ_EIU_EXIN_INEN) & ~(1 << i), |
157 | LTQ_EIU_EXIN_INEN); | 155 | LTQ_EIU_EXIN_INEN); |