diff options
| author | Justin Waters <justin.waters@timesys.com> | 2013-05-14 16:19:57 -0400 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2013-05-14 16:19:57 -0400 |
| commit | 266c19c9cd6808e0d2546ce084e97fa73a1e0a2c (patch) | |
| tree | fcf8d5259327651441cab0d11465ccdbe77bc520 /arch | |
| parent | 15473818068d8de6672d6a83a6888ed40b1f9811 (diff) | |
LogicPD Support for OMAP3/DM3/AM3 boards 2.4 Update
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/omap3/sys_info.c | 16 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-omap3/omap3.h | 1 |
2 files changed, 12 insertions, 5 deletions
diff --git a/arch/arm/cpu/armv7/omap3/sys_info.c b/arch/arm/cpu/armv7/omap3/sys_info.c index 09bce91bba..472f34c98e 100644 --- a/arch/arm/cpu/armv7/omap3/sys_info.c +++ b/arch/arm/cpu/armv7/omap3/sys_info.c @@ -33,16 +33,24 @@ extern omap3_sysinfo sysinfo; static struct ctrl *ctrl_base = (struct ctrl *)OMAP34XX_CTRL_BASE; -static char *rev_s[CPU_3XX_MAX_REV] = { +static char *rev_s[] = { "1.0", "2.0", "2.1", "3.0", "3.1", - "UNKNOWN", - "UNKNOWN", + NULL, + NULL, "3.1.2"}; +/* Return CPU revision string for known revisions or "unknown" */ +static char *get_rev_str(unsigned int rev) +{ + if (rev >= ARRAY_SIZE(rev_s) || !rev_s[rev]) + return "Unknown"; + return rev_s[rev]; +} + /***************************************************************** * dieid_num_r(void) - read and set die ID *****************************************************************/ @@ -428,7 +436,7 @@ int print_cpuinfo (void) printf("%s%s-%s ES%s, CPU-OPP2, L3-%uMHz, Max CPU Clock %s\n", cpu_family_s, cpu_s, sec_s, - rev_s[get_cpu_rev()], l3_ick, max_clk); + get_rev_str(get_cpu_rev()), l3_ick, max_clk); return 0; } diff --git a/arch/arm/include/asm/arch-omap3/omap3.h b/arch/arm/include/asm/arch-omap3/omap3.h index 117ad1ee61..b38faed44d 100644 --- a/arch/arm/include/asm/arch-omap3/omap3.h +++ b/arch/arm/include/asm/arch-omap3/omap3.h @@ -213,7 +213,6 @@ struct gpio { #define CPU_3XX_ES30 3 #define CPU_3XX_ES31 4 #define CPU_3XX_ES312 7 -#define CPU_3XX_MAX_REV 8 #define CPU_3XX_ID_SHIFT 28 |