From patchwork Wed May 5 08:42:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 97015 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 o458fPBA026907 for ; Wed, 5 May 2010 08:42:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933851Ab0EEIld (ORCPT ); Wed, 5 May 2010 04:41:33 -0400 Received: from smtp.nokia.com ([192.100.122.233]:37648 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933838Ab0EEIl3 (ORCPT ); Wed, 5 May 2010 04:41:29 -0400 Received: from esebh105.NOE.Nokia.com (esebh105.ntc.nokia.com [172.21.138.211]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o458fHxb028291; Wed, 5 May 2010 11:41:21 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by esebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 5 May 2010 11:41:17 +0300 Received: from mgw-da01.ext.nokia.com ([147.243.128.24]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Wed, 5 May 2010 11:41:16 +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 o458f1LG016327; Wed, 5 May 2010 11:41:10 +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 3/4] mach-omap1: Add SoC info data for OMAP1 into /proc/cpuinfo Date: Wed, 5 May 2010 11:42:07 +0300 Message-Id: <1273048928-6105-4-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:16.0860 (UTC) FILETIME=[BA1D17C0: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:44 +0000 (UTC) diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c index a0e3560..9a84347 100644 --- a/arch/arm/mach-omap1/id.c +++ b/arch/arm/mach-omap1/id.c @@ -120,7 +120,7 @@ static u8 __init omap_get_die_rev(void) void __init omap_check_revision(void) { - int i; + int i, sz; u16 jtag_id; u8 die_rev; u32 omap_id; @@ -194,11 +194,14 @@ void __init omap_check_revision(void) printk(KERN_INFO "Unknown OMAP cpu type: 0x%02x\n", cpu_type); } - printk(KERN_INFO "OMAP%04x", omap_revision >> 16); + sz = snprintf(system_soc_info, SYSTEM_SOC_INFO_SIZE, "OMAP%04x", + omap_revision >> 16); if ((omap_revision >> 8) & 0xff) - printk(KERN_INFO "%x", (omap_revision >> 8) & 0xff); - printk(KERN_INFO " revision %i handled as %02xxx id: %08x%08x\n", - die_rev, omap_revision & 0xff, system_serial_low, - system_serial_high); + snprintf(system_soc_info + sz, SYSTEM_SOC_INFO_SIZE - sz, + "%x", (omap_revision >> 8) & 0xff); + pr_info("%s revision %i handled as %02xxx id: %08x%08x\n", + system_soc_info, die_rev, omap_revision & 0xff, + system_serial_low, system_serial_high); + }