[MIPS] Make I8259A_IRQ_BASE customizable

Move I8259A_IRQ_BASE from asm/i8259.h to asm/mach-generic/irq.h and
make it really customizable.  And remove I8259_IRQ_BASE declared on
some platforms.  Currently only NEC_CMBVR4133 is using custom
I8259A_IRQ_BASE value.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 2 insertions, 11 deletions

diff --git a/arch/mips/pci/fixup-vr4133.c b/arch/mips/pci/fixup-vr4133.c
index 597b89764ba1..b1a5b318f26f 100644
--- a/arch/mips/pci/fixup-vr4133.c
+++ b/arch/mips/pci/fixup-vr4133.c
@@ -19,6 +19,7 @@
 #include <linux/pci.h>
 
 #include <asm/io.h>
+#include <asm/i8259.h>
 #include <asm/vr41xx/cmbvr4133.h>
 
 extern int vr4133_rockhopper;
@@ -160,17 +161,7 @@ int rockhopper_get_irq(struct pci_dev *dev, u8 pin, u8 slot)
 #ifdef CONFIG_ROCKHOPPER
 void i8259_init(void)
 {
-        outb(0x11, 0x20);               /* Master ICW1 */
-        outb(I8259_IRQ_BASE, 0x21);     /* Master ICW2 */
-        outb(0x04, 0x21);               /* Master ICW3 */
-        outb(0x01, 0x21);               /* Master ICW4 */
-        outb(0xff, 0x21);               /* Master IMW */
-
-        outb(0x11, 0xa0);               /* Slave ICW1 */
-        outb(I8259_IRQ_BASE + 8, 0xa1); /* Slave ICW2 */
-        outb(0x02, 0xa1);               /* Slave ICW3 */
-        outb(0x01, 0xa1);               /* Slave ICW4 */
-        outb(0xff, 0xa1);               /* Slave IMW */
+        init_i8259_irqs();
 
         outb(0x00, 0x4d0);
         outb(0x02, 0x4d1);      /* USB IRQ9 is level */