* Nishanth Menon <menon.nishanth@xxxxxxxxx> [091009 13:22]:
> Sanjeev,
>
> On Fri, Oct 9, 2009 at 2:47 PM, Sanjeev Premi <premi@xxxxxx> wrote:
> > Add runtime check for these OMAP35x variations
> > based on the detected Si features:
> > OMAP3503, OMAP3515, OMAP3525 and OMA3530.
> [sni[]
> > if (hawkeye == 0xb7ae) {
> > switch (rev) {
> > - case 0:
> > + case 0: /* Take care of early samples */
> > + case 1:
> > omap_revision = OMAP3430_REV_ES2_0;
> > - rev_name = "ES2.0";
> > break;
> > case 2:
> > omap_revision = OMAP3430_REV_ES2_1;
> > - rev_name = "ES2.1";
> > break;
> > case 3:
> > omap_revision = OMAP3430_REV_ES3_0;
> > - rev_name = "ES3.0";
> > break;
> > case 4:
> > omap_revision = OMAP3430_REV_ES3_1;
> > - rev_name = "ES3.1";
> > break;
> > default:
> > /* Use the latest known revision as default */
> > omap_revision = OMAP3430_REV_ES3_1;
> > - rev_name = "Unknown revision\n";
> > }
> > }
> > -
> > -out:
> > - pr_info("OMAP%04x %s\n", omap_rev() >> 16, rev_name);
> > }
> >
> > #define OMAP3_SHOW_FEATURE(feat) \
> > @@ -248,6 +240,57 @@ out:
> >
> > void __init omap3_cpuinfo(void)
> > {
> > + u8 rev = GET_OMAP_REVISION();
> > + char cpu_name[16], cpu_rev[16];
> > +
> > + /* 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 (omap3_has_iva() && omap3_has_sgx()) {
> > + strcpy(cpu_name, "3430/3530");
> > + }
> > + else if (omap3_has_sgx()) {
> > + omap_revision = OMAP3525_REV(rev);
>
> your patch conflicts with mine unfortunately. could you introduce 36xx
> on top of the aligned version for 36xx?
> see http://marc.info/?t=125510410600006&r=1&w=2
I'll push this 35xx patch first as it's been available before 36xx
processors. That way we'll get the ordering right in the changelog :)
Nishant, can you please post your 36xx patch one more time rebased
on this one?
Regards,
Tony
--
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
