diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-06-29 04:22:40 +0200 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-07-12 18:19:29 +0200 |
| commit | cc22b4c18540e5e8bf55c7d124044f9317527d3c (patch) | |
| tree | 77b9980c1824fd389105efe7e7f9693c9c258ad9 /arch/arm/mach-dove | |
| parent | ARM: convert PCI defines to variables (diff) | |
| download | linux-cc22b4c18540e5e8bf55c7d124044f9317527d3c.tar.xz linux-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-dove')
| -rw-r--r-- | arch/arm/mach-dove/include/mach/hardware.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-dove/pcie.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-dove/include/mach/hardware.h b/arch/arm/mach-dove/include/mach/hardware.h index 94c5a2cf5481..f1368b9a8ece 100644 --- a/arch/arm/mach-dove/include/mach/hardware.h +++ b/arch/arm/mach-dove/include/mach/hardware.h @@ -11,9 +11,6 @@ #include "dove.h" -#define PCIMEM_BASE DOVE_PCIE0_MEM_PHYS_BASE - - /* Macros below are required for compatibility with PXA AC'97 driver. */ #define __REG(x) (*((volatile u32 *)((x) - DOVE_SB_REGS_PHYS_BASE + \ DOVE_SB_REGS_VIRT_BASE))) diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c index 502d1ca2f4b7..c2f1c4767f21 100644 --- a/arch/arm/mach-dove/pcie.c +++ b/arch/arm/mach-dove/pcie.c @@ -11,6 +11,7 @@ #include <linux/kernel.h> #include <linux/pci.h> #include <linux/mbus.h> +#include <video/vga.h> #include <asm/mach/pci.h> #include <asm/mach/arch.h> #include <asm/setup.h> @@ -228,6 +229,8 @@ static void __init add_pcie_port(int index, unsigned long base) void __init dove_pcie_init(int init_port0, int init_port1) { + vga_base = DOVE_PCIE0_MEM_PHYS_BASE; + if (init_port0) add_pcie_port(0, DOVE_PCIE0_VIRT_BASE); |