diff options
author | Rob Herring <rob.herring@calxeda.com> | 2011-06-28 22:16:13 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2011-07-12 12:19:29 -0400 |
commit | c9d95fbe59e426eed7f16e7cac812e46ac4772d0 (patch) | |
tree | 7e7c01255fb18932ee4f0c68b1501ab35db7c012 /arch/arm/mach-ks8695 | |
parent | dc8d966bccde0b8b6c9e8c6e663c747030c17435 (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/mach-ks8695')
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/hardware.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-ks8695/pci.c | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-ks8695/include/mach/hardware.h b/arch/arm/mach-ks8695/include/mach/hardware.h index a46be88d8965..5e0c388143da 100644 --- a/arch/arm/mach-ks8695/include/mach/hardware.h +++ b/arch/arm/mach-ks8695/include/mach/hardware.h | |||
@@ -42,11 +42,4 @@ | |||
42 | #define KS8695_PCIIO_PA 0x80000000 | 42 | #define KS8695_PCIIO_PA 0x80000000 |
43 | #define KS8695_PCIIO_SIZE SZ_64K | 43 | #define KS8695_PCIIO_SIZE SZ_64K |
44 | 44 | ||
45 | |||
46 | /* | ||
47 | * PCI support | ||
48 | */ | ||
49 | #define PCIBIOS_MIN_IO 0 | ||
50 | #define PCIBIOS_MIN_MEM 0 | ||
51 | |||
52 | #endif | 45 | #endif |
diff --git a/arch/arm/mach-ks8695/pci.c b/arch/arm/mach-ks8695/pci.c index 5fcd082a17f9..c7c9a188d105 100644 --- a/arch/arm/mach-ks8695/pci.c +++ b/arch/arm/mach-ks8695/pci.c | |||
@@ -317,6 +317,9 @@ void __init ks8695_init_pci(struct ks8695_pci_cfg *cfg) | |||
317 | return; | 317 | return; |
318 | } | 318 | } |
319 | 319 | ||
320 | pcibios_min_io = 0; | ||
321 | pcibios_min_mem = 0; | ||
322 | |||
320 | printk(KERN_INFO "PCI: Initialising\n"); | 323 | printk(KERN_INFO "PCI: Initialising\n"); |
321 | ks8695_show_pciregs(); | 324 | ks8695_show_pciregs(); |
322 | 325 | ||