From cc436af11a7979fe5a8b7947237a96c322e4378c Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Tue, 28 Jun 2011 21:22:40 -0500
Subject: [PATCH] --- yaml --- r: 260505 b: refs/heads/master c:
 cc22b4c18540e5e8bf55c7d124044f9317527d3c h: refs/heads/master i:   260503:
 7c5c685c48accd18ac975e454f883c5717bf36e1 v: v3

---
 [refs]                                                 | 2 +-
 trunk/arch/arm/include/asm/vga.h                       | 5 +++--
 trunk/arch/arm/mach-dove/include/mach/hardware.h       | 3 ---
 trunk/arch/arm/mach-dove/pcie.c                        | 3 +++
 trunk/arch/arm/mach-footbridge/dc21285.c               | 1 +
 trunk/arch/arm/mach-integrator/include/mach/hardware.h | 2 --
 trunk/arch/arm/mach-integrator/pci_v3.c                | 2 ++
 trunk/arch/arm/mach-kirkwood/include/mach/hardware.h   | 3 ---
 trunk/arch/arm/mach-kirkwood/pcie.c                    | 3 +++
 trunk/arch/arm/mach-mv78xx0/include/mach/hardware.h    | 3 ---
 trunk/arch/arm/mach-mv78xx0/pcie.c                     | 3 +++
 trunk/arch/arm/mach-orion5x/include/mach/hardware.h    | 3 ---
 trunk/arch/arm/mach-orion5x/pci.c                      | 2 ++
 trunk/arch/arm/mach-shark/include/mach/hardware.h      | 2 --
 trunk/arch/arm/mach-shark/pci.c                        | 2 ++
 trunk/arch/arm/mm/iomap.c                              | 3 +++
 16 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 5d0d95f8e829..c5746ae70765 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9d95fbe59e426eed7f16e7cac812e46ac4772d0
+refs/heads/master: cc22b4c18540e5e8bf55c7d124044f9317527d3c
diff --git a/trunk/arch/arm/include/asm/vga.h b/trunk/arch/arm/include/asm/vga.h
index 250a4dd00630..91f40217bfa5 100644
--- a/trunk/arch/arm/include/asm/vga.h
+++ b/trunk/arch/arm/include/asm/vga.h
@@ -2,9 +2,10 @@
 #define ASMARM_VGA_H
 
 #include <linux/io.h>
-#include <mach/hardware.h>
 
-#define VGA_MAP_MEM(x,s)	(PCIMEM_BASE + (x))
+extern unsigned long vga_base;
+
+#define VGA_MAP_MEM(x,s)	(vga_base + (x))
 
 #define vga_readb(x)	(*((volatile unsigned char *)x))
 #define vga_writeb(x,y)	(*((volatile unsigned char *)y) = (x))
diff --git a/trunk/arch/arm/mach-dove/include/mach/hardware.h b/trunk/arch/arm/mach-dove/include/mach/hardware.h
index 94c5a2cf5481..f1368b9a8ece 100644
--- a/trunk/arch/arm/mach-dove/include/mach/hardware.h
+++ b/trunk/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/trunk/arch/arm/mach-dove/pcie.c b/trunk/arch/arm/mach-dove/pcie.c
index 502d1ca2f4b7..c2f1c4767f21 100644
--- a/trunk/arch/arm/mach-dove/pcie.c
+++ b/trunk/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);
 
diff --git a/trunk/arch/arm/mach-footbridge/dc21285.c b/trunk/arch/arm/mach-footbridge/dc21285.c
index a8dfa00e4596..1331fff51ae2 100644
--- a/trunk/arch/arm/mach-footbridge/dc21285.c
+++ b/trunk/arch/arm/mach-footbridge/dc21285.c
@@ -296,6 +296,7 @@ void __init dc21285_preinit(void)
 	int cfn_mode;
 
 	pcibios_min_mem = 0x81000000;
+	vga_base = PCIMEM_BASE;
 
 	mem_size = (unsigned int)high_memory - PAGE_OFFSET;
 	for (mem_mask = 0x00100000; mem_mask < 0x10000000; mem_mask <<= 1)
diff --git a/trunk/arch/arm/mach-integrator/include/mach/hardware.h b/trunk/arch/arm/mach-integrator/include/mach/hardware.h
index 0ce52121dabe..65fed7c0eb84 100644
--- a/trunk/arch/arm/mach-integrator/include/mach/hardware.h
+++ b/trunk/arch/arm/mach-integrator/include/mach/hardware.h
@@ -32,8 +32,6 @@
 #define IO_SIZE			0x0B000000                 // How much?
 #define IO_START		INTEGRATOR_HDR_BASE        // PA of IO
 
-#define PCIMEM_BASE		PCI_MEMORY_VADDR
-
 /* macro to get at IO space when running virtually */
 #ifdef CONFIG_MMU
 #define IO_ADDRESS(x)	(((x) & 0x000fffff) | (((x) >> 4) & 0x0ff00000) | IO_BASE)
diff --git a/trunk/arch/arm/mach-integrator/pci_v3.c b/trunk/arch/arm/mach-integrator/pci_v3.c
index 11b86e5b71c2..dd56bfb351e3 100644
--- a/trunk/arch/arm/mach-integrator/pci_v3.c
+++ b/trunk/arch/arm/mach-integrator/pci_v3.c
@@ -27,6 +27,7 @@
 #include <linux/spinlock.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <video/vga.h>
 
 #include <mach/hardware.h>
 #include <mach/platform.h>
@@ -504,6 +505,7 @@ void __init pci_v3_preinit(void)
 
 	pcibios_min_io = 0x6000;
 	pcibios_min_mem = 0x00100000;
+	vga_base = PCI_MEMORY_VADDR;
 
 	/*
 	 * Hook in our fault handler for PCI errors
diff --git a/trunk/arch/arm/mach-kirkwood/include/mach/hardware.h b/trunk/arch/arm/mach-kirkwood/include/mach/hardware.h
index 470899b6a3f5..742b74f43e41 100644
--- a/trunk/arch/arm/mach-kirkwood/include/mach/hardware.h
+++ b/trunk/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/trunk/arch/arm/mach-kirkwood/pcie.c b/trunk/arch/arm/mach-kirkwood/pcie.c
index ca294ff6d5be..bfeb9c900cec 100644
--- a/trunk/arch/arm/mach-kirkwood/pcie.c
+++ b/trunk/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);
 
diff --git a/trunk/arch/arm/mach-mv78xx0/include/mach/hardware.h b/trunk/arch/arm/mach-mv78xx0/include/mach/hardware.h
index 29e37ed5f7f5..67cab0a08e07 100644
--- a/trunk/arch/arm/mach-mv78xx0/include/mach/hardware.h
+++ b/trunk/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/trunk/arch/arm/mach-mv78xx0/pcie.c b/trunk/arch/arm/mach-mv78xx0/pcie.c
index a560439dcc3c..445a332325d5 100644
--- a/trunk/arch/arm/mach-mv78xx0/pcie.c
+++ b/trunk/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)) {
diff --git a/trunk/arch/arm/mach-orion5x/include/mach/hardware.h b/trunk/arch/arm/mach-orion5x/include/mach/hardware.h
index b6d55bc3b2f8..395735482473 100644
--- a/trunk/arch/arm/mach-orion5x/include/mach/hardware.h
+++ b/trunk/arch/arm/mach-orion5x/include/mach/hardware.h
@@ -11,7 +11,4 @@
 
 #include "orion5x.h"
 
-#define PCIMEM_BASE		ORION5X_PCIE_MEM_PHYS_BASE
-
-
 #endif
diff --git a/trunk/arch/arm/mach-orion5x/pci.c b/trunk/arch/arm/mach-orion5x/pci.c
index e8706f15a670..f64965d4f8e8 100644
--- a/trunk/arch/arm/mach-orion5x/pci.c
+++ b/trunk/arch/arm/mach-orion5x/pci.c
@@ -560,6 +560,8 @@ int __init orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys)
 {
 	int ret = 0;
 
+	vga_base = ORION5X_PCIE_MEM_PHYS_BASE;
+
 	if (nr == 0) {
 		orion_pcie_set_local_bus_nr(PCIE_BASE, sys->busnr);
 		ret = pcie_setup(sys);
diff --git a/trunk/arch/arm/mach-shark/include/mach/hardware.h b/trunk/arch/arm/mach-shark/include/mach/hardware.h
index 4342931a1502..663f952a8ab3 100644
--- a/trunk/arch/arm/mach-shark/include/mach/hardware.h
+++ b/trunk/arch/arm/mach-shark/include/mach/hardware.h
@@ -12,7 +12,5 @@
 
 #define UNCACHEABLE_ADDR        0xdf010000
 
-#define PCIMEM_BASE		0xe8000000
-
 #endif
 
diff --git a/trunk/arch/arm/mach-shark/pci.c b/trunk/arch/arm/mach-shark/pci.c
index 4aea637a2ddb..92d7227de0ac 100644
--- a/trunk/arch/arm/mach-shark/pci.c
+++ b/trunk/arch/arm/mach-shark/pci.c
@@ -8,6 +8,7 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <video/vga.h>
 
 #include <asm/irq.h>
 #include <asm/mach/pci.h>
@@ -42,6 +43,7 @@ static int __init shark_pci_init(void)
 
 	pcibios_min_io = 0x6000;
 	pcibios_min_mem = 0x50000000;
+	vga_base = 0xe8000000;
 
 	pci_common_init(&shark_pci);
 
diff --git a/trunk/arch/arm/mm/iomap.c b/trunk/arch/arm/mm/iomap.c
index 3d46cf466c4c..430df1a5978d 100644
--- a/trunk/arch/arm/mm/iomap.c
+++ b/trunk/arch/arm/mm/iomap.c
@@ -9,6 +9,9 @@
 #include <linux/ioport.h>
 #include <linux/io.h>
 
+unsigned long vga_base;
+EXPORT_SYMBOL(vga_base);
+
 #ifdef __io
 void __iomem *ioport_map(unsigned long port, unsigned int nr)
 {