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>

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 c6d38f1d0c989a329007722a94b9928ac435e2ab..199372e62defbf3241ea20eb0b48bce3c917614d 100644 (file)
--- 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 00afdfb8c38fe24eacc2d0c87709fe448b06eed0..2ab7cf0919b37f53afc3b4c563b850170f65fa64 100644 (file)
--- 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

diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 3854f6f20ce2fce18150a584cce02ad077275dee..123ef9cbce1b2c42f605b3bb19aaacb44dbdd378 100644 (file)
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -111,8 +111,6 @@ static struct map_desc msm8x60_io_desc[] __initdata = {
        MSM_CHIP_DEVICE(QGIC_CPU, MSM8X60),
        MSM_CHIP_DEVICE(TMR, MSM8X60),
        MSM_CHIP_DEVICE(TMR0, MSM8X60),
-       MSM_DEVICE(ACC),
-       MSM_DEVICE(GCC),
 #ifdef CONFIG_DEBUG_MSM8660_UART
        MSM_DEVICE(DEBUG_UART),
 #endif