CPU version was reported incorrectly (e.g. ES3.0 instead of ES2.1.)
Also added a piece of optimization for CPU type check (omap_type()).
Signed-off-by: Tero Kristo <tero.kristo@xxxxxxxxx>
---
arch/arm/mach-omap2/id.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index ab7a6e9..4e2b449 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -37,7 +37,10 @@ EXPORT_SYMBOL(omap_chip_is);
int omap_type(void)
{
- u32 val = 0;
+ static u32 val;
+
+ if (val != 0)
+ return val;
if (cpu_is_omap24xx()) {
val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);
@@ -169,7 +172,7 @@ void __init omap34xx_check_revision(void)
rev = (idcode >> 28) & 0xff;
if (hawkeye == 0xb7ae)
- system_rev = 0x34300034 | ((1 + rev) << 12);
+ system_rev = 0x34300034 | (rev << 12);
out:
switch (system_rev) {
--
1.5.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
