From 1a7869f3aa781abfdcf03eb22957928505f57063 Mon Sep 17 00:00:00 2001
From: Changhwan Youn <chaos.youn@samsung.com>
Date: Sat, 16 Jul 2011 10:48:47 +0900
Subject: [PATCH] --- yaml --- r: 260615 b: refs/heads/master c:
 eb13f2bf7254f868486179b75d41c8b17a134996 h: refs/heads/master i:   260613:
 81b579fe0687ba0ac7d1beb51d01ed9b96f2f8ac   260611:
 fd5a9d128211ef15f3ebf3889b94c2d12e68eadb   260607:
 aabc8f920cf0180c913170c512287f6e1f6725bd v: v3

---
 [refs]                                         |  2 +-
 trunk/arch/arm/mach-exynos4/cpu.c              | 12 +++++++++++-
 trunk/arch/arm/mach-exynos4/include/mach/map.h |  7 ++++---
 trunk/arch/arm/plat-s5p/include/plat/map-s5p.h |  5 +++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index d6b4bf2c336a..cc6587771b47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d855f40a47213e488103fdaf74d01eb90a57f09
+refs/heads/master: eb13f2bf7254f868486179b75d41c8b17a134996
diff --git a/trunk/arch/arm/mach-exynos4/cpu.c b/trunk/arch/arm/mach-exynos4/cpu.c
index bfd621460abf..91fc9fc8d763 100644
--- a/trunk/arch/arm/mach-exynos4/cpu.c
+++ b/trunk/arch/arm/mach-exynos4/cpu.c
@@ -103,7 +103,17 @@ static struct map_desc exynos4_iodesc[] __initdata = {
 		.pfn		= __phys_to_pfn(EXYNOS4_PA_HSPHY),
 		.length		= SZ_4K,
 		.type		= MT_DEVICE,
-	}
+	}, {
+		.virtual	= (unsigned long)S5P_VA_GIC_CPU,
+		.pfn		= __phys_to_pfn(EXYNOS4_PA_GIC_CPU),
+		.length		= SZ_64K,
+		.type		= MT_DEVICE,
+	}, {
+		.virtual	= (unsigned long)S5P_VA_GIC_DIST,
+		.pfn		= __phys_to_pfn(EXYNOS4_PA_GIC_DIST),
+		.length		= SZ_64K,
+		.type		= MT_DEVICE,
+	},
 };
 
 static void exynos4_idle(void)
diff --git a/trunk/arch/arm/mach-exynos4/include/mach/map.h b/trunk/arch/arm/mach-exynos4/include/mach/map.h
index 0009e77a05fc..0dbca26dfe64 100644
--- a/trunk/arch/arm/mach-exynos4/include/mach/map.h
+++ b/trunk/arch/arm/mach-exynos4/include/mach/map.h
@@ -57,12 +57,13 @@
 
 #define EXYNOS4_PA_DMC0			0x10400000
 
-#define EXYNOS4_PA_COMBINER		0x10448000
+#define EXYNOS4_PA_COMBINER		0x10440000
+
+#define EXYNOS4_PA_GIC_CPU		0x10480000
+#define EXYNOS4_PA_GIC_DIST		0x10490000
 
 #define EXYNOS4_PA_COREPERI		0x10500000
-#define EXYNOS4_PA_GIC_CPU		0x10500100
 #define EXYNOS4_PA_TWD			0x10500600
-#define EXYNOS4_PA_GIC_DIST		0x10501000
 #define EXYNOS4_PA_L2CC			0x10502000
 
 #define EXYNOS4_PA_MDMA			0x10810000
diff --git a/trunk/arch/arm/plat-s5p/include/plat/map-s5p.h b/trunk/arch/arm/plat-s5p/include/plat/map-s5p.h
index d973d39666a3..36d3551173b2 100644
--- a/trunk/arch/arm/plat-s5p/include/plat/map-s5p.h
+++ b/trunk/arch/arm/plat-s5p/include/plat/map-s5p.h
@@ -35,9 +35,10 @@
 #define S5P_VA_COREPERI_BASE	S3C_ADDR(0x02800000)
 #define S5P_VA_COREPERI(x)	(S5P_VA_COREPERI_BASE + (x))
 #define S5P_VA_SCU		S5P_VA_COREPERI(0x0)
-#define S5P_VA_GIC_CPU		S5P_VA_COREPERI(0x100)
 #define S5P_VA_TWD		S5P_VA_COREPERI(0x600)
-#define S5P_VA_GIC_DIST		S5P_VA_COREPERI(0x1000)
+
+#define S5P_VA_GIC_CPU		S3C_ADDR(0x02810000)
+#define S5P_VA_GIC_DIST		S3C_ADDR(0x02820000)
 
 #define S3C_VA_USB_HSPHY	S3C_ADDR(0x02900000)