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-shark | |
| parent | dc8d966bccde0b8b6c9e8c6e663c747030c17435 (diff) | |
| download | kernel-common-c9d95fbe59e426eed7f16e7cac812e46ac4772d0.tar.gz kernel-common-c9d95fbe59e426eed7f16e7cac812e46ac4772d0.tar.bz2 kernel-common-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-shark')
| -rw-r--r-- | arch/arm/mach-shark/include/mach/hardware.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shark/pci.c | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mach-shark/include/mach/hardware.h b/arch/arm/mach-shark/include/mach/hardware.h index 24639ce5d308..4342931a1502 100644 --- a/arch/arm/mach-shark/include/mach/hardware.h +++ b/arch/arm/mach-shark/include/mach/hardware.h @@ -12,8 +12,6 @@ #define UNCACHEABLE_ADDR 0xdf010000 -#define PCIBIOS_MIN_IO 0x6000 -#define PCIBIOS_MIN_MEM 0x50000000 #define PCIMEM_BASE 0xe8000000 #endif diff --git a/arch/arm/mach-shark/pci.c b/arch/arm/mach-shark/pci.c index 89d175ce74d2..4aea637a2ddb 100644 --- a/arch/arm/mach-shark/pci.c +++ b/arch/arm/mach-shark/pci.c @@ -37,8 +37,14 @@ static struct hw_pci shark_pci __initdata = { static int __init shark_pci_init(void) { - if (machine_is_shark()) - pci_common_init(&shark_pci); + if (!machine_is_shark()) + return; + + pcibios_min_io = 0x6000; + pcibios_min_mem = 0x50000000; + + pci_common_init(&shark_pci); + return 0; } |