diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-06-29 04:16:13 +0200 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-07-12 18:19:29 +0200 |
| commit | c9d95fbe59e426eed7f16e7cac812e46ac4772d0 (patch) | |
| tree | 7e7c01255fb18932ee4f0c68b1501ab35db7c012 /arch/arm/mach-footbridge | |
| parent | ARM: pci: make pcibios_assign_all_busses use pci_has_flag (diff) | |
| download | linux-c9d95fbe59e426eed7f16e7cac812e46ac4772d0.tar.xz linux-c9d95fbe59e426eed7f16e7cac812e46ac4772d0.zip | |
ARM: convert PCI defines to variables
Convert PCIBIOS_MIN_IO and PCIBIOS_MIN_MEM to variables to allow
multi-platform builds. This also removes the requirement for a platform to
have a mach/hardware.h.
The default values for i/o and mem are 0x1000 and 0x01000000, respectively.
Per Arnd Bergmann, other values are likely to be incorrect, but this commit
does not try to address that issue.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-footbridge')
| -rw-r--r-- | arch/arm/mach-footbridge/dc21285.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-footbridge/include/mach/hardware.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-footbridge/dc21285.c b/arch/arm/mach-footbridge/dc21285.c index 3ffa54841ec5..a8dfa00e4596 100644 --- a/arch/arm/mach-footbridge/dc21285.c +++ b/arch/arm/mach-footbridge/dc21285.c @@ -295,6 +295,8 @@ void __init dc21285_preinit(void) unsigned int mem_size, mem_mask; int cfn_mode; + pcibios_min_mem = 0x81000000; + mem_size = (unsigned int)high_memory - PAGE_OFFSET; for (mem_mask = 0x00100000; mem_mask < 0x10000000; mem_mask <<= 1) if (mem_mask >= mem_size) diff --git a/arch/arm/mach-footbridge/include/mach/hardware.h b/arch/arm/mach-footbridge/include/mach/hardware.h index 082e6ce23579..15d54981674c 100644 --- a/arch/arm/mach-footbridge/include/mach/hardware.h +++ b/arch/arm/mach-footbridge/include/mach/hardware.h @@ -100,7 +100,4 @@ extern unsigned int nw_gpio_read(void); extern void nw_cpld_modify(unsigned int mask, unsigned int set); #endif -#define PCIBIOS_MIN_IO 0x1000 -#define PCIBIOS_MIN_MEM 0x81000000 - #endif |