Runtime constants: use runtime-computed SMS base

Create a global variable, omap2_sms_base, that is initialized with the
appropriate SMS base address at runtime during architecture
initialization.  Convert users of the preprocessor define
OMAP2_SMS_BASE to use the runtime-computed address, and get rid of
OMAP2_SMS_BASE.  Create sms_{read,write}_reg() to handle register
access to these functions, located in arch/arm/mach-omap2/sdrc.h.
Define the only SMS register that we currently use, SMS_SYSCONFIG, in
include/asm-arm/arch-omap/sdrc.h, so it can be included in assembly
language files.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/memory.c
index 2dcf8ddb7d1d6f4c8eda618edde4fc43585a5e5b..412357e97e0f69d0861f3687f0a0ab09b3e5c28a 100644 (file)
--- a/arch/arm/mach-omap2/memory.c
+++ b/arch/arm/mach-omap2/memory.c
@@ -32,9 +32,8 @@
 #include "memory.h"
 #include "sdrc.h"
 
-#define SMS_SYSCONFIG                  (OMAP2_SMS_BASE + 0x010)
-
 unsigned long omap2_sdrc_base;
+unsigned long omap2_sms_base;
 
 static struct memory_timings mem_timings;
 static u32 curr_perf_level = CORE_CLK_SRC_DPLL_X2;
@@ -160,14 +159,13 @@ void __init omap2_init_memory(void)
 {
        u32 l;
 
-       l = omap_readl(SMS_SYSCONFIG);
+       l = sms_read_reg(SMS_SYSCONFIG);
        l &= ~(0x3 << 3);
        l |= (0x2 << 3);
-       omap_writel(l, SMS_SYSCONFIG);
+       sms_write_reg(l, SMS_SYSCONFIG);
 
        l = sdrc_read_reg(SDRC_SYSCONFIG);
        l &= ~(0x3 << 3);
        l |= (0x2 << 3);
        sdrc_write_reg(l, SDRC_SYSCONFIG);
-
 }

diff --git a/arch/arm/mach-omap2/sdrc.h b/arch/arm/mach-omap2/sdrc.h
index 6aa700ff70b94726223b4e35318a2c18a5a6d173..dfc86f1146e0b7f9f0d063325c11236a75426858 100644 (file)
--- a/arch/arm/mach-omap2/sdrc.h
+++ b/arch/arm/mach-omap2/sdrc.h
@@ -19,8 +19,11 @@
 #include <asm/arch/sdrc.h>
 
 extern unsigned long omap2_sdrc_base;
+extern unsigned long omap2_sms_base;
 
 #define OMAP_SDRC_REGADDR(reg) (void __iomem *)IO_ADDRESS(omap2_sdrc_base + reg)
+#define OMAP_SMS_REGADDR(reg)  (void __iomem *)IO_ADDRESS(omap2_sms_base + reg)
+
 
 /* SDRC global register get/set */
 
@@ -37,5 +40,21 @@ static u32 __attribute__((unused)) sdrc_read_reg(u16 reg)
        return __raw_readl(OMAP_SDRC_REGADDR(reg));
 }
 
+/* SMS global register get/set */
+
+static void __attribute__((unused)) sms_write_reg(u32 val, u16 reg)
+{
+       pr_debug("sms_write_reg: writing 0x%0x to 0x%0x\n", val,
+                (u32)OMAP_SMS_REGADDR(reg));
+
+       __raw_writel(val, OMAP_SMS_REGADDR(reg));
+}
+
+static u32 __attribute__((unused)) sms_read_reg(u16 reg)
+{
+       return __raw_readl(OMAP_SMS_REGADDR(reg));
+}
+
+
 
 #endif

diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index f0275a1faa2795dea02d1c458948d7a3302bfcf9..a5a3daf897891754373d7b81ece751a0ae414598 100644 (file)
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -264,6 +264,7 @@ arch_initcall(omap_init_clocksource_32k);
 void __init omap2_set_globals_242x(void)
 {
        omap2_sdrc_base = OMAP2420_SDRC_BASE;
+       omap2_sms_base = OMAP2420_SMS_BASE;
 }
 #endif
 
@@ -271,6 +272,7 @@ void __init omap2_set_globals_242x(void)
 void __init omap2_set_globals_243x(void)
 {
        omap2_sdrc_base = OMAP243X_SDRC_BASE;
+       omap2_sms_base = OMAP243X_SMS_BASE;
 }
 #endif
 
@@ -278,6 +280,7 @@ void __init omap2_set_globals_243x(void)
 void __init omap2_set_globals_343x(void)
 {
        omap2_sdrc_base = OMAP343X_SDRC_BASE;
+       omap2_sms_base = OMAP343X_SMS_BASE;
 }
 #endif
 

diff --git a/include/asm-arm/arch-omap/omap24xx.h b/include/asm-arm/arch-omap/omap24xx.h
index 8716409d61ddfded0d6f35b625c382895e9fbbdf..44307e6244b3115c5cd8f4946fc10dcc7badf0ad 100644 (file)
--- a/include/asm-arm/arch-omap/omap24xx.h
+++ b/include/asm-arm/arch-omap/omap24xx.h
@@ -83,7 +83,6 @@
 #define OMAP2_PRCM_BASE                OMAP2420_PRCM_BASE
 #define OMAP2_CM_BASE          OMAP2420_CM_BASE
 #define OMAP2_PRM_BASE         OMAP2420_PRM_BASE
-#define OMAP2_SMS_BASE         OMAP2420_SMS_BASE
 #define OMAP2_VA_IC_BASE       IO_ADDRESS(OMAP24XX_IC_BASE)
 #define OMAP2_CTRL_BASE                OMAP2420_CTRL_BASE
 
@@ -93,7 +92,6 @@
 #define OMAP2_PRCM_BASE                OMAP2430_PRCM_BASE
 #define OMAP2_CM_BASE          OMAP2430_CM_BASE
 #define OMAP2_PRM_BASE         OMAP2430_PRM_BASE
-#define OMAP2_SMS_BASE         OMAP243X_SMS_BASE
 #define OMAP2_VA_IC_BASE       IO_ADDRESS(OMAP24XX_IC_BASE)
 #define OMAP2_CTRL_BASE                OMAP243X_CTRL_BASE
 

diff --git a/include/asm-arm/arch-omap/omap34xx.h b/include/asm-arm/arch-omap/omap34xx.h
index 7e294112ac964f142eeb276ff48ba753796cf18a..39243c18f094954c93a4691ae02ff558336add81 100644 (file)
--- a/include/asm-arm/arch-omap/omap34xx.h
+++ b/include/asm-arm/arch-omap/omap34xx.h
@@ -45,8 +45,8 @@
 #define OMAP343X_SMS_BASE      0x6C000000
 #define OMAP343X_SDRC_BASE     0x6D000000
 #define OMAP34XX_GPMC_BASE     0x6E000000
-#define OMAP3430_SCM_BASE      0x48002000
-#define OMAP3430_CTRL_BASE     OMAP3430_SCM_BASE
+#define OMAP343X_SCM_BASE      0x48002000
+#define OMAP3430_CTRL_BASE     OMAP343X_SCM_BASE
 
 #define OMAP34XX_IC_BASE       0x48200000
 #define OMAP34XX_IVA_INTC_BASE 0x40000000
@@ -67,7 +67,6 @@
 #define OMAP2_32KSYNCT_BASE            OMAP3430_32KSYNCT_BASE
 #define OMAP2_CM_BASE                  OMAP3430_CM_BASE
 #define OMAP2_PRM_BASE                 OMAP3430_PRM_BASE
-#define OMAP2_SMS_BASE                 OMAP343X_SMS_BASE
 #define OMAP2_VA_IC_BASE               IO_ADDRESS(OMAP34XX_IC_BASE)
 #define OMAP2_CTRL_BASE                        OMAP3430_CTRL_BASE
 #define OMAP34XX_CONTROL_DEVCONF0      (L4_34XX_BASE + 0x2274)

diff --git a/include/asm-arm/arch-omap/sdrc.h b/include/asm-arm/arch-omap/sdrc.h
index b493fe4a9f0b20a5a6ff4d58a2721a6cd034bf0a..8f74097ac477294ed146fefebdab24ec0577159d 100644 (file)
--- a/include/asm-arm/arch-omap/sdrc.h
+++ b/include/asm-arm/arch-omap/sdrc.h
@@ -2,7 +2,7 @@
 #define ____ASM_ARCH_SDRC_H
 
 /*
- * OMAP2 SDRC register definitions
+ * OMAP2/3 SDRC/SMS register definitions
  *
  * Copyright (C) 2007 Texas Instruments, Inc.
  * Copyright (C) 2007 Nokia Corporation
@@ -62,4 +62,18 @@
 #define SDRC_RFR_CTRL_BYPASS   (0x00005000 | 1) /* Need to calc */
 
 
+/*
+ * SMS register access
+ */
+
+
+#define OMAP242X_SMS_REGADDR(reg)      (void __iomem *)IO_ADDRESS(OMAP2420_SMS_BASE + reg)
+#define OMAP243X_SMS_REGADDR(reg)      (void __iomem *)IO_ADDRESS(OMAP243X_SMS_BASE + reg)
+#define OMAP343X_SMS_REGADDR(reg)      (void __iomem *)IO_ADDRESS(OMAP343X_SMS_BASE + reg)
+
+/* SMS register offsets - read/write with sms_{read,write}_reg() */
+
+#define SMS_SYSCONFIG          0x010
+/* REVISIT: fill in other SMS registers here */
+
 #endif