Hi, On Thu, Oct 08, 2009 at 06:47:03AM +0200, ext Nishanth Menon wrote: > Device intro: > OMAP3630 is the latest in the family of OMAP3 devices > and among the changes it introduces are: > > New OPP levels for new voltage and frequency levels. a bunch of > Bug fixes to various modules feature additions, notably with ISP, > sDMA etc. > > Details about the chip is available here: > http://focus.ti.com/general/docs/wtbu/wtbuproductcontent.tsp?templateId=6123&navigationId=12836&contentId=52606 > > Strategy used: > Strategy to introduce this device into Linux was discussed here: > Ref: http://marc.info/?t=125343303400003&r=1&w=2 > > Two approaches were available: > a) Consider 3630 generation of devices as a new family of silicon > b) Consider 3630 as an offshoot of 3430 family of devices > > As a common consensus, (b) seems to be more valid for 3630 as: > * There are changes which are easily handled by looking at rev > * Most of existing 34xx infrastructure can be reused(almost 90%+) > - so no ugly if (cpu_is_omap34xx() || cpu_is_omap36xx()) > all over the place > - lesser chance of bugs due to reuse of proven code flow > - 36xx specific handling can still be done where required > within the existing infrastructure > > NOTE: > * If additional 34xx series are added, OMAP3430_REV_ESXXXX can be > added on top of the existing 3630 ones are renumbered > > This patch was tested on SDP3430. no test on 3630 boards ? > Signed-off-by: Madhusudhan Chikkature Rajashekar <madhu.cr@xxxxxx> > Signed-off-by: Nishanth Menon <nm@xxxxxx> > Signed-off-by: Vikram Pandita <vikram.pandita@xxxxxx> > Cc: Allen Pais <allen.pais@xxxxxx> > Cc: Anand Gadiyar <gadiyar@xxxxxx> > Cc: Benoit Cousson <b-cousson@xxxxxx> > Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> > Cc: Sanjeev Premi <premi@xxxxxx> > Cc: Santosh Shilimkar <santosh.shilimkar@xxxxxx> > Cc: Sergio Alberto Aguirre Rodriguez <saaguirre@xxxxxx> > Cc: Tony Lindgren <tony@xxxxxxxxxxx> > --- > arch/arm/mach-omap2/id.c | 33 ++++++++++++++++++++++++++++++--- > arch/arm/plat-omap/include/mach/cpu.h | 6 ++++++ > 2 files changed, 36 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c > index 03b80f2..79193c6 100644 > --- a/arch/arm/mach-omap2/id.c > +++ b/arch/arm/mach-omap2/id.c > @@ -186,6 +186,7 @@ void __init omap3_check_revision(void) > { > u32 cpuid, idcode; > u16 hawkeye; > + u16 omap_type; > u8 rev; > char *rev_name = "ES1.0"; > > @@ -210,7 +211,10 @@ void __init omap3_check_revision(void) > hawkeye = (idcode >> 12) & 0xffff; > rev = (idcode >> 28) & 0xff; > > - if (hawkeye == 0xb7ae) { > + omap_type = omap_rev() >> 16; > + switch (hawkeye) { > + case 0xb7ae: > + /* Handle 34xx devices */ > switch (rev) { > case 0: > omap_revision = OMAP3430_REV_ES2_0; > @@ -231,12 +235,35 @@ void __init omap3_check_revision(void) > default: > /* Use the latest known revision as default */ > omap_revision = OMAP3430_REV_ES3_1; > - rev_name = "Unknown revision\n"; > + rev_name = "Unknown 34xx revision\n"; > + /* Fall through */ there's a break right below, you don't really fall through... > } > + break; > + case 0xb891: > + /* Handle 36xx devices */ > + /* Over ride for display purposes */ multi-lined comment style is: /* line 1 * line 2 * . * . * . * line N */ > + omap_type = 0x3630; > + switch (rev) { > + case 0: > + omap_revision = OMAP3630_REV_ES1_0; > + rev_name = "ES1.0"; > + break; > + default: > + /* Use the latest known revision as default */ > + omap_revision = OMAP3630_REV_ES1_0; > + rev_name = "Unknown 36xx revision\n"; > + /* Fall through */ don't fall through. > + } > + break; > + default: > + /* Unknown default to latest rev as default*/ > + omap_revision = OMAP3630_REV_ES1_0; > + rev_name = "Unknown revision\n"; > + /* Fall through */ unnecessary comment. -- balbi -- 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
