aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2011-06-28 22:16:13 -0400
committerRob Herring <rob.herring@calxeda.com>2011-07-12 12:19:29 -0400
commitc9d95fbe59e426eed7f16e7cac812e46ac4772d0 (patch)
tree7e7c01255fb18932ee4f0c68b1501ab35db7c012 /arch/arm/mm
parentdc8d966bccde0b8b6c9e8c6e663c747030c17435 (diff)
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/mm')
-rw-r--r--arch/arm/mm/iomap.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mm/iomap.c b/arch/arm/mm/iomap.c
index ad41414c0280..3d46cf466c4c 100644
--- a/arch/arm/mm/iomap.c
+++ b/arch/arm/mm/iomap.c
@@ -8,7 +8,6 @@
8#include <linux/pci.h> 8#include <linux/pci.h>
9#include <linux/ioport.h> 9#include <linux/ioport.h>
10#include <linux/io.h> 10#include <linux/io.h>
11#include <asm/pci.h>
12 11
13#ifdef __io 12#ifdef __io
14void __iomem *ioport_map(unsigned long port, unsigned int nr) 13void __iomem *ioport_map(unsigned long port, unsigned int nr)
@@ -24,6 +23,12 @@ EXPORT_SYMBOL(ioport_unmap);
24#endif 23#endif
25 24
26#ifdef CONFIG_PCI 25#ifdef CONFIG_PCI
26unsigned long pcibios_min_io = 0x1000;
27EXPORT_SYMBOL(pcibios_min_io);
28
29unsigned long pcibios_min_mem = 0x01000000;
30EXPORT_SYMBOL(pcibios_min_mem);
31
27unsigned int pci_flags = PCI_REASSIGN_ALL_RSRC; 32unsigned int pci_flags = PCI_REASSIGN_ALL_RSRC;
28EXPORT_SYMBOL(pci_flags); 33EXPORT_SYMBOL(pci_flags);
29 34