From mboxrd@z Thu Jan 1 00:00:00 1970 From: eduardo.valentin@nokia.com (Eduardo Valentin) Date: Wed, 5 May 2010 11:42:06 +0300 Subject: [RESEND PATCHv3 2/4] mach-omap2: Add SoC info data for OMAP2, 3, 4 into /proc/cpuinfo In-Reply-To: <1273048928-6105-1-git-send-email-eduardo.valentin@nokia.com> References: <1273048928-6105-1-git-send-email-eduardo.valentin@nokia.com> Message-ID: <1273048928-6105-3-git-send-email-eduardo.valentin@nokia.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Eduardo Valentin Report OMAP2,3,4 data into system_soc_info. Now we get omap information under /proc/cpuinfo. Signed-off-by: Eduardo Valentin --- arch/arm/mach-omap2/id.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 37b8a1a..4702ffe 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -104,7 +104,7 @@ static u16 tap_prod_id; void __init omap24xx_check_revision(void) { - int i, j; + int i, j, sz; u32 idcode, prod_id; u16 hawkeye; u8 dev_type, rev; @@ -152,10 +152,12 @@ void __init omap24xx_check_revision(void) j = i; } - pr_info("OMAP%04x", omap_rev() >> 16); + sz = snprintf(system_soc_info, SYSTEM_SOC_INFO_SIZE, "OMAP%04x", + omap_rev() >> 16); if ((omap_rev() >> 8) & 0x0f) - pr_info("ES%x", (omap_rev() >> 12) & 0xf); - pr_info("\n"); + snprintf(system_soc_info + sz, SYSTEM_SOC_INFO_SIZE - sz, + "ES%x", (omap_rev() >> 12) & 0xf); + pr_info("%s\n", system_soc_info); } #define OMAP3_CHECK_FEATURE(status,feat) \ @@ -286,7 +288,9 @@ void __init omap4_check_revision(void) if ((hawkeye == 0xb852) && (rev == 0x0)) { omap_revision = OMAP4430_REV_ES1_0; omap_chip.oc |= CHIP_IS_OMAP4430ES1; - pr_info("OMAP%04x %s\n", omap_rev() >> 16, rev_name); + snprintf(system_soc_info, SYSTEM_SOC_INFO_SIZE, "OMAP%04x %s\n", + omap_rev() >> 16, rev_name); + pr_info("%s\n", system_soc_info); return; } @@ -356,7 +360,9 @@ void __init omap3_cpuinfo(void) } /* Print verbose information */ - pr_info("%s ES%s (", cpu_name, cpu_rev); + snprintf(system_soc_info, SYSTEM_SOC_INFO_SIZE, "%s ES%s", cpu_name, + cpu_rev); + pr_info("%s (", system_soc_info); OMAP3_SHOW_FEATURE(l2cache); OMAP3_SHOW_FEATURE(iva); -- 1.7.0.4.361.g8b5fe.dirty