diff options
Diffstat (limited to 'arch/arm/mach-orion5x/pci.c')
-rw-r--r-- | arch/arm/mach-orion5x/pci.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index a494c470e3e4..09a045f0c406 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c | |||
@@ -177,7 +177,7 @@ static int __init pcie_setup(struct pci_sys_data *sys) | |||
177 | res[0].end = res[0].start + ORION5X_PCIE_IO_SIZE - 1; | 177 | res[0].end = res[0].start + ORION5X_PCIE_IO_SIZE - 1; |
178 | if (request_resource(&ioport_resource, &res[0])) | 178 | if (request_resource(&ioport_resource, &res[0])) |
179 | panic("Request PCIe IO resource failed\n"); | 179 | panic("Request PCIe IO resource failed\n"); |
180 | sys->resource[0] = &res[0]; | 180 | pci_add_resource(&sys->resources, &res[0]); |
181 | 181 | ||
182 | /* | 182 | /* |
183 | * IORESOURCE_MEM | 183 | * IORESOURCE_MEM |
@@ -188,9 +188,8 @@ static int __init pcie_setup(struct pci_sys_data *sys) | |||
188 | res[1].end = res[1].start + ORION5X_PCIE_MEM_SIZE - 1; | 188 | res[1].end = res[1].start + ORION5X_PCIE_MEM_SIZE - 1; |
189 | if (request_resource(&iomem_resource, &res[1])) | 189 | if (request_resource(&iomem_resource, &res[1])) |
190 | panic("Request PCIe Memory resource failed\n"); | 190 | panic("Request PCIe Memory resource failed\n"); |
191 | sys->resource[1] = &res[1]; | 191 | pci_add_resource(&sys->resources, &res[1]); |
192 | 192 | ||
193 | sys->resource[2] = NULL; | ||
194 | sys->io_offset = 0; | 193 | sys->io_offset = 0; |
195 | 194 | ||
196 | return 1; | 195 | return 1; |
@@ -506,7 +505,7 @@ static int __init pci_setup(struct pci_sys_data *sys) | |||
506 | res[0].end = res[0].start + ORION5X_PCI_IO_SIZE - 1; | 505 | res[0].end = res[0].start + ORION5X_PCI_IO_SIZE - 1; |
507 | if (request_resource(&ioport_resource, &res[0])) | 506 | if (request_resource(&ioport_resource, &res[0])) |
508 | panic("Request PCI IO resource failed\n"); | 507 | panic("Request PCI IO resource failed\n"); |
509 | sys->resource[0] = &res[0]; | 508 | pci_add_resource(&sys->resources, &res[0]); |
510 | 509 | ||
511 | /* | 510 | /* |
512 | * IORESOURCE_MEM | 511 | * IORESOURCE_MEM |
@@ -517,9 +516,8 @@ static int __init pci_setup(struct pci_sys_data *sys) | |||
517 | res[1].end = res[1].start + ORION5X_PCI_MEM_SIZE - 1; | 516 | res[1].end = res[1].start + ORION5X_PCI_MEM_SIZE - 1; |
518 | if (request_resource(&iomem_resource, &res[1])) | 517 | if (request_resource(&iomem_resource, &res[1])) |
519 | panic("Request PCI Memory resource failed\n"); | 518 | panic("Request PCI Memory resource failed\n"); |
520 | sys->resource[1] = &res[1]; | 519 | pci_add_resource(&sys->resources, &res[1]); |
521 | 520 | ||
522 | sys->resource[2] = NULL; | ||
523 | sys->io_offset = 0; | 521 | sys->io_offset = 0; |
524 | 522 | ||
525 | return 1; | 523 | return 1; |
@@ -580,9 +578,11 @@ struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys | |||
580 | struct pci_bus *bus; | 578 | struct pci_bus *bus; |
581 | 579 | ||
582 | if (nr == 0) { | 580 | if (nr == 0) { |
583 | bus = pci_scan_bus(sys->busnr, &pcie_ops, sys); | 581 | bus = pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys, |
582 | &sys->resources); | ||
584 | } else if (nr == 1 && !orion5x_pci_disabled) { | 583 | } else if (nr == 1 && !orion5x_pci_disabled) { |
585 | bus = pci_scan_bus(sys->busnr, &pci_ops, sys); | 584 | bus = pci_scan_root_bus(NULL, sys->busnr, &pci_ops, sys, |
585 | &sys->resources); | ||
586 | } else { | 586 | } else { |
587 | bus = NULL; | 587 | bus = NULL; |
588 | BUG(); | 588 | BUG(); |