From patchwork Mon Apr 26 08:24:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 95014 X-Patchwork-Delegate: tony@atomide.com 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 o3Q8PgQU022703 for ; Mon, 26 Apr 2010 08:25:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751371Ab0DZIZm (ORCPT ); Mon, 26 Apr 2010 04:25:42 -0400 Received: from smtp.nokia.com ([192.100.122.230]:17163 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750716Ab0DZIZl (ORCPT ); Mon, 26 Apr 2010 04:25:41 -0400 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o3Q8PUJw024920; Mon, 26 Apr 2010 11:25:35 +0300 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 26 Apr 2010 11:25:26 +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); Mon, 26 Apr 2010 11:25:21 +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 o3Q8P59k032417; Mon, 26 Apr 2010 11:25:16 +0300 From: Eduardo Valentin To: ext Kevin Hilman , ext Tony Lindgren Cc: "\\\"De-Schrijver Peter (Nokia-D/Helsinki)\\\"" , Linux-OMAP , Eduardo Valentin Subject: [PATCH 3/4] mach-omap1: Add SoC info data for OMAP into /proc/cpuinfo1 Date: Mon, 26 Apr 2010 11:24:52 +0300 Message-Id: <1272270293-18568-4-git-send-email-eduardo.valentin@nokia.com> X-Mailer: git-send-email 1.7.0.4.361.g8b5fe.dirty In-Reply-To: <1272270293-18568-1-git-send-email-eduardo.valentin@nokia.com> References: <1272270293-18568-1-git-send-email-eduardo.valentin@nokia.com> X-OriginalArrivalTime: 26 Apr 2010 08:25:21.0927 (UTC) FILETIME=[03362170:01CAE51A] 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]); Mon, 26 Apr 2010 08:25:43 +0000 (UTC) diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c index a0e3560..9622e9f 100644 --- a/arch/arm/mach-omap1/id.c +++ b/arch/arm/mach-omap1/id.c @@ -194,11 +194,17 @@ 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); - 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, SYSTEM_SOC_INFO_SIZE, "OMAP%04x", + omap_revision >> 16); + if ((omap_revision >> 8) & 0xff) { + int sz = strlen(system_soc_info); + + 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); + }