msm_iomap: Unify the IO map for 7x27a and 8625
Unified iomap for for 7k and 8k had an issue where two address spaces
for 7x27A was overlapping and creating idle and suspend count problems,
this is fixed now.
Signed-off-by: Taniya Das <tdas@codeaurora.org>
Change-Id: I88f278b426b82373d0383092df0f556981cc8472
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8625.h b/arch/arm/mach-msm/include/mach/msm_iomap-8625.h
index 8088a4c..3435c2a 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8625.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8625.h
@@ -48,11 +48,11 @@
#define MSM8625_SCU_PHYS 0xC0600000
#define MSM8625_SCU_SIZE SZ_256
-#define MSM8625_SPM0_PHYS 0xC0200000
-#define MSM8625_SPM0_SIZE SZ_4K
+#define MSM8625_SAW0_PHYS 0xC0200000
+#define MSM8625_SAW0_SIZE SZ_4K
-#define MSM8625_SPM1_PHYS 0xC0700000
-#define MSM8625_SPM1_SIZE SZ_4K
+#define MSM8625_SAW1_PHYS 0xC0700000
+#define MSM8625_SAW1_SIZE SZ_4K
#define MSM8625_CFG_CTL_PHYS 0xA9800000
#define MSM8625_CFG_CTL_SIZE SZ_4K
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h
index d53910d..7715811 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap.h
@@ -47,7 +47,9 @@
#if defined(CONFIG_ARCH_MSM8960) || defined(CONFIG_ARCH_APQ8064) || \
defined(CONFIG_ARCH_MSM8930) || defined(CONFIG_ARCH_MSM9615) || \
- defined(CONFIG_ARCH_MSMCOPPER)
+ defined(CONFIG_ARCH_MSMCOPPER) || defined(CONFIG_ARCH_MSM7X27) || \
+ defined(CONFIG_ARCH_MSM7X25) || defined(CONFIG_ARCH_MSM7X01A) || \
+ defined(CONFIG_ARCH_MSM8625)
/* Unified iomap */
@@ -80,13 +82,28 @@
#define MSM_APCS_GLB_BASE IOMEM(0xFA702000) /* 4K */
#define MSM_SAW2_BASE IOMEM(0xFA703000) /* 4k */
#define MSM_SAW3_BASE IOMEM(0xFA704000) /* 4k */
+#define MSM_VIC_BASE IOMEM(0xFA100000) /* 4K */
+#define MSM_CSR_BASE IOMEM(0xFA101000) /* 4K */
+#define MSM_GPIO1_BASE IOMEM(0xFA102000) /* 4K */
+#define MSM_GPIO2_BASE IOMEM(0xFA103000) /* 4K */
+#define MSM_SCU_BASE IOMEM(0xFA102000) /* 4K */
+#define MSM_CFG_CTL_BASE IOMEM(0xFA00C000) /* 4K */
+#define MSM_MDC_BASE IOMEM(0xFA400000) /* 1M */
+#define MSM_AD5_BASE IOMEM(0xFA900000) /* 13M (D00000)
+ 0xFB600000 */
-#if defined(CONFIG_ARCH_MSM9615)
+#define MSM_STRONGLY_ORDERED_PAGE 0xFA0F0000
+#define MSM8625_SECONDARY_PHYS 0x0FE00000
+
+
+#if defined(CONFIG_ARCH_MSM9615) || defined(CONFIG_ARCH_MSM7X27)
#define MSM_SHARED_RAM_SIZE SZ_1M
#else
#define MSM_SHARED_RAM_SIZE SZ_2M
#endif
+#include "msm_iomap-7xxx.h"
+#include "msm_iomap-8625.h"
#include "msm_iomap-8960.h"
#include "msm_iomap-8930.h"
#include "msm_iomap-8064.h"
@@ -105,29 +122,7 @@
#elif defined(CONFIG_ARCH_FSM9XXX)
#include "msm_iomap-fsm9xxx.h"
#else
-#define MSM_VIC_BASE IOMEM(0xFA000000) /* 4K */
-#define MSM_CSR_BASE IOMEM(0xFA001000) /* 4K */
-#define MSM_TMR_BASE MSM_CSR_BASE /* 4K */
-#define MSM_TMR0_BASE IOMEM(0xFA002000) /* 4K */
-#define MSM_GPIO1_BASE IOMEM(0xFA003000) /* 4K */
-#define MSM_GPIO2_BASE IOMEM(0xFA004000) /* 4K */
-#define MSM_CLK_CTL_BASE IOMEM(0xFA005000) /* 4K */
-#define MSM_L2CC_BASE IOMEM(0xFA006000) /* 4K */
-#define MSM_QGIC_DIST_BASE IOMEM(0xFA007000) /* 4K */
-#define MSM_QGIC_CPU_BASE IOMEM(0xFA008000) /* 4K */
-#define MSM_SCU_BASE IOMEM(0xFA009000) /* 4K */
-#define MSM_SPM0_BASE IOMEM(0xFA00A000) /* 4K */
-#define MSM_SPM1_BASE IOMEM(0xFA00B000) /* 4K */
-#define MSM_CFG_CTL_BASE IOMEM(0xFA00C000) /* 4K */
-#define MSM_SHARED_RAM_BASE IOMEM(0xFA100000) /* 4K */
-#define MSM_MDC_BASE IOMEM(0xFA200000) /* 4K */
-#define MSM_AD5_BASE IOMEM(0xFA300000) /* 4K */
-#define MSM_STRONGLY_ORDERED_PAGE 0xFA0F0000
-#define MSM8625_SECONDARY_PHYS 0x0FE00000
-#define MSM_SHARED_RAM_SIZE SZ_1M
-
-#include "msm_iomap-7xxx.h"
-#include "msm_iomap-8625.h"
+#error "Target compiled without IO map\n"
#endif
#if defined(CONFIG_DEBUG_MSM_UART1)
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 830db1f..507b74b 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -410,8 +410,8 @@
MSM_CHIP_DEVICE(SCU, MSM8625),
MSM_CHIP_DEVICE(CFG_CTL, MSM8625),
MSM_CHIP_DEVICE(CLK_CTL, MSM8625),
- MSM_CHIP_DEVICE(SPM0, MSM8625),
- MSM_CHIP_DEVICE(SPM1, MSM8625),
+ MSM_CHIP_DEVICE(SAW0, MSM8625),
+ MSM_CHIP_DEVICE(SAW1, MSM8625),
#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
defined(CONFIG_DEBUG_MSM_UART3)
MSM_CHIP_DEVICE(DEBUG_UART, MSM7XXX),