Oops, minor bug here, pr_info is still putting out wrong data, should be from the array I added. Sending new patch soon. >-----Original Message----- >From: linux-omap-owner@xxxxxxxxxxxxxxx >[mailto:linux-omap-owner@xxxxxxxxxxxxxxx] On Behalf Of ext Tero Kristo >Sent: 08 September, 2008 19:34 >To: linux-omap@xxxxxxxxxxxxxxx >Subject: [PATCH] Fixed CPU type check for OMAP3 > >ES version definitions were incorrect, also GP/EMU/SEC etc. >types were not detected at all. > >Signed-off-by: Tero Kristo <tero.kristo@xxxxxxxxx> >--- > arch/arm/mach-omap2/id.c | 9 ++++++++- > arch/arm/plat-omap/include/mach/cpu.h | 2 +- > 2 files changed, 9 insertions(+), 2 deletions(-) > >diff --git a/arch/arm/mach-omap2/id.c >b/arch/arm/mach-omap2/id.c index a526c0f..290b88c 100644 >--- a/arch/arm/mach-omap2/id.c >+++ b/arch/arm/mach-omap2/id.c >@@ -53,6 +53,13 @@ static struct omap_id omap_ids[] __initdata = { > { .hawkeye = 0xb68a, .dev = 0x0, .type = 0x24300000 }, }; > >+static const char omap3_revs[][4] = { >+ "1.0", >+ "2.0", >+ "2.1", >+ "3.0" >+}; >+ > static struct omap_chip_id omap_chip; > > /** >@@ -224,7 +231,7 @@ void __init omap2_check_revision(void) > * Note that rev cannot be used directly as ES1.0 uses value 0. > */ > if (hawkeye == 0xb7ae) { >- system_rev = 0x34300000 | ((1 + rev) << 12); >+ _set_system_rev(0x34300000 | (rev << 12), rev); > pr_info("OMAP%04x ES2.%i\n", system_rev >> 16, rev); > _set_omap_chip(); > return; >diff --git a/arch/arm/plat-omap/include/mach/cpu.h >b/arch/arm/plat-omap/include/mach/cpu.h >index e046418..e170d29 100644 >--- a/arch/arm/plat-omap/include/mach/cpu.h >+++ b/arch/arm/plat-omap/include/mach/cpu.h >@@ -357,7 +357,7 @@ IS_OMAP_TYPE(3430, 0x3430) > #define OMAP3430_REV_ES1_0 0x34300000 > #define OMAP3430_REV_ES2_0 0x34301000 > #define OMAP3430_REV_ES2_1 0x34302000 >-#define OMAP3430_REV_ES2_2 0x34303000 >+#define OMAP3430_REV_ES3_0 0x34303000 > > /* > * omap_chip bits >-- >1.5.4.3 > >-- >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 > -- 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
