diff options
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/hardware.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/pcie.c | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/hardware.h b/arch/arm/mach-kirkwood/include/mach/hardware.h index cde85283f7d3..742b74f43e41 100644 --- a/arch/arm/mach-kirkwood/include/mach/hardware.h +++ b/arch/arm/mach-kirkwood/include/mach/hardware.h | |||
@@ -11,11 +11,4 @@ | |||
11 | 11 | ||
12 | #include "kirkwood.h" | 12 | #include "kirkwood.h" |
13 | 13 | ||
14 | #define pcibios_assign_all_busses() 1 | ||
15 | |||
16 | #define PCIBIOS_MIN_IO 0x00001000 | ||
17 | #define PCIBIOS_MIN_MEM 0x01000000 | ||
18 | #define PCIMEM_BASE KIRKWOOD_PCIE_MEM_PHYS_BASE /* mem base for VGA */ | ||
19 | |||
20 | |||
21 | #endif | 14 | #endif |
diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c index ca294ff6d5be..bfeb9c900cec 100644 --- a/arch/arm/mach-kirkwood/pcie.c +++ b/arch/arm/mach-kirkwood/pcie.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
13 | #include <linux/slab.h> | 13 | #include <linux/slab.h> |
14 | #include <linux/mbus.h> | 14 | #include <linux/mbus.h> |
15 | #include <video/vga.h> | ||
15 | #include <asm/irq.h> | 16 | #include <asm/irq.h> |
16 | #include <asm/mach/pci.h> | 17 | #include <asm/mach/pci.h> |
17 | #include <plat/pcie.h> | 18 | #include <plat/pcie.h> |
@@ -271,6 +272,8 @@ static void __init add_pcie_port(int index, unsigned long base) | |||
271 | 272 | ||
272 | void __init kirkwood_pcie_init(unsigned int portmask) | 273 | void __init kirkwood_pcie_init(unsigned int portmask) |
273 | { | 274 | { |
275 | vga_base = KIRKWOOD_PCIE_MEM_PHYS_BASE; | ||
276 | |||
274 | if (portmask & KW_PCIE0) | 277 | if (portmask & KW_PCIE0) |
275 | add_pcie_port(0, PCIE_VIRT_BASE); | 278 | add_pcie_port(0, PCIE_VIRT_BASE); |
276 | 279 | ||