diff -ruN linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-pci.c linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-pci.c --- linux-2.6.15.orig/arch/arm/mach-ixp4xx/ds101-pci.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.15.new/arch/arm/mach-ixp4xx/ds101-pci.c 2006-02-10 22:31:00.000000000 +0100 @@ -0,0 +1,69 @@ +/* + * arch/arm/mach-ixp4xx/ds101-pci.c + * + * DS101 board-level PCI initialization + * + * based on ixdp425-pci.c: + * Copyright (C) 2002 Intel Corporation. + * Copyright (C) 2003-2004 MontaVista Software, Inc. + * + * Maintainer: http://www.nslu2-linux.org/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#include +#include +#include + +#include +#include + +void __init ds101_pci_preinit(void) +{ + set_irq_type(IRQ_DS101_PCI_INTA, IRQT_LOW); + set_irq_type(IRQ_DS101_PCI_INTB, IRQT_LOW); + set_irq_type(IRQ_DS101_PCI_INTC, IRQT_LOW); + + ixp4xx_pci_preinit(); +} + +static int __init ds101_map_irq(struct pci_dev *dev, u8 slot, u8 pin) +{ + static int pci_irq_table[DS101_PCI_MAX_DEV][DS101_PCI_IRQ_LINES] = + { + { IRQ_DS101_PCI_INTA, -1, -1 }, + { IRQ_DS101_PCI_INTB, -1, -1 }, + { IRQ_DS101_PCI_INTC, -1, -1 }, + }; + + int irq = -1; + + if (slot >= 1 && slot <= DS101_PCI_MAX_DEV && + pin >= 1 && pin <= DS101_PCI_IRQ_LINES) + irq = pci_irq_table[slot-1][pin-1]; + + return irq; +} + +struct hw_pci __initdata ds101_pci = { + .nr_controllers = 1, + .preinit = ds101_pci_preinit, + .swizzle = pci_std_swizzle, + .setup = ixp4xx_setup, + .scan = ixp4xx_scan_bus, + .map_irq = ds101_map_irq, +}; + +int __init ds101_pci_init(void) +{ + if (machine_is_ds101()) + pci_common_init(&ds101_pci); + + return 0; +} + +subsys_initcall(ds101_pci_init);