diff options
| author | Juha Tukkinen <jtukkinen@nvidia.com> | 2012-03-14 13:41:34 +0200 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-03-23 17:28:23 -0700 |
| commit | 97139a5d89b2a80fb8464dda86fcb1c968be2b63 (patch) | |
| tree | 55e41d551cf6bda5295e8c9ea7fd1172d0b1f835 | |
| parent | 79ce7649d23fcfff076c93c028a2890a8439e3c4 (diff) | |
ARM: tegra: Fix compilation warning for PCIe
Fix compilation error for PCIe.
Change-Id: I1ab5390dfce273236bd4aa09579bf54425faf2e9
Signed-off-by: Juha Tukkinen <jtukkinen@nvidia.com>
Reviewed-on: http://git-master/r/90045
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/hardware.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/pcie.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mach-tegra/include/mach/hardware.h b/arch/arm/mach-tegra/include/mach/hardware.h index 8f8cc722ae0c..92600f75fd46 100644 --- a/arch/arm/mach-tegra/include/mach/hardware.h +++ b/arch/arm/mach-tegra/include/mach/hardware.h @@ -20,14 +20,10 @@ #define MACH_TEGRA_HARDWARE_H #if defined(CONFIG_ARCH_TEGRA_2x_SOC) -#define PCIBIOS_MIN_IO 0x1000 -#define PCIBIOS_MIN_MEM 0 #define pcibios_assign_all_busses() 1 #else -#define PCIBIOS_MIN_IO 0x03000000ul -#define PCIBIOS_MIN_MEM 0x10000000ul #define pcibios_assign_all_busses() 0 #endif diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c index 6a424365f42a..ca914a2b257c 100644 --- a/arch/arm/mach-tegra/pcie.c +++ b/arch/arm/mach-tegra/pcie.c @@ -1109,8 +1109,13 @@ static int tegra_pcie_init(void) int rp_offset = 0; int ctrl_offset = AFI_PEX0_CTRL; - pcibios_min_mem = 0; - +#ifdef CONFIG_ARCH_TEGRA_2x_SOC + pcibios_min_mem = 0x1000; + pcibios_min_io = 0; +#else + pcibios_min_mem = 0x03000000ul; + pcibios_min_io = 0x10000000ul; +#endif err = tegra_pcie_get_resources(); if (err) return err; |