Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: OMAP2+: Make cpu_rev static global variable

Browse source 
As part of omap revision code cleanup, make cpu_rev
variable static global to the file (id.c). This is
needed so we can split the SoC detection from SoC
feature detection in the following patch. Also move
omap3_cpuinfo function a bit as that will be shared
by other omap3 like SoCs.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
[tony@atomide.com: updated comments]
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Vaibhav Hiremath 2011-12-19 15:50:14 +05:30 committed by Tony Lindgren
parent 4390f5b2cb
commit 50a01e6440
1 changed files with 72 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

146
arch/arm/mach-omap2/id.c
View file

@ -29,7 +29,7 @@
#include "control.h" #include "control.h"
static unsigned int omap_revision; static unsigned int omap_revision;
static const char *cpu_rev;
u32 omap_features; u32 omap_features;
unsigned int omap_rev(void) unsigned int omap_rev(void)
@ -166,6 +166,56 @@ static void __init omap24xx_check_revision(void)
pr_info("\n"); pr_info("\n");
} }
#define OMAP3_SHOW_FEATURE(feat) \
if (omap3_has_ ##feat()) \
printk(#feat" ");
static void __init omap3_cpuinfo(void)
{
const char *cpu_name;
/*
* OMAP3430 and OMAP3530 are assumed to be same.
*
* OMAP3525, OMAP3515 and OMAP3503 can be detected only based
* on available features. Upon detection, update the CPU id
* and CPU class bits.
*/
if (cpu_is_omap3630()) {
cpu_name = "OMAP3630";
} else if (cpu_is_omap3517()) {
/* AM35xx devices */
cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505";
} else if (cpu_is_ti816x()) {
cpu_name = "TI816X";
} else if (cpu_is_am335x()) {
cpu_name = "AM335X";
} else if (cpu_is_ti814x()) {
cpu_name = "TI814X";
} else if (omap3_has_iva() && omap3_has_sgx()) {
/* OMAP3430, OMAP3525, OMAP3515, OMAP3503 devices */
cpu_name = "OMAP3430/3530";
} else if (omap3_has_iva()) {
cpu_name = "OMAP3525";
} else if (omap3_has_sgx()) {
cpu_name = "OMAP3515";
} else {
cpu_name = "OMAP3503";
}
/* Print verbose information */
pr_info("%s ES%s (", cpu_name, cpu_rev);
OMAP3_SHOW_FEATURE(l2cache);
OMAP3_SHOW_FEATURE(iva);
OMAP3_SHOW_FEATURE(sgx);
OMAP3_SHOW_FEATURE(neon);
OMAP3_SHOW_FEATURE(isp);
OMAP3_SHOW_FEATURE(192mhz_clk);
printk(")\n");
}
#define OMAP3_CHECK_FEATURE(status,feat) \ #define OMAP3_CHECK_FEATURE(status,feat) \
if (((status & OMAP3_ ##feat## _MASK) \ if (((status & OMAP3_ ##feat## _MASK) \
>> OMAP3_ ##feat## _SHIFT) != FEAT_ ##feat## _NONE) { \ >> OMAP3_ ##feat## _SHIFT) != FEAT_ ##feat## _NONE) { \
@ -231,7 +281,7 @@ static void __init ti81xx_check_features(void)
omap_features = OMAP3_HAS_NEON; omap_features = OMAP3_HAS_NEON;
} }
static void __init omap3_check_revision(const char **cpu_rev) static void __init omap3_check_revision(void)
{ {
u32 cpuid, idcode; u32 cpuid, idcode;
u16 hawkeye; u16 hawkeye;
@ -245,7 +295,7 @@ static void __init omap3_check_revision(const char **cpu_rev)
cpuid = read_cpuid(CPUID_ID); cpuid = read_cpuid(CPUID_ID);
if ((((cpuid >> 4) & 0xfff) == 0xc08) && ((cpuid & 0xf) == 0x0)) { if ((((cpuid >> 4) & 0xfff) == 0xc08) && ((cpuid & 0xf) == 0x0)) {
omap_revision = OMAP3430_REV_ES1_0; omap_revision = OMAP3430_REV_ES1_0;
*cpu_rev = "1.0"; cpu_rev = "1.0";
return; return;
} }
@ -266,26 +316,26 @@ static void __init omap3_check_revision(const char **cpu_rev)
case 0: /* Take care of early samples */ case 0: /* Take care of early samples */
case 1: case 1:
omap_revision = OMAP3430_REV_ES2_0; omap_revision = OMAP3430_REV_ES2_0;
*cpu_rev = "2.0"; cpu_rev = "2.0";
break; break;
case 2: case 2:
omap_revision = OMAP3430_REV_ES2_1; omap_revision = OMAP3430_REV_ES2_1;
*cpu_rev = "2.1"; cpu_rev = "2.1";
break; break;
case 3: case 3:
omap_revision = OMAP3430_REV_ES3_0; omap_revision = OMAP3430_REV_ES3_0;
*cpu_rev = "3.0"; cpu_rev = "3.0";
break; break;
case 4: case 4:
omap_revision = OMAP3430_REV_ES3_1; omap_revision = OMAP3430_REV_ES3_1;
*cpu_rev = "3.1"; cpu_rev = "3.1";
break; break;
case 7: case 7:
/* FALLTHROUGH */ /* FALLTHROUGH */
default: default:
/* Use the latest known revision as default */ /* Use the latest known revision as default */
omap_revision = OMAP3430_REV_ES3_1_2; omap_revision = OMAP3430_REV_ES3_1_2;
*cpu_rev = "3.1.2"; cpu_rev = "3.1.2";
} }
break; break;
case 0xb868: case 0xb868:
@ -298,13 +348,13 @@ static void __init omap3_check_revision(const char **cpu_rev)
switch (rev) { switch (rev) {
case 0: case 0:
omap_revision = OMAP3517_REV_ES1_0; omap_revision = OMAP3517_REV_ES1_0;
*cpu_rev = "1.0"; cpu_rev = "1.0";
break; break;
case 1: case 1:
/* FALLTHROUGH */ /* FALLTHROUGH */
default: default:
omap_revision = OMAP3517_REV_ES1_1; omap_revision = OMAP3517_REV_ES1_1;
*cpu_rev = "1.1"; cpu_rev = "1.1";
} }
break; break;
case 0xb891: case 0xb891:
@ -313,60 +363,60 @@ static void __init omap3_check_revision(const char **cpu_rev)
switch(rev) { switch(rev) {
case 0: /* Take care of early samples */ case 0: /* Take care of early samples */
omap_revision = OMAP3630_REV_ES1_0; omap_revision = OMAP3630_REV_ES1_0;
*cpu_rev = "1.0"; cpu_rev = "1.0";
break; break;
case 1: case 1:
omap_revision = OMAP3630_REV_ES1_1; omap_revision = OMAP3630_REV_ES1_1;
*cpu_rev = "1.1"; cpu_rev = "1.1";
break; break;
case 2: case 2:
/* FALLTHROUGH */ /* FALLTHROUGH */
default: default:
omap_revision = OMAP3630_REV_ES1_2; omap_revision = OMAP3630_REV_ES1_2;
*cpu_rev = "1.2"; cpu_rev = "1.2";
} }
break; break;
case 0xb81e: case 0xb81e:
switch (rev) { switch (rev) {
case 0: case 0:
omap_revision = TI8168_REV_ES1_0; omap_revision = TI8168_REV_ES1_0;
*cpu_rev = "1.0"; cpu_rev = "1.0";
break; break;
case 1: case 1:
/* FALLTHROUGH */ /* FALLTHROUGH */
default: default:
omap_revision = TI8168_REV_ES1_1; omap_revision = TI8168_REV_ES1_1;
*cpu_rev = "1.1"; cpu_rev = "1.1";
break; break;
} }
break; break;
case 0xb944: case 0xb944:
omap_revision = AM335X_REV_ES1_0; omap_revision = AM335X_REV_ES1_0;
*cpu_rev = "1.0"; cpu_rev = "1.0";
case 0xb8f2: case 0xb8f2:
switch (rev) { switch (rev) {
case 0: case 0:
/* FALLTHROUGH */ /* FALLTHROUGH */
case 1: case 1:
omap_revision = TI8148_REV_ES1_0; omap_revision = TI8148_REV_ES1_0;
*cpu_rev = "1.0"; cpu_rev = "1.0";
break; break;
case 2: case 2:
omap_revision = TI8148_REV_ES2_0; omap_revision = TI8148_REV_ES2_0;
*cpu_rev = "2.0"; cpu_rev = "2.0";
break; break;
case 3: case 3:
/* FALLTHROUGH */ /* FALLTHROUGH */
default: default:
omap_revision = TI8148_REV_ES2_1; omap_revision = TI8148_REV_ES2_1;
*cpu_rev = "2.1"; cpu_rev = "2.1";
break; break;
} }
break; break;
default: default:
/* Unknown default to latest silicon rev as default */ /* Unknown default to latest silicon rev as default */
omap_revision = OMAP3630_REV_ES1_2; omap_revision = OMAP3630_REV_ES1_2;
*cpu_rev = "1.2"; cpu_rev = "1.2";
pr_warn("Warning: unknown chip type; assuming OMAP3630ES1.2\n"); pr_warn("Warning: unknown chip type; assuming OMAP3630ES1.2\n");
} }
} }
@ -444,63 +494,11 @@ static void __init omap4_check_revision(void)
((omap_rev() >> 12) & 0xf), ((omap_rev() >> 8) & 0xf)); ((omap_rev() >> 12) & 0xf), ((omap_rev() >> 8) & 0xf));
} }
#define OMAP3_SHOW_FEATURE(feat) \
if (omap3_has_ ##feat()) \
printk(#feat" ");
static void __init omap3_cpuinfo(const char *cpu_rev)
{
const char *cpu_name;
/*
* OMAP3430 and OMAP3530 are assumed to be same.
*
* OMAP3525, OMAP3515 and OMAP3503 can be detected only based
* on available features. Upon detection, update the CPU id
* and CPU class bits.
*/
if (cpu_is_omap3630()) {
cpu_name = "OMAP3630";
} else if (cpu_is_omap3517()) {
/* AM35xx devices */
cpu_name = (omap3_has_sgx()) ? "AM3517" : "AM3505";
} else if (cpu_is_ti816x()) {
cpu_name = "TI816X";
} else if (cpu_is_am335x()) {
cpu_name = "AM335X";
} else if (cpu_is_ti814x()) {
cpu_name = "TI814X";
} else if (omap3_has_iva() && omap3_has_sgx()) {
/* OMAP3430, OMAP3525, OMAP3515, OMAP3503 devices */
cpu_name = "OMAP3430/3530";
} else if (omap3_has_iva()) {
cpu_name = "OMAP3525";
} else if (omap3_has_sgx()) {
cpu_name = "OMAP3515";
} else {
cpu_name = "OMAP3503";
}
/* Print verbose information */
pr_info("%s ES%s (", cpu_name, cpu_rev);
OMAP3_SHOW_FEATURE(l2cache);
OMAP3_SHOW_FEATURE(iva);
OMAP3_SHOW_FEATURE(sgx);
OMAP3_SHOW_FEATURE(neon);
OMAP3_SHOW_FEATURE(isp);
OMAP3_SHOW_FEATURE(192mhz_clk);
printk(")\n");
}
/* /*
* Try to detect the exact revision of the omap we're running on * Try to detect the exact revision of the omap we're running on
*/ */
void __init omap2_check_revision(void) void __init omap2_check_revision(void)
{ {
const char *cpu_rev;
/* /*
* At this point we have an idea about the processor revision set * At this point we have an idea about the processor revision set
* earlier with omap2_set_globals_tap(). * earlier with omap2_set_globals_tap().
@ -508,7 +506,7 @@ void __init omap2_check_revision(void)
if (cpu_is_omap24xx()) { if (cpu_is_omap24xx()) {
omap24xx_check_revision(); omap24xx_check_revision();
} else if (cpu_is_omap34xx()) { } else if (cpu_is_omap34xx()) {
omap3_check_revision(&cpu_rev); omap3_check_revision();
/* TI81XX doesn't have feature register */ /* TI81XX doesn't have feature register */
if (!cpu_is_ti81xx()) if (!cpu_is_ti81xx())
@ -516,7 +514,7 @@ void __init omap2_check_revision(void)
else else
ti81xx_check_features(); ti81xx_check_features();
omap3_cpuinfo(cpu_rev); omap3_cpuinfo();
return; return;
} else if (cpu_is_omap44xx()) { } else if (cpu_is_omap44xx()) {
omap4_check_revision(); omap4_check_revision();