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-mv78xx0 | |
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-mv78xx0')
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/hardware.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/pcie.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mv78xx0/include/mach/hardware.h b/arch/arm/mach-mv78xx0/include/mach/hardware.h index 29e37ed5f7f..67cab0a08e0 100644 --- a/arch/arm/mach-mv78xx0/include/mach/hardware.h +++ b/arch/arm/mach-mv78xx0/include/mach/hardware.h | |||
@@ -11,7 +11,4 @@ | |||
11 | 11 | ||
12 | #include "mv78xx0.h" | 12 | #include "mv78xx0.h" |
13 | 13 | ||
14 | #define PCIMEM_BASE MV78XX0_PCIE_MEM_PHYS_BASE /* mem base for VGA */ | ||
15 | |||
16 | |||
17 | #endif | 14 | #endif |
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index a560439dcc3..445a332325d 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
12 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
13 | #include <linux/mbus.h> | 13 | #include <linux/mbus.h> |
14 | #include <video/vga.h> | ||
14 | #include <asm/irq.h> | 15 | #include <asm/irq.h> |
15 | #include <asm/mach/pci.h> | 16 | #include <asm/mach/pci.h> |
16 | #include <plat/pcie.h> | 17 | #include <plat/pcie.h> |
@@ -297,6 +298,8 @@ static void __init add_pcie_port(int maj, int min, unsigned long base) | |||
297 | 298 | ||
298 | void __init mv78xx0_pcie_init(int init_port0, int init_port1) | 299 | void __init mv78xx0_pcie_init(int init_port0, int init_port1) |
299 | { | 300 | { |
301 | vga_base = MV78XX0_PCIE_MEM_PHYS_BASE; | ||
302 | |||
300 | if (init_port0) { | 303 | if (init_port0) { |
301 | add_pcie_port(0, 0, PCIE00_VIRT_BASE); | 304 | add_pcie_port(0, 0, PCIE00_VIRT_BASE); |
302 | if (!orion_pcie_x4_mode((void __iomem *)PCIE00_VIRT_BASE)) { | 305 | if (!orion_pcie_x4_mode((void __iomem *)PCIE00_VIRT_BASE)) { |