From: Aneesh V <aneesh@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 7/9] omap4460: add ES1.1 identification
Date: Tue, 22 Nov 2011 15:09:03 +0530 [thread overview]
Message-ID: <1321954745-18112-8-git-send-email-aneesh@ti.com> (raw)
In-Reply-To: <1321954745-18112-1-git-send-email-aneesh@ti.com>
Signed-off-by: Aneesh V <aneesh@ti.com>
---
arch/arm/cpu/armv7/omap4/hwinit.c | 10 +++++++++-
arch/arm/include/asm/arch-omap4/omap.h | 2 ++
arch/arm/include/asm/omap_common.h | 1 +
3 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap4/hwinit.c b/arch/arm/cpu/armv7/omap4/hwinit.c
index 52c9b19..cd1451a 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;
diff --git a/arch/arm/include/asm/arch-omap4/omap.h b/arch/arm/include/asm/arch-omap4/omap.h
index e994257..4d8c89f 100644
--- a/arch/arm/include/asm/arch-omap4/omap.h
+++ b/arch/arm/include/asm/arch-omap4/omap.h
@@ -63,6 +63,8 @@
#define OMAP4_CONTROL_ID_CODE_ES2_1 0x3B95C02F
#define OMAP4_CONTROL_ID_CODE_ES2_2 0x4B95C02F
#define OMAP4_CONTROL_ID_CODE_ES2_3 0x6B95C02F
+#define OMAP4460_CONTROL_ID_CODE_ES1_0 0x0B94E02F
+#define OMAP4460_CONTROL_ID_CODE_ES1_1 0x2B94E02F
/* UART */
#define UART1_BASE (OMAP44XX_L4_PER_BASE + 0x6a000)
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index f1562ea..913231b 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -108,6 +108,7 @@ void spl_mmc_load_image(void);
#define OMAP4430_ES2_2 0x44300220
#define OMAP4430_ES2_3 0x44300230
#define OMAP4460_ES1_0 0x44600100
+#define OMAP4460_ES1_1 0x44600110
/* omap5 */
#define OMAP5430_SILICON_ID_INVALID 0
--
1.7.1
next prev parent reply other threads:[~2011-11-22 9:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-22 9:38 [U-Boot] [PATCH 0/9] omap: miscellaneous fixes and improvements Aneesh V
2011-11-22 9:38 ` [U-Boot] [PATCH 1/9] omap: Improve PLL parameter calculation tool Aneesh V
2011-11-22 9:38 ` [U-Boot] [PATCH 2/9] omap4: ttyO2 instead of ttyS2 in default bootargs Aneesh V
2011-11-22 9:38 ` [U-Boot] [PATCH 3/9] omap: fix cache line size for omap3/omap4 boards Aneesh V
2011-11-22 15:58 ` Tom Rini
2011-11-23 5:00 ` Aneesh V
2011-11-29 21:15 ` Tom Rini
2011-11-22 9:39 ` [U-Boot] [PATCH 4/9] omap4460: fix TPS initialization Aneesh V
2011-11-22 9:39 ` [U-Boot] [PATCH 5/9] omap: remove I2C from SPL Aneesh V
2011-11-22 15:52 ` Tom Rini
2011-11-23 7:34 ` Aneesh V
2011-11-23 15:05 ` Tom Rini
2011-11-22 9:39 ` [U-Boot] [PATCH 6/9] omap4: emif: fix error in driver Aneesh V
2011-11-22 9:39 ` Aneesh V [this message]
2011-11-22 9:39 ` [U-Boot] [PATCH 8/9] omap4+: streamline CONFIG_SYS_TEXT_BASE and other SDRAM addresses Aneesh V
2011-11-22 9:39 ` [U-Boot] [PATCH 9/9] omap4: fix IO setting Aneesh V
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1321954745-18112-8-git-send-email-aneesh@ti.com \
--to=aneesh@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox