diff options
Diffstat (limited to 'arch/arm/mach-ixp4xx/common.c')
-rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 39f2eeb219b4..030dd75d053a 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
@@ -192,7 +192,7 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type) | |||
192 | 192 | ||
193 | static void ixp4xx_irq_mask(unsigned int irq) | 193 | static void ixp4xx_irq_mask(unsigned int irq) |
194 | { | 194 | { |
195 | if (cpu_is_ixp46x() && irq >= 32) | 195 | if ((cpu_is_ixp46x() || cpu_is_ixp43x()) && irq >= 32) |
196 | *IXP4XX_ICMR2 &= ~(1 << (irq - 32)); | 196 | *IXP4XX_ICMR2 &= ~(1 << (irq - 32)); |
197 | else | 197 | else |
198 | *IXP4XX_ICMR &= ~(1 << irq); | 198 | *IXP4XX_ICMR &= ~(1 << irq); |
@@ -215,7 +215,7 @@ static void ixp4xx_irq_unmask(unsigned int irq) | |||
215 | if (!(ixp4xx_irq_edge & (1 << irq))) | 215 | if (!(ixp4xx_irq_edge & (1 << irq))) |
216 | ixp4xx_irq_ack(irq); | 216 | ixp4xx_irq_ack(irq); |
217 | 217 | ||
218 | if (cpu_is_ixp46x() && irq >= 32) | 218 | if ((cpu_is_ixp46x() || cpu_is_ixp43x()) && irq >= 32) |
219 | *IXP4XX_ICMR2 |= (1 << (irq - 32)); | 219 | *IXP4XX_ICMR2 |= (1 << (irq - 32)); |
220 | else | 220 | else |
221 | *IXP4XX_ICMR |= (1 << irq); | 221 | *IXP4XX_ICMR |= (1 << irq); |
@@ -239,7 +239,7 @@ void __init ixp4xx_init_irq(void) | |||
239 | /* Disable all interrupt */ | 239 | /* Disable all interrupt */ |
240 | *IXP4XX_ICMR = 0x0; | 240 | *IXP4XX_ICMR = 0x0; |
241 | 241 | ||
242 | if (cpu_is_ixp46x()) { | 242 | if (cpu_is_ixp46x() || cpu_is_ixp43x()) { |
243 | /* Route upper 32 sources to IRQ instead of FIQ */ | 243 | /* Route upper 32 sources to IRQ instead of FIQ */ |
244 | *IXP4XX_ICLR2 = 0x00; | 244 | *IXP4XX_ICLR2 = 0x00; |
245 | 245 | ||