diff options
| author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2012-08-29 17:24:30 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-08-30 22:37:11 +0200 |
| commit | 528c28f5c1cd435c45515b323919205c95342331 (patch) | |
| tree | 63f35a50cd752062979581d65b34123d90430aae | |
| parent | ARM: OMAP: timer: obey the !CONFIG_OMAP_32K_TIMER (diff) | |
| download | linux-528c28f5c1cd435c45515b323919205c95342331.tar.xz linux-528c28f5c1cd435c45515b323919205c95342331.zip | |
ARM: OMAP: sram: fix OMAP4 errata handling
OMAP4-specific code should be executed only if we are running on
OMAP4. Otherwise it may break multi-OMAP kernels. Found by reading
the code.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/plat-omap/sram.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 766181cb5c95..85c23db25034 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@ -175,8 +175,10 @@ static void __init omap_map_sram(void) return; #ifdef CONFIG_OMAP4_ERRATA_I688 + if (cpu_is_omap44xx()) { omap_sram_start += PAGE_SIZE; omap_sram_size -= SZ_16K; + } #endif if (cpu_is_omap34xx()) { /* |