Merge branch 'e1000-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[pandora-kernel.git] / arch / mips / pci / pci-lasat.c

diff --git a/arch/mips/pci/pci-lasat.c b/arch/mips/pci/pci-lasat.c
index ae3cc4b..985784a 100644 (file)
--- a/arch/mips/pci/pci-lasat.c
+++ b/arch/mips/pci/pci-lasat.c
@@ -7,27 +7,23 @@
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
 #include <asm/bootinfo.h>
 
 extern struct pci_ops nile4_pci_ops;
-extern struct pci_ops gt64120_pci_ops;
+extern struct pci_ops gt64xxx_pci0_ops;
 static struct resource lasat_pci_mem_resource = {
        .name   = "LASAT PCI MEM",
        .start  = 0x18000000,
-       .end    = 0x19FFFFFF,
+       .end    = 0x19ffffff,
        .flags  = IORESOURCE_MEM,
 };
 
 static struct resource lasat_pci_io_resource = {
        .name   = "LASAT PCI IO",
        .start  = 0x1a000000,
-       .end    = 0x1bFFFFFF,
+       .end    = 0x1bffffff,
        .flags  = IORESOURCE_IO,
 };
 
@@ -38,23 +34,25 @@ static struct pci_controller lasat_pci_controller = {
 
 static int __init lasat_pci_setup(void)
 {
-       printk("PCI: starting\n");
+       printk("PCI: starting\n");
 
-        switch (mips_machtype) {
-            case MACH_LASAT_100:
-                lasat_pci_controller.pci_ops = &gt64120_pci_ops;
+       switch (mips_machtype) {
+       case MACH_LASAT_100:
+                lasat_pci_controller.pci_ops = &gt64xxx_pci0_ops;
                 break;
-            case MACH_LASAT_200:
+       case MACH_LASAT_200:
                 lasat_pci_controller.pci_ops = &nile4_pci_ops;
                 break;
-            default:
+       default:
                 panic("pcibios_init: mips_machtype incorrect");
         }
 
        register_pci_controller(&lasat_pci_controller);
-        return 0;
+
+       return 0;
 }
-early_initcall(lasat_pci_setup);
+
+arch_initcall(lasat_pci_setup);
 
 #define LASATINT_ETH1   0
 #define LASATINT_ETH0   1
@@ -68,24 +66,22 @@ early_initcall(lasat_pci_setup);
 
 int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-    switch (slot) {
-        case 1:
-            return LASATINT_PCIA;   /* Expansion Module 0 */
-        case 2:
-            return LASATINT_PCIB;   /* Expansion Module 1 */
-        case 3:
-            return LASATINT_PCIC;   /* Expansion Module 2 */
-        case 4:
-            return LASATINT_ETH1;   /* Ethernet 1 (LAN 2) */
-        case 5:
-            return LASATINT_ETH0;   /* Ethernet 0 (LAN 1) */
-        case 6:
-            return LASATINT_HDC;    /* IDE controller */
-        default:
-            return 0xff;            /* Illegal */
-    }
+       switch (slot) {
+       case 1:
+       case 2:
+       case 3:
+               return LASATINT_PCIA + (((slot-1) + (pin-1)) % 4);
+       case 4:
+               return LASATINT_ETH1;   /* Ethernet 1 (LAN 2) */
+       case 5:
+               return LASATINT_ETH0;   /* Ethernet 0 (LAN 1) */
+       case 6:
+               return LASATINT_HDC;    /* IDE controller */
+       default:
+               return 0xff;            /* Illegal */
+       }
 
-    return -1;
+       return -1;
 }
 
 /* Do platform specific device initialization at pci_enable_device() time */