summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2012-08-29 18:24:30 +0300
committerTony Lindgren <tony@atomide.com>2012-08-30 13:37:11 -0700
commit528c28f5c1cd435c45515b323919205c95342331 (patch)
tree63f35a50cd752062979581d65b34123d90430aae /arch/arm
parent45caae74d238ef6583e9402cb8c550cc0b0f7dbd (diff)
downloadlinux-3.10-528c28f5c1cd435c45515b323919205c95342331.tar.gz
linux-3.10-528c28f5c1cd435c45515b323919205c95342331.tar.bz2
linux-3.10-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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/plat-omap/sram.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index 766181cb5c9..85c23db2503 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()) {
/*