From db4189e5629829d7cef13b90184bffbe190f05c7 Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Tue, 8 May 2007 16:28:43 -0600 Subject: [PATCH] omap2: convert existing SDRC register users to use sdrc.h Convert files that use SDRC registers in mach-omap2/ to use sdrc.h symbolic constants and sdrc_{read,write}_reg(). Signed-off-by: Paul Walmsley Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/clock.c | 4 +++- arch/arm/mach-omap2/memory.c | 21 +++++++++++---------- arch/arm/mach-omap2/pm.c | 7 ++++--- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c index e05534df943..09b52930985 100644 --- a/arch/arm/mach-omap2/clock.c +++ b/arch/arm/mach-omap2/clock.c @@ -32,6 +32,7 @@ #include "prcm-regs.h" #include "memory.h" #include "clock.h" +#include "sdrc.h" #undef DEBUG @@ -447,7 +448,8 @@ static long omap2_clk_round_rate(struct clk *clk, unsigned long rate) */ static u32 omap2_dll_force_needed(void) { - u32 dll_state = SDRC_DLLA_CTRL; /* dlla and dllb are a set */ + /* dlla and dllb are a set */ + u32 dll_state = sdrc_read_reg(SDRC_DLLA_CTRL); if ((dll_state & (1 << 2)) == (1 << 2)) return 1; diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/memory.c index 3e5d8cd4ea4..5164eac1d3f 100644 --- a/arch/arm/mach-omap2/memory.c +++ b/arch/arm/mach-omap2/memory.c @@ -27,9 +27,10 @@ #include #include -#include "prcm-regs.h" #include "memory.h" +#include "sdrc.h" +#define SMS_SYSCONFIG (OMAP2_SMS_BASE + 0x010) static struct memory_timings mem_timings; @@ -53,7 +54,7 @@ void omap2_init_memory_params(u32 force_lock_to_unlock_mode) unsigned long dll_cnt; u32 fast_dll = 0; - mem_timings.m_type = !((SDRC_MR_0 & 0x3) == 0x1); /* DDR = 1, SDR = 0 */ + mem_timings.m_type = !((sdrc_read_reg(SDRC_MR_0) & 0x3) == 0x1); /* DDR = 1, SDR = 0 */ /* 2422 es2.05 and beyond has a single SIP DDR instead of 2 like others. * In the case of 2422, its ok to use CS1 instead of CS0. @@ -73,11 +74,11 @@ void omap2_init_memory_params(u32 force_lock_to_unlock_mode) mem_timings.dll_mode = M_LOCK; if (mem_timings.base_cs == 0) { - fast_dll = SDRC_DLLA_CTRL; - dll_cnt = SDRC_DLLA_STATUS & 0xff00; + fast_dll = sdrc_read_reg(SDRC_DLLA_CTRL); + dll_cnt = sdrc_read_reg(SDRC_DLLA_STATUS) & 0xff00; } else { - fast_dll = SDRC_DLLB_CTRL; - dll_cnt = SDRC_DLLB_STATUS & 0xff00; + fast_dll = sdrc_read_reg(SDRC_DLLB_CTRL); + dll_cnt = sdrc_read_reg(SDRC_DLLB_STATUS) & 0xff00; } if (force_lock_to_unlock_mode) { fast_dll &= ~0xff00; @@ -106,14 +107,14 @@ void __init omap2_init_memory(void) { u32 l; - l = SMS_SYSCONFIG; + l = omap_readl(SMS_SYSCONFIG); l &= ~(0x3 << 3); l |= (0x2 << 3); - SMS_SYSCONFIG = l; + omap_writel(l, SMS_SYSCONFIG); - l = SDRC_SYSCONFIG; + l = sdrc_read_reg(SDRC_SYSCONFIG); l &= ~(0x3 << 3); l |= (0x2 << 3); - SDRC_SYSCONFIG = l; + sdrc_write_reg(l, SDRC_SYSCONFIG); } diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 93cc11de30c..5761eb16659 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -46,6 +46,8 @@ #include #include +#include "sdrc.h" + #define PRCM_REVISION 0x000 #define PRCM_SYSCONFIG 0x010 #define PRCM_IRQSTATUS_MPU 0x018 @@ -141,7 +143,7 @@ #define PM_PWSTST_DSP 0x8e4 static void (*omap2_sram_idle)(void); -static void (*omap2_sram_suspend)(int dllctrl); +static void (*omap2_sram_suspend)(void __iomem *dllctrl); static void (*saved_idle)(void); static u32 prcm_base = IO_ADDRESS(OMAP2_PRCM_BASE); @@ -438,7 +440,6 @@ static struct subsys_attribute sleep_while_idle_attr = { static struct clk *osc_ck, *emul_ck; #define CONTROL_DEVCONF __REG32(0x48000274) -#define SDRC_DLLA_CTRL __REG32(0x68009060) static int omap2_fclks_active(void) { @@ -516,7 +517,7 @@ static void omap2_enter_full_retention(void) serial_console_sleep(1); /* Jump to SRAM suspend code */ - omap2_sram_suspend(SDRC_DLLA_CTRL); + omap2_sram_suspend(OMAP_SDRC_REGADDR(SDRC_DLLA_CTRL)); no_sleep: serial_console_sleep(0); -- 2.41.1