diff options
author | Rob Herring <rob.herring@calxeda.com> | 2011-06-28 21:16:13 -0500 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2011-07-12 11:19:29 -0500 |
commit | c9d95fbe59e426eed7f16e7cac812e46ac4772d0 (patch) | |
tree | 7e7c01255fb18932ee4f0c68b1501ab35db7c012 /arch/arm/mach-ixp23xx | |
parent | dc8d966bccde0b8b6c9e8c6e663c747030c17435 (diff) | |
download | talos-obmc-linux-c9d95fbe59e426eed7f16e7cac812e46ac4772d0.tar.gz talos-obmc-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-ixp23xx')
-rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/hardware.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/pci.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp23xx/include/mach/hardware.h b/arch/arm/mach-ixp23xx/include/mach/hardware.h index b8bb781e54f0..60e55fa10238 100644 --- a/arch/arm/mach-ixp23xx/include/mach/hardware.h +++ b/arch/arm/mach-ixp23xx/include/mach/hardware.h @@ -15,8 +15,6 @@ #define __ASM_ARCH_HARDWARE_H /* PCI IO info */ -#define PCIBIOS_MIN_IO 0x00000000 -#define PCIBIOS_MIN_MEM 0xe0000000 #include "ixp23xx.h" diff --git a/arch/arm/mach-ixp23xx/pci.c b/arch/arm/mach-ixp23xx/pci.c index 72d145a2019a..e6be5711c700 100644 --- a/arch/arm/mach-ixp23xx/pci.c +++ b/arch/arm/mach-ixp23xx/pci.c @@ -227,6 +227,9 @@ static void __init ixp23xx_pci_common_init(void) void __init ixp23xx_pci_preinit(void) { + pcibios_min_io = 0; + pcibios_min_mem = 0xe0000000; + pci_set_flags(0); ixp23xx_pci_common_init(); |