msm: Generalize timer register mappings

Allow the timer register to be determined dynamically instead of at
compile time.  Use common virtual addresses for the registers across
all MSM chips, and select the register mappings based on the detected
CPU.

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

1 files changed, 11 insertions, 11 deletions

diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 1260007a9dd1..97dcd8c43ab0 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -3,7 +3,7 @@
  * MSM7K, QSD io support
  *
  * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
  * Author: Brian Swetland <swetland@google.com>
  *
  * This software is licensed under the terms of the GNU General Public
@@ -28,18 +28,20 @@
 
 #include <mach/board.h>
 
-#define MSM_DEVICE(name) { \
+#define MSM_CHIP_DEVICE(name, chip) {                         \
                 .virtual = (unsigned long) MSM_##name##_BASE, \
-                .pfn = __phys_to_pfn(MSM_##name##_PHYS), \
-                .length = MSM_##name##_SIZE, \
+                .pfn = __phys_to_pfn(chip##_##name##_PHYS), \
+                .length = chip##_##name##_SIZE, \
                 .type = MT_DEVICE_NONSHARED, \
          }
 
+#define MSM_DEVICE(name) MSM_CHIP_DEVICE(name, MSM)
+
 #if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_MSM7X27) \
         || defined(CONFIG_ARCH_MSM7X25)
 static struct map_desc msm_io_desc[] __initdata = {
         MSM_DEVICE(VIC),
-        MSM_DEVICE(CSR),
+        MSM_CHIP_DEVICE(CSR, MSM7X00),
         MSM_DEVICE(GPT),
         MSM_DEVICE(DMOV),
         MSM_DEVICE(GPIO1),
@@ -73,8 +75,7 @@ void __init msm_map_common_io(void)
 #ifdef CONFIG_ARCH_QSD8X50
 static struct map_desc qsd8x50_io_desc[] __initdata = {
         MSM_DEVICE(VIC),
-        MSM_DEVICE(CSR),
-        MSM_DEVICE(TMR),
+        MSM_CHIP_DEVICE(CSR, QSD8X50),
         MSM_DEVICE(DMOV),
         MSM_DEVICE(GPIO1),
         MSM_DEVICE(GPIO2),
@@ -104,8 +105,8 @@ void __init msm_map_qsd8x50_io(void)
 static struct map_desc msm8x60_io_desc[] __initdata = {
         MSM_DEVICE(QGIC_DIST),
         MSM_DEVICE(QGIC_CPU),
-        MSM_DEVICE(TMR),
-        MSM_DEVICE(TMR0),
+        MSM_CHIP_DEVICE(TMR, MSM8X60),
+        MSM_CHIP_DEVICE(TMR0, MSM8X60),
         MSM_DEVICE(ACC),
         MSM_DEVICE(GCC),
 };
@@ -119,8 +120,7 @@ void __init msm_map_msm8x60_io(void)
 #ifdef CONFIG_ARCH_MSM7X30
 static struct map_desc msm7x30_io_desc[] __initdata = {
         MSM_DEVICE(VIC),
-        MSM_DEVICE(CSR),
-        MSM_DEVICE(TMR),
+        MSM_CHIP_DEVICE(CSR, MSM7X30),
         MSM_DEVICE(DMOV),
         MSM_DEVICE(GPIO1),
         MSM_DEVICE(GPIO2),