msm: Generalize QGIC registers

The QGIC registers are mapped to the same virtual addresses across
targets, only the physical address changes.  Move the BASE address out
of target-specific files, and add a SOC name to the base addresses.

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 d5482d65bb37703298fe9ca2c8f64c9122b9e575..5bd18db11aea8f2aa10421a1195261f32b01221a 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,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 0243bd0c36560754b00e9fb053d02f5c524054e4..bb42de31886c086f80871d69c483602e03f39a04 100644 (file)
--- 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 97dcd8c43ab01c7bc76480b4affb995f6a07695d..49692bb375a20375ee0bec0b83bb79439522fd63 100644 (file)
--- 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),