msm: iomap: Remove unused bases and mappings

QGIC_DIST and QGIC_CPU bases are now unused as they are
obtained from device tree. Remove the static iomappings.

Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>

diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h b/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
index 9819a556acae5d0837d63cfc703d97344eddd53f..7bca8d7108d687f70ff0f532654d09ec45af0db1 100644 (file)
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
@@ -32,13 +32,6 @@
  *
  */
 
-
-#define MSM8960_QGIC_DIST_PHYS 0x02000000
-#define MSM8960_QGIC_DIST_SIZE SZ_4K
-
-#define MSM8960_QGIC_CPU_PHYS  0x02002000
-#define MSM8960_QGIC_CPU_SIZE  SZ_4K
-
 #define MSM8960_TMR_PHYS       0x0200A000
 #define MSM8960_TMR_SIZE       SZ_4K
 

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 199372e62defbf3241ea20eb0b48bce3c917614d..75a7b62c1c7439033bbac975b8f2147503c30f33 100644 (file)
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
@@ -35,12 +35,6 @@
  *
  */
 
-#define MSM8X60_QGIC_DIST_PHYS 0x02080000
-#define MSM8X60_QGIC_DIST_SIZE SZ_4K
-
-#define MSM8X60_QGIC_CPU_PHYS  0x02081000
-#define MSM8X60_QGIC_CPU_SIZE  SZ_4K
-
 #define MSM_TLMM_BASE          IOMEM(0xF0004000)
 #define MSM_TLMM_PHYS          0x00800000
 #define MSM_TLMM_SIZE          SZ_16K

diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h
index 2ab7cf0919b37f53afc3b4c563b850170f65fa64..c56e81ffdcdead314be34247d2fd040f4b20a399 100644 (file)
--- a/arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap.h
@@ -62,8 +62,6 @@
 
 /* Virtual addresses shared across all MSM targets. */
 #define MSM_CSR_BASE           IOMEM(0xE0001000)
-#define MSM_QGIC_DIST_BASE     IOMEM(0xF0000000)
-#define MSM_QGIC_CPU_BASE      IOMEM(0xF0001000)
 #define MSM_TMR_BASE           IOMEM(0xF0200000)
 #define MSM_TMR0_BASE          IOMEM(0xF0201000)
 #define MSM_GPIO1_BASE         IOMEM(0xE0003000)

diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 123ef9cbce1b2c42f605b3bb19aaacb44dbdd378..efa113e4de86ff47b05739cb09b138dd5fec1ff9 100644 (file)
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -107,8 +107,6 @@ void __init msm_map_qsd8x50_io(void)
 
 #ifdef CONFIG_ARCH_MSM8X60
 static struct map_desc msm8x60_io_desc[] __initdata = {
-       MSM_CHIP_DEVICE(QGIC_DIST, MSM8X60),
-       MSM_CHIP_DEVICE(QGIC_CPU, MSM8X60),
        MSM_CHIP_DEVICE(TMR, MSM8X60),
        MSM_CHIP_DEVICE(TMR0, MSM8X60),
 #ifdef CONFIG_DEBUG_MSM8660_UART
@@ -124,8 +122,6 @@ void __init msm_map_msm8x60_io(void)
 
 #ifdef CONFIG_ARCH_MSM8960
 static struct map_desc msm8960_io_desc[] __initdata = {
-       MSM_CHIP_DEVICE(QGIC_DIST, MSM8960),
-       MSM_CHIP_DEVICE(QGIC_CPU, MSM8960),
        MSM_CHIP_DEVICE(TMR, MSM8960),
        MSM_CHIP_DEVICE(TMR0, MSM8960),
 #ifdef CONFIG_DEBUG_MSM8960_UART