Merge with 2.3.27.

1 files changed, 43 insertions, 118 deletions

diff --git a/arch/arm/kernel/dec21285.c b/arch/arm/kernel/dec21285.c
index 42a9a616f..2622dec25 100644
--- a/arch/arm/kernel/dec21285.c
+++ b/arch/arm/kernel/dec21285.c
@@ -18,11 +18,12 @@
 #include <asm/irq.h>
 #include <asm/system.h>
 
+#include "bios32.h"
+
 #define MAX_SLOTS		21
 
 extern int setup_arm_irq(int, struct irqaction *);
 extern void pcibios_report_device_errors(void);
-extern int (*pci_irq_fixup)(struct pci_dev *dev);
 
 static unsigned long
 dc21285_base_address(struct pci_dev *dev, int where)
@@ -202,129 +203,53 @@ static struct irqaction dc21285_error_action = {
 	dc21285_error, SA_INTERRUPT, 0, "PCI error", NULL, NULL
 };
 
-static int irqmap_ebsa[] __initdata = { IRQ_IN1, IRQ_IN0, IRQ_PCI, IRQ_IN3 };
-
-static int __init ebsa_irqval(struct pci_dev *dev)
-{
-	u8 pin;
-
-	pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
-
-	return irqmap_ebsa[(PCI_SLOT(dev->devfn) + pin) & 3];
-}
-
-static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 };
-
-static int __init cats_irqval(struct pci_dev *dev)
-{
-	if (dev->irq >= 128)
-		return 16 + (dev->irq & 0x1f);
-
-	switch (dev->irq) {
-	case 1 ... 4:
-		return irqmap_cats[dev->irq - 1];
-
-	default:
-		printk("PCI: device %02x:%02x has unknown irq line %x\n",
-		       dev->bus->number, dev->devfn, dev->irq);
-	case 0:
-		break;
-	}
-	return 0;
-}
-
-static int __init netwinder_irqval(struct pci_dev *dev)
-{
-#define DEV(v,d) ((v)<<16|(d))
-	switch (DEV(dev->vendor, dev->device)) {
-	case DEV(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21142):
-		return IRQ_NETWINDER_ETHER100;
-
-	case DEV(PCI_VENDOR_ID_WINBOND2, 0x5a5a):
-		return IRQ_NETWINDER_ETHER10;
-
-	case DEV(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_83C553):
-		return 0;
-
-	case DEV(PCI_VENDOR_ID_WINBOND, PCI_DEVICE_ID_WINBOND_82C105):
-		return IRQ_ISA_HARDDISK1;
-
-	case DEV(PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_2000):
-		return IRQ_NETWINDER_VGA;
-
-	default:
-		printk(KERN_ERR "PCI: %02X:%02X [%04X:%04X] unknown device\n",
-			dev->bus->number, dev->devfn,
-			dev->vendor, dev->device);
-		return 0;
-	}
-}
-
-struct pci_ops * __init dc21285_init(int pass)
+void __init dc21285_init(void)
 {
 	unsigned int mem_size;
 	unsigned long cntl;
 
-	if (pass == 0) {
-		mem_size = (unsigned int)high_memory - PAGE_OFFSET;
-		*CSR_SDRAMBASEMASK    = (mem_size - 1) & 0x0ffc0000;
-		*CSR_SDRAMBASEOFFSET  = 0;
-		*CSR_ROMBASEMASK      = 0x80000000;
-		*CSR_CSRBASEMASK      = 0;
-		*CSR_CSRBASEOFFSET    = 0;
-		*CSR_PCIADDR_EXTN     = 0;
+	mem_size = (unsigned int)high_memory - PAGE_OFFSET;
+	*CSR_SDRAMBASEMASK    = (mem_size - 1) & 0x0ffc0000;
+	*CSR_SDRAMBASEOFFSET  = 0;
+	*CSR_ROMBASEMASK      = 0x80000000;
+	*CSR_CSRBASEMASK      = 0;
+	*CSR_CSRBASEOFFSET    = 0;
+	*CSR_PCIADDR_EXTN     = 0;
 
 #ifdef CONFIG_HOST_FOOTBRIDGE
-		/*
-		 * Map our SDRAM at a known address in PCI space, just in case
-		 * the firmware had other ideas.  Using a nonzero base is
-		 * necessary, since some VGA cards forcefully use PCI addresses
-		 * in the range 0x000a0000 to 0x000c0000. (eg, S3 cards).
-		 */
-		*CSR_PCICACHELINESIZE = 0x00002008;
-		*CSR_PCICSRBASE       = 0;
-		*CSR_PCICSRIOBASE     = 0;
-		*CSR_PCISDRAMBASE     = virt_to_bus((void *)PAGE_OFFSET);
-		*CSR_PCIROMBASE       = 0;
-		*CSR_PCICMD           = PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
-					PCI_COMMAND_MASTER | PCI_COMMAND_FAST_BACK |
-					PCI_COMMAND_INVALIDATE | PCI_COMMAND_PARITY |
-					(1 << 31) | (1 << 29) | (1 << 28) | (1 << 24);
+	/*
+	 * Map our SDRAM at a known address in PCI space, just in case
+	 * the firmware had other ideas.  Using a nonzero base is
+	 * necessary, since some VGA cards forcefully use PCI addresses
+	 * in the range 0x000a0000 to 0x000c0000. (eg, S3 cards).
+	 */
+	*CSR_PCICACHELINESIZE = 0x00002008;
+	*CSR_PCICSRBASE       = 0;
+	*CSR_PCICSRIOBASE     = 0;
+	*CSR_PCISDRAMBASE     = virt_to_bus((void *)PAGE_OFFSET);
+	*CSR_PCIROMBASE       = 0;
+	*CSR_PCICMD           = PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
+				PCI_COMMAND_MASTER | PCI_COMMAND_FAST_BACK |
+				PCI_COMMAND_INVALIDATE | PCI_COMMAND_PARITY |
+				(1 << 31) | (1 << 29) | (1 << 28) | (1 << 24);
 #endif
 
-		printk(KERN_DEBUG"PCI: DC21285 footbridge, revision %02lX\n",
-			*CSR_CLASSREV & 0xff);
-
-		switch (machine_arch_type) {
-		case MACH_TYPE_EBSA285:
-			pci_irq_fixup = ebsa_irqval;
-			break;
-
-		case MACH_TYPE_CATS:
-			pci_irq_fixup = cats_irqval;
-			break;
-
-		case MACH_TYPE_NETWINDER:
-			pci_irq_fixup = netwinder_irqval;
-			break;
-		}
-
-		return &dc21285_ops;
-	} else {
-		/*
-		 * Clear any existing errors - we aren't
-		 * interested in historical data...
-		 */
-		cntl = *CSR_SA110_CNTL & 0xffffde07;
-		*CSR_SA110_CNTL = cntl | SA110_CNTL_RXSERR;
-		cntl = *CSR_PCICMD & 0x0000ffff;
-		*CSR_PCICMD = cntl | 1 << 31 | 1 << 29 | 1 << 28 | 1 << 24;
-
-		/*
-		 * Initialise PCI error IRQ after we've finished probing
-		 */
-		setup_arm_irq(IRQ_PCI_ERR, &dc21285_error_action);
-
-		return NULL;
-	}
+	printk(KERN_DEBUG"PCI: DC21285 footbridge, revision %02lX\n",
+		*CSR_CLASSREV & 0xff);
+
+	pci_scan_bus(0, &dc21285_ops, NULL);
+
+	/*
+	 * Clear any existing errors - we aren't
+	 * interested in historical data...
+	 */
+	cntl = *CSR_SA110_CNTL & 0xffffde07;
+	*CSR_SA110_CNTL = cntl | SA110_CNTL_RXSERR;
+	cntl = *CSR_PCICMD & 0x0000ffff;
+	*CSR_PCICMD = cntl | 1 << 31 | 1 << 29 | 1 << 28 | 1 << 24;
+
+	/*
+	 * Initialise PCI error IRQ after we've finished probing
+	 */
+	setup_arm_irq(IRQ_PCI_ERR, &dc21285_error_action);
 }