From 7666cfa413b8b9c74701ca36ec79221077f184b1 Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Sun, 18 Jun 2006 16:21:52 +0100
Subject: [PATCH] --- yaml --- r: 27711 b: refs/heads/master c:
 68d5969378fc21d9f70c0fdbc25176a68d873922 h: refs/heads/master i:   27709:
 f5c4e97419c46d359343b5cc0fd49ed6890f0abb   27707:
 5c8ec9ff37853aeab3960e5ea7171f6bd5ddc134   27703:
 7e726a7ac2a0c01ddd4e2474098369c9b1e1a0b9   27695:
 7775640ca6ed3adbc766834fb525b9c39072f594   27679:
 33ccadc2864ae2ce181921b0b8edd7321970f0f4   27647:
 d1f4bd037338f27e740e498ef049f7964045f4b4 v: v3

---
 [refs]                                   |  2 +-
 trunk/include/asm-arm/arch-s3c2410/map.h | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fffddd6c9f0c..8aa0936898ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4833acb2e19f669ce87c439a7d91ead600d8a7c9
+refs/heads/master: 68d5969378fc21d9f70c0fdbc25176a68d873922
diff --git a/trunk/include/asm-arm/arch-s3c2410/map.h b/trunk/include/asm-arm/arch-s3c2410/map.h
index c380d264a847..5e4c8c37bc66 100644
--- a/trunk/include/asm-arm/arch-s3c2410/map.h
+++ b/trunk/include/asm-arm/arch-s3c2410/map.h
@@ -126,9 +126,18 @@
 #define S3C24XX_SZ_IIS	   SZ_1M
 
 /* GPIO ports */
-#define S3C24XX_VA_GPIO	   S3C2410_ADDR(0x00E00000)
+
+/* the calculation for the VA of this must ensure that
+ * it is the same distance apart from the UART in the
+ * phsyical address space, as the initial mapping for the IO
+ * is done as a 1:1 maping. This puts it (currently) at
+ * 0xF6800000, which is not in the way of any current mapping
+ * by the base system.
+*/
+
 #define S3C2400_PA_GPIO	   (0x15600000)
 #define S3C2410_PA_GPIO	   (0x56000000)
+#define S3C24XX_VA_GPIO	   ((S3C2410_PA_GPIO - S3C24XX_PA_UART) + S3C24XX_VA_UART)
 #define S3C24XX_SZ_GPIO	   SZ_1M
 
 /* RTC */