AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ARM: OMAP: omap2/memory.c compile fixes

Browse Source 
Remove some conflicting declarations in omap2/memory.c so that the
file builds again.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
David Brownell 2006-12-06 17:13:54 -08:00 committed by Tony Lindgren
parent f024840872
commit 742c53e48e
1 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
arch/arm/mach-omap2/memory.c
View File

@ -30,37 +30,6 @@
#include "prcm-regs.h" #include "prcm-regs.h"
#include "memory.h" #include "memory.h"
#define SMS_BASE 0x68008000
#define SMS_SYSCONFIG 0x010
#define SDRC_BASE 0x68009000
#define SDRC_SYSCONFIG 0x010
#define SDRC_SYSSTATUS 0x014
static const u32 sms_base = IO_ADDRESS(SMS_BASE);
static const u32 sdrc_base = IO_ADDRESS(SDRC_BASE);
static inline void sms_write_reg(int idx, u32 val)
{
__raw_writel(val, sms_base + idx);
}
static inline u32 sms_read_reg(int idx)
{
return __raw_readl(sms_base + idx);
}
static inline void sdrc_write_reg(int idx, u32 val)
{
__raw_writel(val, sdrc_base + idx);
}
static inline u32 sdrc_read_reg(int idx)
{
return __raw_readl(sdrc_base + idx);
}
static struct memory_timings mem_timings; static struct memory_timings mem_timings;
@ -132,18 +101,19 @@ void omap2_init_memory_params(u32 force_lock_to_unlock_mode)
mem_timings.slow_dll_ctrl |= ((1 << 1) | (3 << 8)); mem_timings.slow_dll_ctrl |= ((1 << 1) | (3 << 8));
} }
/* turn on smart idle modes for SDRAM scheduler and controller */
void __init omap2_init_memory(void) void __init omap2_init_memory(void)
{ {
u32 l; u32 l;
l = sms_read_reg(SMS_SYSCONFIG); l = SMS_SYSCONFIG;
l &= ~(0x3 << 3); l &= ~(0x3 << 3);
l |= (0x2 << 3); l |= (0x2 << 3);
sms_write_reg(SMS_SYSCONFIG, l); SMS_SYSCONFIG = l;
l = sdrc_read_reg(SDRC_SYSCONFIG); l = SDRC_SYSCONFIG;
l &= ~(0x3 << 3); l &= ~(0x3 << 3);
l |= (0x2 << 3); l |= (0x2 << 3);
sdrc_write_reg(SDRC_SYSCONFIG, l); SDRC_SYSCONFIG = l;
} }