| Message ID | 1361374034-21831-2-git-send-email-santosh.shilimkar@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Wed, Feb 20, 2013 at 08:57:07PM +0530, Santosh Shilimkar wrote: > case 0xb998: > switch (rev) { > case 0: > - default: > omap_revision = OMAP5432_REV_ES1_0; > + break; > + case 1: > + omap_revision = OMAP5432_REV_ES2_0; > + break; > + default: > + omap_revision = OMAP5432_REV_ES2_0; no need for the duplication: + case 1: + default: + omap_revision = OMAP5432_REV_ES2_0; will work just fine. > } > break; > > default: > /* Unknown default to latest silicon rev as default*/ > - omap_revision = OMAP5430_REV_ES1_0; > + omap_revision = OMAP5430_REV_ES2_0; how about we default to 0xffffffff ? That's the highest possible version, just not sure if our revision macros can cope with it.
On Wednesday 20 February 2013 08:59 PM, Felipe Balbi wrote: > Hi, > > On Wed, Feb 20, 2013 at 08:57:07PM +0530, Santosh Shilimkar wrote: >> case 0xb998: >> switch (rev) { >> case 0: >> - default: >> omap_revision = OMAP5432_REV_ES1_0; >> + break; >> + case 1: >> + omap_revision = OMAP5432_REV_ES2_0; >> + break; >> + default: >> + omap_revision = OMAP5432_REV_ES2_0; > > no need for the duplication: > > + case 1: > + default: > + omap_revision = OMAP5432_REV_ES2_0; > > will work just fine. right. Will fix that. > >> } >> break; >> >> default: >> /* Unknown default to latest silicon rev as default*/ >> - omap_revision = OMAP5430_REV_ES1_0; >> + omap_revision = OMAP5430_REV_ES2_0; > > how about we default to 0xffffffff ? That's the highest possible > version, just not sure if our revision macros can cope with it. > :D For record, it was decided that we will always have latest silicon spin as default and hence OMAP5_ES2
Hi, On Wed, Feb 20, 2013 at 09:33:32PM +0530, Santosh Shilimkar wrote: > >> default: > >> /* Unknown default to latest silicon rev as default*/ > >>- omap_revision = OMAP5430_REV_ES1_0; > >>+ omap_revision = OMAP5430_REV_ES2_0; > > > >how about we default to 0xffffffff ? That's the highest possible > >version, just not sure if our revision macros can cope with it. > > > :D > For record, it was decided that we will always have latest silicon > spin as default and hence OMAP5_ES2 but then this line will forever be modified. Every year or so :-p
On Wednesday 20 February 2013 09:57 PM, Felipe Balbi wrote: > Hi, > > On Wed, Feb 20, 2013 at 09:33:32PM +0530, Santosh Shilimkar wrote: >>>> default: >>>> /* Unknown default to latest silicon rev as default*/ >>>> - omap_revision = OMAP5430_REV_ES1_0; >>>> + omap_revision = OMAP5430_REV_ES2_0; >>> >>> how about we default to 0xffffffff ? That's the highest possible >>> version, just not sure if our revision macros can cope with it. >>> >> :D >> For record, it was decided that we will always have latest silicon >> spin as default and hence OMAP5_ES2 > > but then this line will forever be modified. Every year or so :-p > No... Unless and until we spin new silicon revision for OMAP5 every year. This is OMAP5 specific ID code function. Regards, Santosh
On Wed, Feb 20, 2013 at 10:01:15PM +0530, Santosh Shilimkar wrote: > On Wednesday 20 February 2013 09:57 PM, Felipe Balbi wrote: > >Hi, > > > >On Wed, Feb 20, 2013 at 09:33:32PM +0530, Santosh Shilimkar wrote: > >>>> default: > >>>> /* Unknown default to latest silicon rev as default*/ > >>>>- omap_revision = OMAP5430_REV_ES1_0; > >>>>+ omap_revision = OMAP5430_REV_ES2_0; > >>> > >>>how about we default to 0xffffffff ? That's the highest possible > >>>version, just not sure if our revision macros can cope with it. > >>> > >>:D > >>For record, it was decided that we will always have latest silicon > >>spin as default and hence OMAP5_ES2 > > > >but then this line will forever be modified. Every year or so :-p > > > No... Unless and until we spin new silicon revision for OMAP5 > every year. This is OMAP5 specific ID code function. oh, right. nevermind then
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 45cc7ed4..ed6f407 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -519,22 +519,32 @@ void __init omap5xxx_check_revision(void) case 0xb942: switch (rev) { case 0: - default: omap_revision = OMAP5430_REV_ES1_0; + break; + case 1: + omap_revision = OMAP5430_REV_ES2_0; + break; + default: + omap_revision = OMAP5430_REV_ES2_0; } break; case 0xb998: switch (rev) { case 0: - default: omap_revision = OMAP5432_REV_ES1_0; + break; + case 1: + omap_revision = OMAP5432_REV_ES2_0; + break; + default: + omap_revision = OMAP5432_REV_ES2_0; } break; default: /* Unknown default to latest silicon rev as default*/ - omap_revision = OMAP5430_REV_ES1_0; + omap_revision = OMAP5430_REV_ES2_0; } pr_info("OMAP%04x ES%d.0\n", diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h index f31d907..4c90b3b 100644 --- a/arch/arm/mach-omap2/soc.h +++ b/arch/arm/mach-omap2/soc.h @@ -404,7 +404,9 @@ IS_OMAP_TYPE(3430, 0x3430) #define OMAP54XX_CLASS 0x54000054 #define OMAP5430_REV_ES1_0 (OMAP54XX_CLASS | (0x30 << 16) | (0x10 << 8)) +#define OMAP5430_REV_ES2_0 (OMAP54XX_CLASS | (0x30 << 16) | (0x20 << 8)) #define OMAP5432_REV_ES1_0 (OMAP54XX_CLASS | (0x32 << 16) | (0x10 << 8)) +#define OMAP5432_REV_ES2_0 (OMAP54XX_CLASS | (0x32 << 16) | (0x20 << 8)) void omap2xxx_check_revision(void); void omap3xxx_check_revision(void);
Update OMAP5 ES2 idcode and make ES2 as default detection. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> --- arch/arm/mach-omap2/id.c | 16 +++++++++++++--- arch/arm/mach-omap2/soc.h | 2 ++ 2 files changed, 15 insertions(+), 3 deletions(-)