From patchwork Tue May 11 14:15:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 98719 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 o4BEDnGk022508 for ; Tue, 11 May 2010 14:13:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758132Ab0EKOMm (ORCPT ); Tue, 11 May 2010 10:12:42 -0400 Received: from smtp.nokia.com ([192.100.122.233]:50757 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758098Ab0EKOMk (ORCPT ); Tue, 11 May 2010 10:12:40 -0400 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o4BEBvk4013557; Tue, 11 May 2010 17:12:13 +0300 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 11 May 2010 17:12:10 +0300 Received: from mgw-sa02.ext.nokia.com ([147.243.1.48]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Tue, 11 May 2010 17:12:10 +0300 Received: from manganga.research.nokia.com (esdhcp04199.research.nokia.com [172.21.41.99]) by mgw-sa02.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o4BEC3sR027143; Tue, 11 May 2010 17:12:08 +0300 From: Eduardo Valentin To: LKML , linux-arm-kernel@lists.infradead.org, Linux-OMAP Cc: Russell King , Andrew Morton , ext Tony Lindgren , ext Kevin Hilman , Peter De-Schrijver , santosh.shilimkar@ti.com, Ambresh , felipe.balbi@nokia.com, Jouni Hogander , Paul Mundt , Eduardo Valentin Subject: [PATCHv5 3/3] OMAP3: export chip IDCODE, Production ID and Die ID Date: Tue, 11 May 2010 17:15:31 +0300 Message-Id: <1273587331-24604-4-git-send-email-eduardo.valentin@nokia.com> X-Mailer: git-send-email 1.7.0.4.361.g8b5fe.dirty In-Reply-To: <1273587331-24604-1-git-send-email-eduardo.valentin@nokia.com> References: <1273587331-24604-1-git-send-email-eduardo.valentin@nokia.com> X-OriginalArrivalTime: 11 May 2010 14:12:10.0499 (UTC) FILETIME=[F2487D30:01CAF113] 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]); Tue, 11 May 2010 14:13:49 +0000 (UTC) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 839b21b..8010cfb 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1809,6 +1809,8 @@ and is between 256 and 4096 characters. It is defined in the file waiting for the ACK, so if this is set too high interrupts *may* be lost! + omap3_die_id [OMAP] Append DIE ID info under /proc/socinfo + omap_mux= [OMAP] Override bootloader pin multiplexing. Format: ... For example, to override I2C bus2: diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 2455dcc..fb8abed 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -169,3 +169,13 @@ config OMAP3_SDRC_AC_TIMING wish to say no. Selecting yes without understanding what is going on could result in system crashes; +config OMAP3_EXPORT_DIE_ID + bool "Export DIE ID code under /proc/socinfo" + depends on ARCH_OMAP3 + default n + help + Say Y here if you need DIE ID code to be exported via /proc/socinfo + in production systems. You will need also to explicitly flag it by + appending the "omap3_die_id" parameter to your boot command line. + + diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index b67486b..b4f5630 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -78,6 +78,10 @@ EXPORT_SYMBOL(omap_type); /*----------------------------------------------------------------------------*/ #define OMAP_TAP_IDCODE 0x0204 +#define OMAP_TAP_PROD_ID_0 0x0208 +#define OMAP_TAP_PROD_ID_1 0x020c +#define OMAP_TAP_PROD_ID_2 0x0210 +#define OMAP_TAP_PROD_ID_3 0x0214 #define OMAP_TAP_DIE_ID_0 0x0218 #define OMAP_TAP_DIE_ID_1 0x021C #define OMAP_TAP_DIE_ID_2 0x0220 @@ -306,6 +310,7 @@ void __init omap4_check_revision(void) void __init omap3_cpuinfo(void) { + int sz; u8 rev = GET_OMAP_REVISION(); char cpu_name[16], cpu_rev[16]; @@ -363,7 +368,7 @@ void __init omap3_cpuinfo(void) } /* Print verbose information */ - snprintf(socinfo, SOCINFO_SZ, "%s ES%s", cpu_name, cpu_rev); + sz = snprintf(socinfo, SOCINFO_SZ, "%s ES%s", cpu_name, cpu_rev); pr_info("%s (", socinfo); OMAP3_SHOW_FEATURE(l2cache); @@ -374,7 +379,35 @@ void __init omap3_cpuinfo(void) OMAP3_SHOW_FEATURE(192mhz_clk); printk(")\n"); + + /* Append OMAP3 IDCODE and Production ID to /proc/socinfo */ + snprintf(socinfo + sz, SOCINFO_SZ - sz, + "\nIDCODE\t: %08x\nPr. ID\t: %08x %08x %08x %08x", + read_tap_reg(OMAP_TAP_IDCODE), + read_tap_reg(OMAP_TAP_PROD_ID_0), + read_tap_reg(OMAP_TAP_PROD_ID_1), + read_tap_reg(OMAP_TAP_PROD_ID_2), + read_tap_reg(OMAP_TAP_PROD_ID_3)); + +} + +#ifdef CONFIG_OMAP3_EXPORT_DIE_ID +static int __init omap3_die_id_setup(char *s) +{ + int sz; + + sz = strlen(socinfo); + snprintf(socinfo + sz, SOCINFO_SZ - sz, + "\nDie ID\t: %08x %08x %08x %08x", + read_tap_reg(OMAP_TAP_DIE_ID_0), + read_tap_reg(OMAP_TAP_DIE_ID_1), + read_tap_reg(OMAP_TAP_DIE_ID_2), + read_tap_reg(OMAP_TAP_DIE_ID_3)); + + return 1; } +__setup("omap3_die_id", omap3_die_id_setup); +#endif static int omap_socinfo_show(struct seq_file *m, void *v) {