Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[MIPS] SEAD: More build fixes. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

+12 -15
+1 -11
arch/mips/mips-boards/sead/sead_int.c
··· 30 30 31 31 extern asmlinkage void mipsIRQ(void); 32 32 33 - asmlinkage void sead_hw0_irqdispatch(struct pt_regs *regs) 34 - { 35 - do_IRQ(SEADINT_UART0, regs); 36 - } 37 - 38 - asmlinkage void sead_hw1_irqdispatch(struct pt_regs *regs) 39 - { 40 - do_IRQ(SEADINT_UART1, regs); 41 - } 42 - 43 33 void __init arch_init_irq(void) 44 34 { 45 - mips_cpu_irq_init(0); 35 + mips_cpu_irq_init(MIPSCPU_INT_BASE); 46 36 47 37 /* Now safe to set the exception vector. */ 48 38 set_except_vector(0, mipsIRQ);
+2 -2
arch/mips/mips-boards/sead/sead_setup.c
··· 45 45 return "MIPS SEAD"; 46 46 } 47 47 48 - static void __init sead_setup(void) 48 + void __init plat_setup(void) 49 49 { 50 50 ioport_resource.end = 0x7fffffff; 51 51 ··· 69 69 #else 70 70 s.iobase = SEAD_UART0_REGS_BASE+3; 71 71 #endif 72 - s.irq = SEADINT_UART0; 72 + s.irq = MIPSCPU_INT_BASE + MIPSCPU_INT_UART0; 73 73 s.uartclk = SEAD_BASE_BAUD * 16; 74 74 s.flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ; 75 75 s.iotype = 0;
+9 -2
include/asm-mips/mips-boards/seadint.h
··· 20 20 #ifndef _MIPS_SEADINT_H 21 21 #define _MIPS_SEADINT_H 22 22 23 - #define SEADINT_UART0 2 24 - #define SEADINT_UART1 3 23 + /* 24 + * Interrupts 0..7 are used for SEAD CPU interrupts 25 + */ 26 + #define MIPSCPU_INT_BASE 0 27 + 28 + #define MIPSCPU_INT_UART0 2 29 + #define MIPSCPU_INT_UART1 3 30 + 31 + #define MIPSCPU_INT_CPUCTR 7 25 32 26 33 #endif /* !(_MIPS_SEADINT_H) */