From 4b371249f85c5f2f56f7c76caafe1daf063bc487 Mon Sep 17 00:00:00 2001
From: Steve Muckle <smuckle@codeaurora.org>
Date: Wed, 6 Jan 2010 14:55:24 -0800
Subject: [PATCH] --- yaml --- r: 212607 b: refs/heads/master c:
 6cf6dfefe1f07f309998df8734fdc0961dbae38c h: refs/heads/master i:   212605:
 c484c2da18f291e104b6991569045ae615187e5b   212603:
 d3f66caafea616d38b3634f3691434ec83a9f8d0   212599:
 ad9827e129309e6eb3d53d2e2b2da508f8d8a443   212591:
 774e19fce594f306f75b090e90bb9c2062345d16   212575:
 ca7beb1a02a656ee59f7078b34d564804f7d7365   212543:
 a929442e4ea7b26f4188eef90022fce12f9d5f04   212479:
 493f017ed3e1b0029d32a37dbad4046f8e6ee297 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-msm/include/mach/io.h     |  1 +
 .../mach-msm/include/mach/msm_iomap-8x60.h    | 19 +++++++++++++++++++
 .../arm/mach-msm/include/mach/msm_iomap.h     |  2 ++
 trunk/arch/arm/mach-msm/io.c                  | 15 +++++++++++++++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b587c3ffc88e..c22d4db1fb07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8aabaeb52ef6a0aeb6e8e209431b9bb01dcd287
+refs/heads/master: 6cf6dfefe1f07f309998df8734fdc0961dbae38c
diff --git a/trunk/arch/arm/mach-msm/include/mach/io.h b/trunk/arch/arm/mach-msm/include/mach/io.h
index c35b29f9ac0f..7386e732baad 100644
--- a/trunk/arch/arm/mach-msm/include/mach/io.h
+++ b/trunk/arch/arm/mach-msm/include/mach/io.h
@@ -28,6 +28,7 @@ void __iomem *__msm_ioremap(unsigned long phys_addr, size_t size, unsigned int m
 
 void msm_map_qsd8x50_io(void);
 void msm_map_msm7x30_io(void);
+void msm_map_msm8x60_io(void);
 
 extern unsigned int msm_shared_ram_phys;
 
diff --git a/trunk/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h b/trunk/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
index 17209f78d4a8..c9aa52d6350b 100644
--- a/trunk/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/trunk/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
@@ -35,8 +35,27 @@
  *
  */
 
+#define MSM_QGIC_DIST_BASE	IOMEM(0xF0000000)
+#define MSM_QGIC_DIST_PHYS	0x02080000
+#define MSM_QGIC_DIST_SIZE	SZ_4K
+
+#define MSM_QGIC_CPU_BASE	IOMEM(0xF0001000)
+#define MSM_QGIC_CPU_PHYS	0x02081000
+#define MSM_QGIC_CPU_SIZE	SZ_4K
+
+#define MSM_ACC_BASE		IOMEM(0xF0002000)
+#define MSM_ACC_PHYS		0x02001000
+#define MSM_ACC_SIZE		SZ_4K
+
+#define MSM_GCC_BASE		IOMEM(0xF0003000)
+#define MSM_GCC_PHYS		0x02082000
+#define MSM_GCC_SIZE		SZ_4K
+
 #define MSM_TLMM_BASE		IOMEM(0xF0004000)
 #define MSM_TLMM_PHYS		0x00800000
 #define MSM_TLMM_SIZE		SZ_16K
 
+#define MSM_SHARED_RAM_BASE	IOMEM(0xF0100000)
+#define MSM_SHARED_RAM_SIZE	SZ_1M
+
 #endif
diff --git a/trunk/arch/arm/mach-msm/include/mach/msm_iomap.h b/trunk/arch/arm/mach-msm/include/mach/msm_iomap.h
index 39c8fbcf33e7..8e24dd812139 100644
--- a/trunk/arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/trunk/arch/arm/mach-msm/include/mach/msm_iomap.h
@@ -53,4 +53,6 @@
 #include "msm_iomap-7x00.h"
 #endif
 
+
+
 #endif
diff --git a/trunk/arch/arm/mach-msm/io.c b/trunk/arch/arm/mach-msm/io.c
index 1c05060b5f3b..d36b61074146 100644
--- a/trunk/arch/arm/mach-msm/io.c
+++ b/trunk/arch/arm/mach-msm/io.c
@@ -100,6 +100,21 @@ void __init msm_map_qsd8x50_io(void)
 }
 #endif /* CONFIG_ARCH_QSD8X50 */
 
+#ifdef CONFIG_ARCH_MSM8X60
+static struct map_desc msm8x60_io_desc[] __initdata = {
+	MSM_DEVICE(QGIC_DIST),
+	MSM_DEVICE(QGIC_CPU),
+	MSM_DEVICE(TMR),
+	MSM_DEVICE(ACC),
+	MSM_DEVICE(GCC),
+};
+
+void __init msm_map_msm8x60_io(void)
+{
+	iotable_init(msm8x60_io_desc, ARRAY_SIZE(msm8x60_io_desc));
+}
+#endif /* CONFIG_ARCH_MSM8X60 */
+
 #ifdef CONFIG_ARCH_MSM7X30
 static struct map_desc msm7x30_io_desc[] __initdata = {
 	MSM_DEVICE(VIC),