aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2006-06-26 19:16:24 -0400
committerTony Lindgren <tony@atomide.com>2006-06-26 19:16:24 -0400
commitce2deca27acc761ab90a0e79bd31d6816df38960 (patch)
treec5c6e2c6b192592593c4787c42d6320671cc2fc3
parent83379c81f6f05a6e80db66ae33378feb4cbca6b3 (diff)
ARM: OMAP: Fix SRAM to use MT_MEMORY instead of MT_DEVICE
MT_MEMORY is needed in order to execute code in SRAM. Also need to use section mapping. Based on a patch by Richard Woodruff. Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/plat-omap/sram.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index b7bf09b1b412..aebd06faf2cf 100644
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -158,14 +158,12 @@ static struct map_desc omap_sram_io_desc[] __initdata = {
158 { /* .length gets filled in at runtime */ 158 { /* .length gets filled in at runtime */
159 .virtual = OMAP1_SRAM_VA, 159 .virtual = OMAP1_SRAM_VA,
160 .pfn = __phys_to_pfn(OMAP1_SRAM_PA), 160 .pfn = __phys_to_pfn(OMAP1_SRAM_PA),
161 .type = MT_DEVICE 161 .type = MT_MEMORY
162 } 162 }
163}; 163};
164 164
165/* 165/*
166 * In order to use last 2kB of SRAM on 1611b, we must round the size 166 * Note that we cannot use ioremap for SRAM, as clock init needs SRAM early.
167 * up to multiple of PAGE_SIZE. We cannot use ioremap for SRAM, as
168 * clock init needs SRAM early.
169 */ 167 */
170void __init omap_map_sram(void) 168void __init omap_map_sram(void)
171{ 169{
@@ -185,8 +183,7 @@ void __init omap_map_sram(void)
185 omap_sram_io_desc[0].pfn = __phys_to_pfn(base); 183 omap_sram_io_desc[0].pfn = __phys_to_pfn(base);
186 } 184 }
187 185
188 omap_sram_io_desc[0].length = (omap_sram_size + PAGE_SIZE-1)/PAGE_SIZE; 186 omap_sram_io_desc[0].length = 1024 * 1024; /* Use section desc */
189 omap_sram_io_desc[0].length *= PAGE_SIZE;
190 iotable_init(omap_sram_io_desc, ARRAY_SIZE(omap_sram_io_desc)); 187 iotable_init(omap_sram_io_desc, ARRAY_SIZE(omap_sram_io_desc));
191 188
192 printk(KERN_INFO "SRAM: Mapped pa 0x%08lx to va 0x%08lx size: 0x%lx\n", 189 printk(KERN_INFO "SRAM: Mapped pa 0x%08lx to va 0x%08lx size: 0x%lx\n",