diff options
Diffstat (limited to 'arch/arm/mach-orion/pci.c')
-rw-r--r-- | arch/arm/mach-orion/pci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-orion/pci.c b/arch/arm/mach-orion/pci.c index 0498d7c69b30..b109bb46681e 100644 --- a/arch/arm/mach-orion/pci.c +++ b/arch/arm/mach-orion/pci.c | |||
@@ -156,7 +156,7 @@ static int orion_pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where, | |||
156 | orion_pcie_id(&dev, &rev); | 156 | orion_pcie_id(&dev, &rev); |
157 | if (dev == MV88F5181_DEV_ID || dev == MV88F5182_DEV_ID) { | 157 | if (dev == MV88F5181_DEV_ID || dev == MV88F5182_DEV_ID) { |
158 | /* extended register space */ | 158 | /* extended register space */ |
159 | pcie_addr = ORION_PCIE_WA_BASE; | 159 | pcie_addr = ORION_PCIE_WA_VIRT_BASE; |
160 | pcie_addr |= PCIE_CONF_BUS(bus->number) | | 160 | pcie_addr |= PCIE_CONF_BUS(bus->number) | |
161 | PCIE_CONF_DEV(PCI_SLOT(devfn)) | | 161 | PCIE_CONF_DEV(PCI_SLOT(devfn)) | |
162 | PCIE_CONF_FUNC(PCI_FUNC(devfn)) | | 162 | PCIE_CONF_FUNC(PCI_FUNC(devfn)) | |
@@ -241,7 +241,7 @@ static int orion_pcie_setup(struct pci_sys_data *sys) | |||
241 | */ | 241 | */ |
242 | res[0].name = "PCI-EX I/O Space"; | 242 | res[0].name = "PCI-EX I/O Space"; |
243 | res[0].flags = IORESOURCE_IO; | 243 | res[0].flags = IORESOURCE_IO; |
244 | res[0].start = ORION_PCIE_IO_REMAP; | 244 | res[0].start = ORION_PCIE_IO_BUS_BASE; |
245 | res[0].end = res[0].start + ORION_PCIE_IO_SIZE - 1; | 245 | res[0].end = res[0].start + ORION_PCIE_IO_SIZE - 1; |
246 | if (request_resource(&ioport_resource, &res[0])) | 246 | if (request_resource(&ioport_resource, &res[0])) |
247 | panic("Request PCIE IO resource failed\n"); | 247 | panic("Request PCIE IO resource failed\n"); |
@@ -252,7 +252,7 @@ static int orion_pcie_setup(struct pci_sys_data *sys) | |||
252 | */ | 252 | */ |
253 | res[1].name = "PCI-EX Memory Space"; | 253 | res[1].name = "PCI-EX Memory Space"; |
254 | res[1].flags = IORESOURCE_MEM; | 254 | res[1].flags = IORESOURCE_MEM; |
255 | res[1].start = ORION_PCIE_MEM_BASE; | 255 | res[1].start = ORION_PCIE_MEM_PHYS_BASE; |
256 | res[1].end = res[1].start + ORION_PCIE_MEM_SIZE - 1; | 256 | res[1].end = res[1].start + ORION_PCIE_MEM_SIZE - 1; |
257 | if (request_resource(&iomem_resource, &res[1])) | 257 | if (request_resource(&iomem_resource, &res[1])) |
258 | panic("Request PCIE Memory resource failed\n"); | 258 | panic("Request PCIE Memory resource failed\n"); |
@@ -477,7 +477,7 @@ static int orion_pci_setup(struct pci_sys_data *sys) | |||
477 | */ | 477 | */ |
478 | res[0].name = "PCI I/O Space"; | 478 | res[0].name = "PCI I/O Space"; |
479 | res[0].flags = IORESOURCE_IO; | 479 | res[0].flags = IORESOURCE_IO; |
480 | res[0].start = ORION_PCI_IO_REMAP; | 480 | res[0].start = ORION_PCI_IO_BUS_BASE; |
481 | res[0].end = res[0].start + ORION_PCI_IO_SIZE - 1; | 481 | res[0].end = res[0].start + ORION_PCI_IO_SIZE - 1; |
482 | if (request_resource(&ioport_resource, &res[0])) | 482 | if (request_resource(&ioport_resource, &res[0])) |
483 | panic("Request PCI IO resource failed\n"); | 483 | panic("Request PCI IO resource failed\n"); |
@@ -488,7 +488,7 @@ static int orion_pci_setup(struct pci_sys_data *sys) | |||
488 | */ | 488 | */ |
489 | res[1].name = "PCI Memory Space"; | 489 | res[1].name = "PCI Memory Space"; |
490 | res[1].flags = IORESOURCE_MEM; | 490 | res[1].flags = IORESOURCE_MEM; |
491 | res[1].start = ORION_PCI_MEM_BASE; | 491 | res[1].start = ORION_PCI_MEM_PHYS_BASE; |
492 | res[1].end = res[1].start + ORION_PCI_MEM_SIZE - 1; | 492 | res[1].end = res[1].start + ORION_PCI_MEM_SIZE - 1; |
493 | if (request_resource(&iomem_resource, &res[1])) | 493 | if (request_resource(&iomem_resource, &res[1])) |
494 | panic("Request PCI Memory resource failed\n"); | 494 | panic("Request PCI Memory resource failed\n"); |