3 files changed, 8 insertions, 8 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 d5482d65bb37..5bd18db11aea 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
@@ -35,13 +35,11 @@
  *
  */
 
-#define MSM_QGIC_DIST_BASE      IOMEM(0xF0000000)
-#define MSM_QGIC_DIST_PHYS      0x02080000
-#define MSM_QGIC_DIST_SIZE      SZ_4K
+#define MSM8X60_QGIC_DIST_PHYS  0x02080000
+#define MSM8X60_QGIC_DIST_SIZE  SZ_4K
 
-#define MSM_QGIC_CPU_BASE       IOMEM(0xF0001000)
-#define MSM_QGIC_CPU_PHYS       0x02081000
-#define MSM_QGIC_CPU_SIZE       SZ_4K
+#define MSM8X60_QGIC_CPU_PHYS   0x02081000
+#define MSM8X60_QGIC_CPU_SIZE   SZ_4K
 
 #define MSM_ACC_BASE            IOMEM(0xF0002000)
 #define MSM_ACC_PHYS            0x02001000
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h
index 0243bd0c3656..bb42de31886c 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap.h
@@ -55,6 +55,8 @@
 
 /* Virtual addressses 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)
 
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 97dcd8c43ab0..49692bb375a2 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -103,8 +103,8 @@ void __init msm_map_qsd8x50_io(void)
 
 #ifdef CONFIG_ARCH_MSM8X60
 static struct map_desc msm8x60_io_desc[] __initdata = {
-        MSM_DEVICE(QGIC_DIST),
-        MSM_DEVICE(QGIC_CPU),
+        MSM_CHIP_DEVICE(QGIC_DIST, MSM8X60),
+        MSM_CHIP_DEVICE(QGIC_CPU, MSM8X60),
         MSM_CHIP_DEVICE(TMR, MSM8X60),
         MSM_CHIP_DEVICE(TMR0, MSM8X60),
         MSM_DEVICE(ACC),