diff for duplicates of <20110905151947.GA3548@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 4941986..12e46fd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,31 +7,31 @@ > <snip> > > > -> > int __init omap3xxx_hwmod_init(void) -> > { -> > - return omap_hwmod_register(omap3xxx_hwmods); -> > + int r; -> > + struct omap_hwmod **h = NULL; +> > ?int __init omap3xxx_hwmod_init(void) +> > ?{ +> > - ? ? ? return omap_hwmod_register(omap3xxx_hwmods); +> > + ? ? ? int r; +> > + ? ? ? struct omap_hwmod **h = NULL; > > + -> > + /* Register hwmods common to all OMAP3 */ -> > + r = omap_hwmod_register(omap3xxx_hwmods); -> > + if (!r) -> > + return r; +> > + ? ? ? /* Register hwmods common to all OMAP3 */ +> > + ? ? ? r = omap_hwmod_register(omap3xxx_hwmods); +> > + ? ? ? if (!r) +> > + ? ? ? ? ? ? ? return r; > > + -> > + /* -> > + * Register hwmods common to individual OMAP3 families, all -> > + * silicon revisions (e.g., 34xx, or AM3505/3517, or 36xx) -> > + * All possible revisions should be included in this conditional. -> > + */ -> > + if (omap_rev() == OMAP3430_REV_ES1_0 || -> > + omap_rev() == OMAP3430_REV_ES2_0 || -> > + omap_rev() == OMAP3430_REV_ES2_1 || -> > + omap_rev() == OMAP3430_REV_ES3_0 || -> > + omap_rev() == OMAP3430_REV_ES3_1 || -> > + omap_rev() == OMAP3430_REV_ES3_1_2) { -> > + h = omap34xx_hwmods; -> > + } else if (omap_rev() & OMAP3505_REV(0)) { -> > + h = am35xx_hwmods; +> > + ? ? ? /* +> > + ? ? ? ?* Register hwmods common to individual OMAP3 families, all +> > + ? ? ? ?* silicon revisions (e.g., 34xx, or AM3505/3517, or 36xx) +> > + ? ? ? ?* All possible revisions should be included in this conditional. +> > + ? ? ? ?*/ +> > + ? ? ? if (omap_rev() == OMAP3430_REV_ES1_0 || +> > + ? ? ? ? ? omap_rev() == OMAP3430_REV_ES2_0 || +> > + ? ? ? ? ? omap_rev() == OMAP3430_REV_ES2_1 || +> > + ? ? ? ? ? omap_rev() == OMAP3430_REV_ES3_0 || +> > + ? ? ? ? ? omap_rev() == OMAP3430_REV_ES3_1 || +> > + ? ? ? ? ? omap_rev() == OMAP3430_REV_ES3_1_2) { +> > + ? ? ? ? ? ? ? h = omap34xx_hwmods; +> > + ? ? ? } else if (omap_rev() & OMAP3505_REV(0)) { +> > + ? ? ? ? ? ? ? h = am35xx_hwmods; > > This check will be always true I think? > @@ -45,7 +45,3 @@ need cpu_is_omapxxxx during early_init at all. Regards, Tony --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index d866eb2..c179b28 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,12 +1,9 @@ "ref\0alpine.DEB.2.00.1109042042250.9056@utopia.booyaka.com\0" "ref\0CANOLnOOkz2ZkhPSafTLxUUH2bSVoRrYA44-C1+yku8naYaRz3w@mail.gmail.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH] OMAP2+: hwmod: remove OMAP_CHIP*\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH] OMAP2+: hwmod: remove OMAP_CHIP*\0" "Date\0Mon, 5 Sep 2011 18:19:47 +0300\0" - "To\0Grazvydas Ignotas <notasas@gmail.com>\0" - "Cc\0Paul Walmsley <paul@pwsan.com>" - linux-omap@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Grazvydas Ignotas <notasas@gmail.com> [110905 13:54]:\n" @@ -18,31 +15,31 @@ "> <snip>\n" "> \n" "> >\n" - "> > \302\240int __init omap3xxx_hwmod_init(void)\n" - "> > \302\240{\n" - "> > - \302\240 \302\240 \302\240 return omap_hwmod_register(omap3xxx_hwmods);\n" - "> > + \302\240 \302\240 \302\240 int r;\n" - "> > + \302\240 \302\240 \302\240 struct omap_hwmod **h = NULL;\n" + "> > ?int __init omap3xxx_hwmod_init(void)\n" + "> > ?{\n" + "> > - ? ? ? return omap_hwmod_register(omap3xxx_hwmods);\n" + "> > + ? ? ? int r;\n" + "> > + ? ? ? struct omap_hwmod **h = NULL;\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 /* Register hwmods common to all OMAP3 */\n" - "> > + \302\240 \302\240 \302\240 r = omap_hwmod_register(omap3xxx_hwmods);\n" - "> > + \302\240 \302\240 \302\240 if (!r)\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 return r;\n" + "> > + ? ? ? /* Register hwmods common to all OMAP3 */\n" + "> > + ? ? ? r = omap_hwmod_register(omap3xxx_hwmods);\n" + "> > + ? ? ? if (!r)\n" + "> > + ? ? ? ? ? ? ? return r;\n" "> > +\n" - "> > + \302\240 \302\240 \302\240 /*\n" - "> > + \302\240 \302\240 \302\240 \302\240* Register hwmods common to individual OMAP3 families, all\n" - "> > + \302\240 \302\240 \302\240 \302\240* silicon revisions (e.g., 34xx, or AM3505/3517, or 36xx)\n" - "> > + \302\240 \302\240 \302\240 \302\240* All possible revisions should be included in this conditional.\n" - "> > + \302\240 \302\240 \302\240 \302\240*/\n" - "> > + \302\240 \302\240 \302\240 if (omap_rev() == OMAP3430_REV_ES1_0 ||\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 omap_rev() == OMAP3430_REV_ES2_0 ||\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 omap_rev() == OMAP3430_REV_ES2_1 ||\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 omap_rev() == OMAP3430_REV_ES3_0 ||\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 omap_rev() == OMAP3430_REV_ES3_1 ||\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 omap_rev() == OMAP3430_REV_ES3_1_2) {\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 h = omap34xx_hwmods;\n" - "> > + \302\240 \302\240 \302\240 } else if (omap_rev() & OMAP3505_REV(0)) {\n" - "> > + \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 h = am35xx_hwmods;\n" + "> > + ? ? ? /*\n" + "> > + ? ? ? ?* Register hwmods common to individual OMAP3 families, all\n" + "> > + ? ? ? ?* silicon revisions (e.g., 34xx, or AM3505/3517, or 36xx)\n" + "> > + ? ? ? ?* All possible revisions should be included in this conditional.\n" + "> > + ? ? ? ?*/\n" + "> > + ? ? ? if (omap_rev() == OMAP3430_REV_ES1_0 ||\n" + "> > + ? ? ? ? ? omap_rev() == OMAP3430_REV_ES2_0 ||\n" + "> > + ? ? ? ? ? omap_rev() == OMAP3430_REV_ES2_1 ||\n" + "> > + ? ? ? ? ? omap_rev() == OMAP3430_REV_ES3_0 ||\n" + "> > + ? ? ? ? ? omap_rev() == OMAP3430_REV_ES3_1 ||\n" + "> > + ? ? ? ? ? omap_rev() == OMAP3430_REV_ES3_1_2) {\n" + "> > + ? ? ? ? ? ? ? h = omap34xx_hwmods;\n" + "> > + ? ? ? } else if (omap_rev() & OMAP3505_REV(0)) {\n" + "> > + ? ? ? ? ? ? ? h = am35xx_hwmods;\n" "> \n" "> This check will be always true I think?\n" "> \n" @@ -55,10 +52,6 @@ "\n" "Regards,\n" "\n" - "Tony\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-omap\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + Tony -947ab3348d28ed0f2b92e23122c953e36914e3c600e8357990846462f0c7bb2d +7254ebbfb5856101358db677be82f6722abae5e7deec727c9f8ccf3a6c056309
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.