summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/armv7/omap4
diff options
context:
space:
mode:
authorAneesh V <aneesh@ti.com>2011-11-21 23:39:03 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-12-06 23:59:34 +0100
commit9404758e9baf0472d6958efaa7df1aa757b237d8 (patch)
treee114f1d220da0c02c8dcc0fa672f9a3fb5cded9f /arch/arm/cpu/armv7/omap4
parent4324c118a03d8b957ef249e33313b6eafb580b41 (diff)
downloadblackbird-obmc-uboot-9404758e9baf0472d6958efaa7df1aa757b237d8.tar.gz
blackbird-obmc-uboot-9404758e9baf0472d6958efaa7df1aa757b237d8.zip
omap4460: add ES1.1 identification
Signed-off-by: Aneesh V <aneesh@ti.com>
Diffstat (limited to 'arch/arm/cpu/armv7/omap4')
-rw-r--r--arch/arm/cpu/armv7/omap4/hwinit.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/omap4/hwinit.c b/arch/arm/cpu/armv7/omap4/hwinit.c
index 52c9b19012..cd1451a0bf 100644
--- a/arch/arm/cpu/armv7/omap4/hwinit.c
+++ b/arch/arm/cpu/armv7/omap4/hwinit.c
@@ -146,7 +146,15 @@ void init_omap_revision(void)
*omap4_revision = OMAP4430_ES2_3;
break;
case MIDR_CORTEX_A9_R2P10:
- *omap4_revision = OMAP4460_ES1_0;
+ switch (readl(CONTROL_ID_CODE)) {
+ case OMAP4460_CONTROL_ID_CODE_ES1_1:
+ *omap4_revision = OMAP4460_ES1_1;
+ break;
+ case OMAP4460_CONTROL_ID_CODE_ES1_0:
+ default:
+ *omap4_revision = OMAP4460_ES1_0;
+ break;
+ }
break;
default:
*omap4_revision = OMAP4430_SILICON_ID_INVALID;
OpenPOWER on IntegriCloud