aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/pci/fixup-vr4133.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/pci/fixup-vr4133.c')
-rw-r--r--arch/mips/pci/fixup-vr4133.c13
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 @@
19#include <linux/pci.h> 19#include <linux/pci.h>
20 20
21#include <asm/io.h> 21#include <asm/io.h>
22#include <asm/i8259.h>
22#include <asm/vr41xx/cmbvr4133.h> 23#include <asm/vr41xx/cmbvr4133.h>
23 24
24extern int vr4133_rockhopper; 25extern int vr4133_rockhopper;
@@ -160,17 +161,7 @@ int rockhopper_get_irq(struct pci_dev *dev, u8 pin, u8 slot)
160#ifdef CONFIG_ROCKHOPPER 161#ifdef CONFIG_ROCKHOPPER
161void i8259_init(void) 162void i8259_init(void)
162{ 163{
163 outb(0x11, 0x20); /* Master ICW1 */ 164 init_i8259_irqs();
164 outb(I8259_IRQ_BASE, 0x21); /* Master ICW2 */
165 outb(0x04, 0x21); /* Master ICW3 */
166 outb(0x01, 0x21); /* Master ICW4 */
167 outb(0xff, 0x21); /* Master IMW */
168
169 outb(0x11, 0xa0); /* Slave ICW1 */
170 outb(I8259_IRQ_BASE + 8, 0xa1); /* Slave ICW2 */
171 outb(0x02, 0xa1); /* Slave ICW3 */
172 outb(0x01, 0xa1); /* Slave ICW4 */
173 outb(0xff, 0xa1); /* Slave IMW */
174 165
175 outb(0x00, 0x4d0); 166 outb(0x00, 0x4d0);
176 outb(0x02, 0x4d1); /* USB IRQ9 is level */ 167 outb(0x02, 0x4d1); /* USB IRQ9 is level */