diff options
author | Rob Herring <rob.herring@calxeda.com> | 2011-06-28 22:22:40 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2011-07-12 12:19:29 -0400 |
commit | cc22b4c18540e5e8bf55c7d124044f9317527d3c (patch) | |
tree | 77b9980c1824fd389105efe7e7f9693c9c258ad9 /arch/arm/mach-kirkwood/pcie.c | |
parent | c9d95fbe59e426eed7f16e7cac812e46ac4772d0 (diff) |
ARM: set vga memory base at run-time
Convert the incorrectly named PCIMEM_BASE to a variable called vga_base.
This removes the dependency on mach/hardware.h.
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-kirkwood/pcie.c')
-rw-r--r-- | arch/arm/mach-kirkwood/pcie.c | 3 |
1 files changed, 3 insertions, 0 deletions
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 | ||