diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-10 23:10:10 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-10 23:10:10 +0100 |
| commit | 59aaade72544ad1be4183c1066c20b5883a78717 (patch) | |
| tree | da57c3029145c21b5eae457fbd66b997b503f155 /arch/arm/mach-omap2/memory.c | |
| parent | 8e5bdc44ba82d1f75c8732c2c2b64a22bb622e8f (diff) | |
| parent | 99b3075b9095c23acf8d884bdc7fe33c8c3520f0 (diff) | |
| download | linux-59aaade72544ad1be4183c1066c20b5883a78717.tar.bz2 | |
Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap-all
Diffstat (limited to 'arch/arm/mach-omap2/memory.c')
| -rw-r--r-- | arch/arm/mach-omap2/memory.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/memory.c index 6b49cc9cbdcb..48b01f4cebc5 100644 --- a/arch/arm/mach-omap2/memory.c +++ b/arch/arm/mach-omap2/memory.c @@ -102,6 +102,17 @@ u32 omap2_reprogram_sdrc(u32 level, u32 force) return prev; } +#if !defined(CONFIG_ARCH_OMAP2) +void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl, + u32 base_cs, u32 force_unlock) +{ +} +void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, + u32 mem_type) +{ +} +#endif + void omap2_init_memory_params(u32 force_lock_to_unlock_mode) { unsigned long dll_cnt; @@ -166,6 +177,9 @@ void __init omap2_init_memory(void) { u32 l; + if (!cpu_is_omap2420()) + return; + l = sms_read_reg(SMS_SYSCONFIG); l &= ~(0x3 << 3); l |= (0x2 << 3); |