Merge "msm: iomap-8064: Add RPM, SAW-L2 and SAW-CPU memory map" into msm-3.0
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8064.h b/arch/arm/mach-msm/include/mach/msm_iomap-8064.h
index 7f5bd75..15b2856 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8064.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8064.h
@@ -77,4 +77,25 @@
#define APQ8064_IMEM_PHYS 0x2A03F000
#define APQ8064_IMEM_SIZE SZ_4K
+#define APQ8064_RPM_PHYS 0x00108000
+#define APQ8064_RPM_SIZE SZ_4K
+
+#define APQ8064_RPM_MPM_PHYS 0x00200000
+#define APQ8064_RPM_MPM_SIZE SZ_4K
+
+#define APQ8064_SAW0_PHYS 0x02089000
+#define APQ8064_SAW0_SIZE SZ_4K
+
+#define APQ8064_SAW1_PHYS 0x02099000
+#define APQ8064_SAW1_SIZE SZ_4K
+
+#define APQ8064_SAW2_PHYS 0x020A9000
+#define APQ8064_SAW2_SIZE SZ_4K
+
+#define APQ8064_SAW3_PHYS 0x020B9000
+#define APQ8064_SAW3_SIZE SZ_4K
+
+#define APQ8064_SAW_L2_PHYS 0x02012000
+#define APQ8064_SAW_L2_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 dd01c62..ff0b368 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap.h
@@ -75,8 +75,10 @@
#define MSM_RPM_BASE IOMEM(0xFA801000) /* 4K */
#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_L2CC_BASE IOMEM(0xFA701000) /* 4K */
+#define MSM_APCS_GLB_BASE IOMEM(0xFA702000) /* 4K */
+#define MSM_SAW2_BASE IOMEM(0xFA703000) /* 4k */
+#define MSM_SAW3_BASE IOMEM(0xFA704000) /* 4k */
#if defined(CONFIG_ARCH_MSM9615)
#define MSM_SHARED_RAM_SIZE SZ_1M
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 2d5b0a4..9622a4c 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -265,6 +265,13 @@
MSM_CHIP_DEVICE(MMSS_CLK_CTL, APQ8064),
MSM_CHIP_DEVICE(LPASS_CLK_CTL, APQ8064),
MSM_CHIP_DEVICE(APCS_GCC, APQ8064),
+ MSM_CHIP_DEVICE(RPM, APQ8064),
+ MSM_CHIP_DEVICE(RPM_MPM, APQ8064),
+ MSM_CHIP_DEVICE(SAW0, APQ8064),
+ MSM_CHIP_DEVICE(SAW1, APQ8064),
+ MSM_CHIP_DEVICE(SAW2, APQ8064),
+ MSM_CHIP_DEVICE(SAW3, APQ8064),
+ MSM_CHIP_DEVICE(SAW_L2, APQ8064),
MSM_CHIP_DEVICE(IMEM, APQ8064),
{
.virtual = (unsigned long) MSM_SHARED_RAM_BASE,