From patchwork Wed May 5 08:42:06 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 97013 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o458fPB8026907 for ; Wed, 5 May 2010 08:42:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933850Ab0EEIla (ORCPT ); Wed, 5 May 2010 04:41:30 -0400 Received: from smtp.nokia.com ([192.100.122.233]:37642 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933821Ab0EEIl2 (ORCPT ); Wed, 5 May 2010 04:41:28 -0400 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o458eoxd027876; Wed, 5 May 2010 11:41:19 +0300 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 5 May 2010 11:41:13 +0300 Received: from mgw-da01.ext.nokia.com ([147.243.128.24]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 5 May 2010 11:41:12 +0300 Received: from manganga.research.nokia.com (esdhcp04199.research.nokia.com [172.21.41.99]) by mgw-da01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o458f1LF016327; Wed, 5 May 2010 11:41:07 +0300 From: Eduardo Valentin To: linux-arm-kernel@lists.infradead.org, Linux-OMAP Cc: ext Tony Lindgren , ext Kevin Hilman , "\\\"De-Schrijver Peter (Nokia-D/Helsinki)\\\"" , santosh.shilimkar@ti.com, felipe.balbi@nokia.com, Eduardo Valentin Subject: [RESEND PATCHv3 2/4] mach-omap2: Add SoC info data for OMAP2, 3, 4 into /proc/cpuinfo Date: Wed, 5 May 2010 11:42:06 +0300 Message-Id: <1273048928-6105-3-git-send-email-eduardo.valentin@nokia.com> X-Mailer: git-send-email 1.7.0.4.361.g8b5fe.dirty In-Reply-To: <1273048928-6105-1-git-send-email-eduardo.valentin@nokia.com> References: <1273048928-6105-1-git-send-email-eduardo.valentin@nokia.com> X-OriginalArrivalTime: 05 May 2010 08:41:13.0492 (UTC) FILETIME=[B81B2D40:01CAEC2E] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 05 May 2010 08:42:24 +0000 (UTC) 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);