summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/omap-common
diff options
context:
space:
mode:
authorRajendra Nayak <rnayak@ti.com>2014-07-18 11:18:48 +0530
committerTom Rini <trini@ti.com>2014-07-25 16:26:11 -0400
commit8c16dd6fa7de448b36778275b456bf4ea53c3306 (patch)
tree25408925f8f0cfc2b15995233b9d29b5ca2b9ed5 /arch/arm/cpu/armv7/omap-common
parenta906847966fd097835712b2ad3b5bac340793d43 (diff)
downloadblackbird-obmc-uboot-8c16dd6fa7de448b36778275b456bf4ea53c3306.tar.gz
blackbird-obmc-uboot-8c16dd6fa7de448b36778275b456bf4ea53c3306.zip
ARM: OMAP: Fix handling of errata i727
The errata is applicable on all OMAP4 (4430 and 4460/4470) and OMAP5 ES 1.0 devices. The current revision check erroneously implements this on all DRA7 varients and with DRA722 device (which has only 1 EMIF instance) infact causes an asynchronous abort and ends up masking it in CPSR, only to be uncovered once the kernel switches to userspace. Signed-off-by: Rajendra Nayak <rnayak@ti.com> Signed-off-by: Sricharan R <r.sricharan@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7/omap-common')
-rw-r--r--arch/arm/cpu/armv7/omap-common/hwinit-common.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
index 5f50a19801..1b4477f469 100644
--- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c
+++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c
@@ -123,7 +123,8 @@ void s_init(void)
hw_data_init();
#ifdef CONFIG_SPL_BUILD
- if (warm_reset() && (omap_revision() <= OMAP5430_ES1_0))
+ if (warm_reset() &&
+ (is_omap44xx() || (omap_revision() == OMAP5430_ES1_0)))
force_emif_self_refresh();
#endif
watchdog_init();
OpenPOWER on IntegriCloud