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-versatile | |
parent | dc8d966bccde0b8b6c9e8c6e663c747030c17435 (diff) | |
download | kernel_samsung_smdk4412-c9d95fbe59e426eed7f16e7cac812e46ac4772d0.zip kernel_samsung_smdk4412-c9d95fbe59e426eed7f16e7cac812e46ac4772d0.tar.gz kernel_samsung_smdk4412-c9d95fbe59e426eed7f16e7cac812e46ac4772d0.tar.bz2 |
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-versatile')
-rw-r--r-- | arch/arm/mach-versatile/include/mach/hardware.h | 4 | ||||
-rw-r--r-- | arch/arm/mach-versatile/pci.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-versatile/include/mach/hardware.h b/arch/arm/mach-versatile/include/mach/hardware.h index 8f60e94..4d4973d 100644 --- a/arch/arm/mach-versatile/include/mach/hardware.h +++ b/arch/arm/mach-versatile/include/mach/hardware.h @@ -30,10 +30,6 @@ #define VERSATILE_PCI_VIRT_BASE (void __iomem *)0xe8000000ul #define VERSATILE_PCI_CFG_VIRT_BASE (void __iomem *)0xe9000000ul -/* CIK guesswork */ -#define PCIBIOS_MIN_IO 0x44000000 -#define PCIBIOS_MIN_MEM 0x50000000 - /* macro to get at IO space when running virtually */ #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c index 13c7e5f..7848a17 100644 --- a/arch/arm/mach-versatile/pci.c +++ b/arch/arm/mach-versatile/pci.c @@ -311,6 +311,9 @@ struct pci_bus * __init pci_versatile_scan_bus(int nr, struct pci_sys_data *sys) void __init pci_versatile_preinit(void) { + pcibios_min_io = 0x44000000; + pcibios_min_mem = 0x50000000; + __raw_writel(VERSATILE_PCI_MEM_BASE0 >> 28, PCI_IMAP0); __raw_writel(VERSATILE_PCI_MEM_BASE1 >> 28, PCI_IMAP1); __raw_writel(VERSATILE_PCI_MEM_BASE2 >> 28, PCI_IMAP2); |