diff options
author | Syed Mohammed, Khasim <khasim@ti.com> | 2008-10-09 10:51:41 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-10-09 10:51:41 -0400 |
commit | cc26b3b01bc96a8b8c36671b0dc4898b2a152ea8 (patch) | |
tree | 8cd836cd32a38c1a849837ab295eeaa3ec104336 /arch/arm/mach-omap2/memory.c | |
parent | 2e7509e5b3acc4b8653faa1966e5ac234d36ac82 (diff) |
ARM: OMAP3: Add minimal omap3430 support
Add minimal omap3430 support based on earlier patches from
Syed Mohammed Khasim. Also merge in omap34xx SRAM support
from Karthik Dasu and use consistent naming for sram init
functions.
Also do following changes that make 34xx support usable:
- Remove unused sram.c functions for 34xx
- Rename IRQ_SIR_IRQ to INTCPS_SIR_IRQ and define it locally
in entry-macro.S
- Update mach-omap2/io.c to support 2420, 2430, and 34xx
- Also merge in 34xx GPMC changes to add fields wr_access and
wr_data_mux_bus from Adrian Hunter
- Remove memory initialization call omap2_init_memory() until
until more generic memory initialization patches are posted.
It's OK to rely on bootloader initialization until then.
Signed-off-by: Syed Mohammed, Khasim <khasim@ti.com>
Signed-off-by: Karthik Dasu<karthik-dp@ti.com>
Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
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) | |||
102 | return prev; | 102 | return prev; |
103 | } | 103 | } |
104 | 104 | ||
105 | #if !defined(CONFIG_ARCH_OMAP2) | ||
106 | void omap2_sram_ddr_init(u32 *slow_dll_ctrl, u32 fast_dll_ctrl, | ||
107 | u32 base_cs, u32 force_unlock) | ||
108 | { | ||
109 | } | ||
110 | void omap2_sram_reprogram_sdrc(u32 perf_level, u32 dll_val, | ||
111 | u32 mem_type) | ||
112 | { | ||
113 | } | ||
114 | #endif | ||
115 | |||
105 | void omap2_init_memory_params(u32 force_lock_to_unlock_mode) | 116 | void omap2_init_memory_params(u32 force_lock_to_unlock_mode) |
106 | { | 117 | { |
107 | unsigned long dll_cnt; | 118 | unsigned long dll_cnt; |
@@ -166,6 +177,9 @@ void __init omap2_init_memory(void) | |||
166 | { | 177 | { |
167 | u32 l; | 178 | u32 l; |
168 | 179 | ||
180 | if (!cpu_is_omap2420()) | ||
181 | return; | ||
182 | |||
169 | l = sms_read_reg(SMS_SYSCONFIG); | 183 | l = sms_read_reg(SMS_SYSCONFIG); |
170 | l &= ~(0x3 << 3); | 184 | l &= ~(0x3 << 3); |
171 | l |= (0x2 << 3); | 185 | l |= (0x2 << 3); |