diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-06-28 21:22:40 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-07-12 11:19:29 -0500 |
| commit | cc22b4c18540e5e8bf55c7d124044f9317527d3c (patch) | |
| tree | 77b9980c1824fd389105efe7e7f9693c9c258ad9 /arch/arm/mach-mv78xx0 | |
| parent | c9d95fbe59e426eed7f16e7cac812e46ac4772d0 (diff) | |
| download | linux-stable-cc22b4c18540e5e8bf55c7d124044f9317527d3c.tar.gz linux-stable-cc22b4c18540e5e8bf55c7d124044f9317527d3c.tar.bz2 linux-stable-cc22b4c18540e5e8bf55c7d124044f9317527d3c.zip | |
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 29e37ed5f7f5..67cab0a08e07 100644 --- a/arch/arm/mach-mv78xx0/include/mach/hardware.h +++ b/arch/arm/mach-mv78xx0/include/mach/hardware.h @@ -11,7 +11,4 @@ #include "mv78xx0.h" -#define PCIMEM_BASE MV78XX0_PCIE_MEM_PHYS_BASE /* mem base for VGA */ - - #endif diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index a560439dcc3c..445a332325d5 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c @@ -11,6 +11,7 @@ #include <linux/kernel.h> #include <linux/pci.h> #include <linux/mbus.h> +#include <video/vga.h> #include <asm/irq.h> #include <asm/mach/pci.h> #include <plat/pcie.h> @@ -297,6 +298,8 @@ static void __init add_pcie_port(int maj, int min, unsigned long base) void __init mv78xx0_pcie_init(int init_port0, int init_port1) { + vga_base = MV78XX0_PCIE_MEM_PHYS_BASE; + if (init_port0) { add_pcie_port(0, 0, PCIE00_VIRT_BASE); if (!orion_pcie_x4_mode((void __iomem *)PCIE00_VIRT_BASE)) { |