omap2/3: Update revision identification
Subsystems (3)
PATCH 1/1 omap2/3: Update revision identification
The existing definitions for cpu revision used
upper nibble in the bits[15:08]. With OMAP3630,
definitions use lower nibble.
This patch unifies the definitions to start
at lower nibble.
[1] http://marc.info/?t=128161739100005&r=1&w=2
--- arch/arm/mach-omap2/id.c | 22 +++++++++++--------- arch/arm/plat-omap/include/plat/cpu.h | 36 ++++++++++++++++---------------- 2 files changed, 30 insertions(+), 28 deletions(-)
arch/arm/mach-omap2/id.c +12 -10
@@ -366,21 +366,23 @@ static void __init omap3_cpuinfo(void)strcpy (cpu_rev,"1.0" );break ;case OMAP_REVBITS_01 : -strcpy (cpu_rev,"1.1" ); +if (cpu_is_omap3630 ()) { +strcpy (cpu_rev,"1.1" ); + }else { +strcpy (cpu_rev,"2.0" ); + }break ;case OMAP_REVBITS_02 : -strcpy (cpu_rev,"1.2" ); -break ; -case OMAP_REVBITS_10 : -strcpy (cpu_rev,"2.0" ); -break ; -case OMAP_REVBITS_20 : -strcpy (cpu_rev,"2.1" ); +if (cpu_is_omap3630 ()) { +strcpy (cpu_rev,"1.2" ); + }else { +strcpy (cpu_rev,"2.1" ); + }break ; -case OMAP_REVBITS_30 : +case OMAP_REVBITS_03 :strcpy (cpu_rev,"3.0" );break ; -case OMAP_REVBITS_40 : +case OMAP_REVBITS_04 :/* FALLTHROUGH */ default :/* Use the latest known revision as default */
arch/arm/plat-omap/include/plat/cpu.h +18 -18
@@ -68,10 +68,9 @@ unsigned int omap_rev(void);#define OMAP_REVBITS_00 0x00#define OMAP_REVBITS_01 0x01#define OMAP_REVBITS_02 0x02 -#define OMAP_REVBITS_10 0x10 -#define OMAP_REVBITS_20 0x20 -#define OMAP_REVBITS_30 0x30 -#define OMAP_REVBITS_40 0x40 +#define OMAP_REVBITS_03 0x03 +#define OMAP_REVBITS_04 0x04 +#define OMAP_REVBITS_05 0x05/* * Get the CPU revision for OMAP devices
@@ -363,23 +362,24 @@ IS_OMAP_TYPE(3517, 0x3517)/* Various silicon revisions for omap2 */ #define OMAP242X_CLASS 0x24200024 -#define OMAP2420_REV_ES1_0 0x24200024 -#define OMAP2420_REV_ES2_0 0x24201024 +#define OMAP2420_REV_ES1_0 (OMAP242X_CLASS) +#define OMAP2420_REV_ES2_0 (OMAP242X_CLASS | (OMAP_REVBITS_01 << 8))#define OMAP243X_CLASS 0x24300024 -#define OMAP2430_REV_ES1_0 0x24300024 +#define OMAP2430_REV_ES1_0 (OMAP243X_CLASS)#define OMAP343X_CLASS 0x34300034 -#define OMAP3430_REV_ES1_0 0x34300034 -#define OMAP3430_REV_ES2_0 0x34301034 -#define OMAP3430_REV_ES2_1 0x34302034 -#define OMAP3430_REV_ES3_0 0x34303034 -#define OMAP3430_REV_ES3_1 0x34304034 -#define OMAP3430_REV_ES3_1_2 0x34305034 - -#define OMAP3630_REV_ES1_0 0x36300034 -#define OMAP3630_REV_ES1_1 0x36300134 -#define OMAP3630_REV_ES1_2 0x36300234 +#define OMAP3430_REV_ES1_0 (OMAP343X_CLASS) +#define OMAP3430_REV_ES2_0 (OMAP343X_CLASS | (OMAP_REVBITS_01 << 8)) +#define OMAP3430_REV_ES2_1 (OMAP343X_CLASS | (OMAP_REVBITS_02 << 8)) +#define OMAP3430_REV_ES3_0 (OMAP343X_CLASS | (OMAP_REVBITS_03 << 8)) +#define OMAP3430_REV_ES3_1 (OMAP343X_CLASS | (OMAP_REVBITS_04 << 8)) +#define OMAP3430_REV_ES3_1_2 (OMAP343X_CLASS | (OMAP_REVBITS_05 << 8)) + +#define OMAP363X_CLASS 0x36000034 +#define OMAP3630_REV_ES1_0 (OMAP363X_CLASS) +#define OMAP3630_REV_ES1_1 (OMAP363X_CLASS | (OMAP_REVBITS_01 << 8)) +#define OMAP3630_REV_ES1_2 (OMAP363X_CLASS | (OMAP_REVBITS_02 << 8))#define OMAP35XX_CLASS 0x35000034#define OMAP3503_REV (v) (OMAP35XX_CLASS | (0x3503 << 16) | (v << 8))
@@ -390,7 +390,7 @@ IS_OMAP_TYPE(3517, 0x3517)#define OMAP3517_REV (v) (OMAP35XX_CLASS | (0x3517 << 16) | (v << 8))#define OMAP443X_CLASS 0x44300044 -#define OMAP4430_REV_ES1_0 0x44300044 +#define OMAP4430_REV_ES1_0 (OMAP443X_CLASS)/* * omap_chip bits
Signature · 1 line
1.6.6.1
Quoted 14 lines
-----Original Message-----
From: Premi, Sanjeev
Sent: Monday, August 16, 2010 9:23 PM
To: [email protected]
Cc: Premi, Sanjeev
Subject: [PATCH 1/1] omap2/3: Update revision identificationThe existing definitions for cpu revision used
upper nibble in the bits[15:08]. With OMAP3630,
definitions use lower nibble.This patch unifies the definitions to start
at lower nibble.
Quoted 7 lines
[1] http://marc.info/?t=128161739100005&r=1&w=2
Signed-off-by Sanjeev Premi <[email protected]>--- arch/arm/mach-omap2/id.c | 22 +++++++++++--------- arch/arm/plat-omap/include/plat/cpu.h | 36++++++++++++++++----------------
Hi Tony,
Did you have chance to look at this?
(I was away from work; couldn't follow-up earlier).
Best regards,
Sanjeev
[snip]--[snip]
Tony Lindgren
maintainerarch/arm/mach-omap2/id.c static void __init omap3_cpuinfo(void) · line 374
Quoted 13 lines · Sanjeev Premi
arch/arm/mach-omap2/id.c +5
-1@@ -366,21 +366,23 @@ static void __init omap3_cpuinfo(void)strcpy (cpu_rev,"1.0" );break ;case OMAP_REVBITS_01 : -strcpy (cpu_rev,"1.1" ); +if (cpu_is_omap3630 ()) { +strcpy (cpu_rev,"1.1" ); + }else { +strcpy (cpu_rev,"2.0" ); + }break ;
No { } brackets needed if it's one line + one line if else statement.
Quoted 4 lines
arch/arm/mach-omap2/id.c +0
-3case OMAP_REVBITS_02 : -strcpy (cpu_rev,"1.2" ); -break ; -case OMAP_REVBITS_10 :
arch/arm/mach-omap2/id.c static void __init omap3_cpuinfo(void) · line 381
Quoted 10 lines
arch/arm/mach-omap2/id.c +5
-4-strcpy (cpu_rev,"2.0" ); -break ; -case OMAP_REVBITS_20 : -strcpy (cpu_rev,"2.1" ); +if (cpu_is_omap3630 ()) { +strcpy (cpu_rev,"1.2" ); + }else { +strcpy (cpu_rev,"2.1" ); + }break ;
Not needed here either.
arch/arm/mach-omap2/id.c static void __init omap3_cpuinfo(void) · line 388
Quoted 9 lines
arch/arm/mach-omap2/id.c +2
-2-case OMAP_REVBITS_30 : +case OMAP_REVBITS_03 :strcpy (cpu_rev,"3.0" );break ; -case OMAP_REVBITS_40 : +case OMAP_REVBITS_04 :/* FALLTHROUGH */ default :/* Use the latest known revision as default */
Also, maybe just set a separate switch for 36xx?
In the long run it's best to avoid sprinkiling the cpu_is_omapxxxx tests as that adds more places to patch when new omap xyz is added.
arch/arm/mach-omap2/id.c
Quoted 3 lines
arch/arm/mach-omap2/id.c +2
-1-#define OMAP2420_REV_ES2_0 0x24201024 +#define OMAP2420_REV_ES1_0 (OMAP242X_CLASS) +#define OMAP2420_REV_ES2_0 (OMAP242X_CLASS | (OMAP_REVBITS_01 << 8))
No parens needed around OMAP242X_CLASS if it's just one value.
arch/arm/mach-omap2/id.c
Quoted 3 lines
#define
OMAP243X_CLASS0x24300024arch/arm/mach-omap2/id.c +1
-1-#define OMAP2430_REV_ES1_0 0x24300024 +#define OMAP2430_REV_ES1_0 (OMAP243X_CLASS)
Not needed around OMAP243X_CLASS either. Please check the other places too.
Regards,
Tony