From: Gabor Juhos Date: Wed, 15 Feb 2012 21:19:02 +0000 (+0000) Subject: ramips: rt288x: fix PCI resource conflict X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=49fc54be3da6d4fc53702087a5195b6feaf84da3;p=librecmc%2Flibrecmc.git ramips: rt288x: fix PCI resource conflict SVN-Revision: 30563 --- diff --git a/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c b/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c index 557b1eb494..16f3bf7717 100644 --- a/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c +++ b/target/linux/ramips/files/arch/mips/pci/pci-rt288x.c @@ -212,10 +212,18 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) static int __init rt2880_pci_init(void) { + void __iomem *io_map_base; int i; rt2880_pci_base = ioremap_nocache(RT2880_PCI_BASE, PAGE_SIZE); + io_map_base = ioremap(RT2880_PCI_IO_BASE, RT2880_PCI_IO_SIZE); + rt2880_pci_controller.io_map_base = (unsigned long) io_map_base; + set_io_port_base((unsigned long) io_map_base); + + ioport_resource.start = RT2880_PCI_IO_BASE; + ioport_resource.end = RT2880_PCI_IO_BASE + RT2880_PCI_IO_SIZE - 1; + rt2880_pci_reg_write(0, RT2880_PCI_REG_PCICFG_ADDR); for(i = 0; i < 0xfffff; i++) {}