diff options
-rw-r--r-- | arch/mips/mips-boards/malta/malta_int.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mips-boards/malta/malta_int.c index 6d371f4ac358..1b4b9c507e28 100644 --- a/arch/mips/mips-boards/malta/malta_int.c +++ b/arch/mips/mips-boards/malta/malta_int.c | |||
@@ -304,17 +304,25 @@ void __init arch_init_irq(void) | |||
304 | case MIPS_REVISION_SCON_SOCIT: | 304 | case MIPS_REVISION_SCON_SOCIT: |
305 | case MIPS_REVISION_SCON_ROCIT: | 305 | case MIPS_REVISION_SCON_ROCIT: |
306 | if (cpu_has_veic) | 306 | if (cpu_has_veic) |
307 | init_msc_irqs(MIPS_MSC01_IC_REG_BASE, MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs); | 307 | init_msc_irqs(MIPS_MSC01_IC_REG_BASE, |
308 | MSC01E_INT_BASE, msc_eicirqmap, | ||
309 | msc_nr_eicirqs); | ||
308 | else | 310 | else |
309 | init_msc_irqs(MIPS_MSC01_IC_REG_BASE, MSC01C_INT_BASE, msc_irqmap, msc_nr_irqs); | 311 | init_msc_irqs(MIPS_MSC01_IC_REG_BASE, |
312 | MSC01C_INT_BASE, msc_irqmap, | ||
313 | msc_nr_irqs); | ||
310 | break; | 314 | break; |
311 | 315 | ||
312 | case MIPS_REVISION_SCON_SOCITSC: | 316 | case MIPS_REVISION_SCON_SOCITSC: |
313 | case MIPS_REVISION_SCON_SOCITSCP: | 317 | case MIPS_REVISION_SCON_SOCITSCP: |
314 | if (cpu_has_veic) | 318 | if (cpu_has_veic) |
315 | init_msc_irqs(MIPS_SOCITSC_IC_REG_BASE, MSC01E_INT_BASE, msc_eicirqmap, msc_nr_eicirqs); | 319 | init_msc_irqs(MIPS_SOCITSC_IC_REG_BASE, |
320 | MSC01E_INT_BASE, msc_eicirqmap, | ||
321 | msc_nr_eicirqs); | ||
316 | else | 322 | else |
317 | init_msc_irqs(MIPS_SOCITSC_IC_REG_BASE, MSC01C_INT_BASE, msc_irqmap, msc_nr_irqs); | 323 | init_msc_irqs(MIPS_SOCITSC_IC_REG_BASE, |
324 | MSC01C_INT_BASE, msc_irqmap, | ||
325 | msc_nr_irqs); | ||
318 | } | 326 | } |
319 | 327 | ||
320 | if (cpu_has_veic) { | 328 | if (cpu_has_veic) { |
@@ -345,11 +353,13 @@ void __init arch_init_irq(void) | |||
345 | } | 353 | } |
346 | #else /* Not SMTC */ | 354 | #else /* Not SMTC */ |
347 | setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq); | 355 | setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq); |
348 | setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction); | 356 | setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, |
357 | &corehi_irqaction); | ||
349 | #endif /* CONFIG_MIPS_MT_SMTC */ | 358 | #endif /* CONFIG_MIPS_MT_SMTC */ |
350 | } | 359 | } |
351 | else { | 360 | else { |
352 | setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq); | 361 | setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_I8259A, &i8259irq); |
353 | setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, &corehi_irqaction); | 362 | setup_irq(MIPS_CPU_IRQ_BASE+MIPSCPU_INT_COREHI, |
363 | &corehi_irqaction); | ||
354 | } | 364 | } |
355 | } | 365 | } |