ramips: rt288x: fix PCI resource conflict

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30563 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Gabor Juhos 2012-02-15 21:19:02 +00:00
parent ff00f9e46d
commit 2c8af97c01
1 changed files with 8 additions and 0 deletions

View File

@ -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) static int __init rt2880_pci_init(void)
{ {
void __iomem *io_map_base;
int i; int i;
rt2880_pci_base = ioremap_nocache(RT2880_PCI_BASE, PAGE_SIZE); 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); rt2880_pci_reg_write(0, RT2880_PCI_REG_PCICFG_ADDR);
for(i = 0; i < 0xfffff; i++) {} for(i = 0; i < 0xfffff; i++) {}