diff options
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r-- | arch/arm/mach-integrator/include/mach/hardware.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-integrator/pci_v3.c | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/mach-integrator/include/mach/hardware.h b/arch/arm/mach-integrator/include/mach/hardware.h index 57f51ba1125..65fed7c0eb8 100644 --- a/arch/arm/mach-integrator/include/mach/hardware.h +++ b/arch/arm/mach-integrator/include/mach/hardware.h | |||
@@ -32,13 +32,6 @@ | |||
32 | #define IO_SIZE 0x0B000000 // How much? | 32 | #define IO_SIZE 0x0B000000 // How much? |
33 | #define IO_START INTEGRATOR_HDR_BASE // PA of IO | 33 | #define IO_START INTEGRATOR_HDR_BASE // PA of IO |
34 | 34 | ||
35 | #define PCIMEM_BASE PCI_MEMORY_VADDR | ||
36 | |||
37 | #define pcibios_assign_all_busses() 1 | ||
38 | |||
39 | #define PCIBIOS_MIN_IO 0x6000 | ||
40 | #define PCIBIOS_MIN_MEM 0x00100000 | ||
41 | |||
42 | /* macro to get at IO space when running virtually */ | 35 | /* macro to get at IO space when running virtually */ |
43 | #ifdef CONFIG_MMU | 36 | #ifdef CONFIG_MMU |
44 | #define IO_ADDRESS(x) (((x) & 0x000fffff) | (((x) >> 4) & 0x0ff00000) | IO_BASE) | 37 | #define IO_ADDRESS(x) (((x) & 0x000fffff) | (((x) >> 4) & 0x0ff00000) | IO_BASE) |
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index 6467d99fa2e..dd56bfb351e 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/spinlock.h> | 27 | #include <linux/spinlock.h> |
28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
29 | #include <linux/io.h> | 29 | #include <linux/io.h> |
30 | #include <video/vga.h> | ||
30 | 31 | ||
31 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
32 | #include <mach/platform.h> | 33 | #include <mach/platform.h> |
@@ -502,6 +503,10 @@ void __init pci_v3_preinit(void) | |||
502 | unsigned int temp; | 503 | unsigned int temp; |
503 | int ret; | 504 | int ret; |
504 | 505 | ||
506 | pcibios_min_io = 0x6000; | ||
507 | pcibios_min_mem = 0x00100000; | ||
508 | vga_base = PCI_MEMORY_VADDR; | ||
509 | |||
505 | /* | 510 | /* |
506 | * Hook in our fault handler for PCI errors | 511 | * Hook in our fault handler for PCI errors |
507 | */ | 512 | */ |