ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist

Remove the unused GCC, ACC, and shared memory definitions in the
8660 static mappings. This allows the 8660 header file to be
included in msm_iomap.h unconditionally.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>

2 files changed, 1 insertions, 13 deletions

diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
index 5aed57dc808c..b51ba8a927b8 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
@@ -41,21 +41,10 @@
 #define MSM8X60_QGIC_CPU_PHYS   0x02081000
 #define MSM8X60_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
-
 #define MSM8X60_TMR_PHYS        0x02000000
 #define MSM8X60_TMR_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 00afdfb8c38f..2ab7cf0919b3 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap.h
@@ -41,12 +41,11 @@
 #include "msm_iomap-7x30.h"
 #elif defined(CONFIG_ARCH_QSD8X50)
 #include "msm_iomap-8x50.h"
-#elif defined(CONFIG_ARCH_MSM8X60)
-#include "msm_iomap-8x60.h"
 #else
 #include "msm_iomap-7x00.h"
 #endif
 
+#include "msm_iomap-8x60.h"
 #include "msm_iomap-8960.h"
 
 #define MSM_DEBUG_UART_SIZE     SZ_4K