msm: iomap: Add the RPM, APCS_GLB base for MSM9615

This patch corrects the APCS_GCC base used by the RPM and
adds the RPM, RPM_MPM and APCS_GLB base to the iomap.

Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-9615.h b/arch/arm/mach-msm/include/mach/msm_iomap-9615.h
index 9f14e88..b24fd24 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-9615.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-9615.h
@@ -50,7 +50,7 @@
 #define MSM9615_ACC0_PHYS		0x02008000
 #define MSM9615_ACC0_SIZE		SZ_4K
 
-#define MSM9615_APCS_GCC_PHYS		0x02010000
+#define MSM9615_APCS_GCC_PHYS		0x02011000
 #define MSM9615_APCS_GCC_SIZE		SZ_4K
 
 #define MSM9615_SAW0_PHYS		0x02009000
@@ -68,4 +68,13 @@
 #define MSM9615_LPASS_CLK_CTL_PHYS      0x28000000
 #define MSM9615_LPASS_CLK_CTL_SIZE      SZ_4K
 
+#define MSM9615_RPM_PHYS		0x00108000
+#define MSM9615_RPM_SIZE		SZ_4K
+
+#define MSM9615_RPM_MPM_PHYS		0x00200000
+#define MSM9615_RPM_MPM_SIZE		SZ_4K
+
+#define MSM9615_APCS_GLB_PHYS		0x02010000
+#define MSM9615_APCS_GLB_SIZE		SZ_4K
+
 #endif
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h
index 976199c..2ba3f9c 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap.h
@@ -74,6 +74,7 @@
 #define MSM_RPM_MPM_BASE	IOMEM(0xFA802000)	/*  4K	*/
 #define MSM_QFPROM_BASE		IOMEM(0xFA700000)	/*  4K  */
 #define MSM_L2CC_BASE		IOMEM(0xFA701000)	/* 4K */
+#define MSM_APCS_GLB_BASE	IOMEM(0xFA702000)	/* 4K */
 
 #define MSM_SHARED_RAM_SIZE	SZ_2M
 
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index f4b981c..36ff4fb 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -321,6 +321,9 @@
 	MSM_CHIP_DEVICE(L2CC, MSM9615),
 	MSM_CHIP_DEVICE(CLK_CTL, MSM9615),
 	MSM_CHIP_DEVICE(LPASS_CLK_CTL, MSM9615),
+	MSM_CHIP_DEVICE(RPM, MSM9615),
+	MSM_CHIP_DEVICE(RPM_MPM, MSM9615),
+	MSM_CHIP_DEVICE(APCS_GLB, MSM9615),
 	{
 		.virtual =  (unsigned long) MSM_SHARED_RAM_BASE,
 		.length =   MSM_SHARED_RAM_SIZE,