diff options
author | Rob Herring <rob.herring@calxeda.com> | 2011-06-29 02:22:40 (GMT) |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2011-07-12 16:19:29 (GMT) |
commit | cc22b4c18540e5e8bf55c7d124044f9317527d3c (patch) | |
tree | 77b9980c1824fd389105efe7e7f9693c9c258ad9 /arch/arm/mach-kirkwood | |
parent | c9d95fbe59e426eed7f16e7cac812e46ac4772d0 (diff) | |
download | linux-fsl-qoriq-cc22b4c18540e5e8bf55c7d124044f9317527d3c.tar.xz |
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')
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/hardware.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/pcie.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/hardware.h b/arch/arm/mach-kirkwood/include/mach/hardware.h index 470899b..742b74f 100644 --- a/arch/arm/mach-kirkwood/include/mach/hardware.h +++ b/arch/arm/mach-kirkwood/include/mach/hardware.h @@ -11,7 +11,4 @@ #include "kirkwood.h" -#define PCIMEM_BASE KIRKWOOD_PCIE_MEM_PHYS_BASE /* mem base for VGA */ - - #endif diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c index ca294ff..bfeb9c9 100644 --- a/arch/arm/mach-kirkwood/pcie.c +++ b/arch/arm/mach-kirkwood/pcie.c @@ -12,6 +12,7 @@ #include <linux/pci.h> #include <linux/slab.h> #include <linux/mbus.h> +#include <video/vga.h> #include <asm/irq.h> #include <asm/mach/pci.h> #include <plat/pcie.h> @@ -271,6 +272,8 @@ static void __init add_pcie_port(int index, unsigned long base) void __init kirkwood_pcie_init(unsigned int portmask) { + vga_base = KIRKWOOD_PCIE_MEM_PHYS_BASE; + if (portmask & KW_PCIE0) add_pcie_port(0, PCIE_VIRT_BASE); |