diff options
Diffstat (limited to 'arch/mips/mips-boards/atlas/atlas_int.c')
-rw-r--r-- | arch/mips/mips-boards/atlas/atlas_int.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/mips/mips-boards/atlas/atlas_int.c b/arch/mips/mips-boards/atlas/atlas_int.c index 3c692abc2553..6fb29c3ff62d 100644 --- a/arch/mips/mips-boards/atlas/atlas_int.c +++ b/arch/mips/mips-boards/atlas/atlas_int.c | |||
@@ -112,7 +112,7 @@ static inline void atlas_hw0_irqdispatch(void) | |||
112 | 112 | ||
113 | static inline int clz(unsigned long x) | 113 | static inline int clz(unsigned long x) |
114 | { | 114 | { |
115 | __asm__ ( | 115 | __asm__( |
116 | " .set push \n" | 116 | " .set push \n" |
117 | " .set mips32 \n" | 117 | " .set mips32 \n" |
118 | " clz %0, %1 \n" | 118 | " clz %0, %1 \n" |
@@ -194,7 +194,7 @@ asmlinkage void plat_irq_dispatch(void) | |||
194 | spurious_interrupt(); | 194 | spurious_interrupt(); |
195 | } | 195 | } |
196 | 196 | ||
197 | static inline void init_atlas_irqs (int base) | 197 | static inline void init_atlas_irqs(int base) |
198 | { | 198 | { |
199 | int i; | 199 | int i; |
200 | 200 | ||
@@ -249,21 +249,21 @@ void __init arch_init_irq(void) | |||
249 | case MIPS_REVISION_CORID_CORE_24K: | 249 | case MIPS_REVISION_CORID_CORE_24K: |
250 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: | 250 | case MIPS_REVISION_CORID_CORE_EMUL_MSC: |
251 | if (cpu_has_veic) | 251 | if (cpu_has_veic) |
252 | init_msc_irqs (MSC01E_INT_BASE, MSC01E_INT_BASE, | 252 | init_msc_irqs(MSC01E_INT_BASE, MSC01E_INT_BASE, |
253 | msc_eicirqmap, msc_nr_eicirqs); | 253 | msc_eicirqmap, msc_nr_eicirqs); |
254 | else | 254 | else |
255 | init_msc_irqs (MSC01E_INT_BASE, MSC01C_INT_BASE, | 255 | init_msc_irqs(MSC01E_INT_BASE, MSC01C_INT_BASE, |
256 | msc_irqmap, msc_nr_irqs); | 256 | msc_irqmap, msc_nr_irqs); |
257 | } | 257 | } |
258 | 258 | ||
259 | if (cpu_has_veic) { | 259 | if (cpu_has_veic) { |
260 | set_vi_handler (MSC01E_INT_ATLAS, atlas_hw0_irqdispatch); | 260 | set_vi_handler(MSC01E_INT_ATLAS, atlas_hw0_irqdispatch); |
261 | setup_irq (MSC01E_INT_BASE + MSC01E_INT_ATLAS, &atlasirq); | 261 | setup_irq(MSC01E_INT_BASE + MSC01E_INT_ATLAS, &atlasirq); |
262 | } else if (cpu_has_vint) { | 262 | } else if (cpu_has_vint) { |
263 | set_vi_handler (MIPSCPU_INT_ATLAS, atlas_hw0_irqdispatch); | 263 | set_vi_handler(MIPSCPU_INT_ATLAS, atlas_hw0_irqdispatch); |
264 | #ifdef CONFIG_MIPS_MT_SMTC | 264 | #ifdef CONFIG_MIPS_MT_SMTC |
265 | setup_irq_smtc (MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS, | 265 | setup_irq_smtc(MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS, |
266 | &atlasirq, (0x100 << MIPSCPU_INT_ATLAS)); | 266 | &atlasirq, (0x100 << MIPSCPU_INT_ATLAS)); |
267 | #else /* Not SMTC */ | 267 | #else /* Not SMTC */ |
268 | setup_irq(MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS, &atlasirq); | 268 | setup_irq(MIPS_CPU_IRQ_BASE + MIPSCPU_INT_ATLAS, &atlasirq); |
269 | #endif /* CONFIG_MIPS_MT_SMTC */ | 269 | #endif /* CONFIG_MIPS_MT_SMTC */ |