diff options
Diffstat (limited to 'arch/arm/mach-tegra/pcie.c')
| -rw-r--r-- | arch/arm/mach-tegra/pcie.c | 10 | 
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c index 97ef3e55dfd..af8b6343572 100644 --- a/arch/arm/mach-tegra/pcie.c +++ b/arch/arm/mach-tegra/pcie.c @@ -37,7 +37,6 @@  #include <asm/sizes.h>  #include <asm/mach/pci.h> -#include <mach/pinmux.h>  #include <mach/iomap.h>  #include <mach/clk.h>  #include <mach/powergate.h> @@ -409,7 +408,7 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)  	pp->res[0].flags = IORESOURCE_IO;  	if (request_resource(&ioport_resource, &pp->res[0]))  		panic("Request PCIe IO resource failed\n"); -	sys->resource[0] = &pp->res[0]; +	pci_add_resource(&sys->resources, &pp->res[0]);  	/*  	 * IORESOURCE_MEM @@ -428,7 +427,7 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)  	pp->res[1].flags = IORESOURCE_MEM;  	if (request_resource(&iomem_resource, &pp->res[1]))  		panic("Request PCIe Memory resource failed\n"); -	sys->resource[1] = &pp->res[1]; +	pci_add_resource(&sys->resources, &pp->res[1]);  	/*  	 * IORESOURCE_MEM | IORESOURCE_PREFETCH @@ -447,7 +446,7 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)  	pp->res[2].flags = IORESOURCE_MEM | IORESOURCE_PREFETCH;  	if (request_resource(&iomem_resource, &pp->res[2]))  		panic("Request PCIe Prefetch Memory resource failed\n"); -	sys->resource[2] = &pp->res[2]; +	pci_add_resource(&sys->resources, &pp->res[2]);  	return 1;  } @@ -468,7 +467,8 @@ static struct pci_bus __init *tegra_pcie_scan_bus(int nr,  	pp = tegra_pcie.port + nr;  	pp->root_bus_nr = sys->busnr; -	return pci_scan_bus(sys->busnr, &tegra_pcie_ops, sys); +	return pci_scan_root_bus(NULL, sys->busnr, &tegra_pcie_ops, sys, +				 &sys->resources);  }  static struct hw_pci tegra_pcie_hw __initdata = {  |