From patchwork Thu May 30 10:21:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aida Mynzhasova X-Patchwork-Id: 2635701 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id E863A40077 for ; Thu, 30 May 2013 10:21:56 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UhzzM-0008MG-4J; Thu, 30 May 2013 10:21:44 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UhzzJ-0003c7-9I; Thu, 30 May 2013 10:21:41 +0000 Received: from mail.skitlab.ru ([217.65.220.135]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UhzzB-0003an-Sf for linux-arm-kernel@lists.infradead.org; Thu, 30 May 2013 10:21:35 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.skitlab.ru (Postfix) with ESMTP id C87F21060042; Thu, 30 May 2013 14:21:04 +0400 (MSK) Received: from mail.skitlab.ru ([127.0.0.1]) by localhost (zimbra.skitlab.int [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 4vSA4p2ZtwaH; Thu, 30 May 2013 14:21:04 +0400 (MSK) Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.skitlab.ru (Postfix) with ESMTP id 2ADFA1060051; Thu, 30 May 2013 14:21:04 +0400 (MSK) X-Virus-Scanned: amavisd-new at skitlab.ru Received: from mail.skitlab.ru ([127.0.0.1]) by localhost (zimbra.skitlab.int [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id TG182oAYWwBU; Thu, 30 May 2013 14:21:04 +0400 (MSK) Received: from aida-desktop.skitlab.int (aida-desktop.skitlab.int [192.168.0.114]) by mail.skitlab.ru (Postfix) with ESMTPSA id F253E1060042; Thu, 30 May 2013 14:21:03 +0400 (MSK) From: Aida Mynzhasova To: linux-omap@vger.kernel.org Subject: [PATCH] ARM: OMAP2: TI81XX: id: Add cpu id for TI816x ES2.0 and ES2.1 Date: Thu, 30 May 2013 14:21:01 +0400 Message-Id: <1369909261-23750-1-git-send-email-aida.mynzhasova@skitlab.ru> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130530_062134_178539_61C8E309 X-CRM114-Status: UNSURE ( 9.04 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -3.0 (---) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-3.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.1 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: tony@atomide.com, linux@arm.linux.org.uk, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Currently omap3xxx_check_revision() detects ES1.0 and ES1.1 only, this patch extends it by adding ES2.0 and ES2.1 versions support. Signed-off-by: Aida Mynzhasova --- arch/arm/mach-omap2/id.c | 11 +++++++++-- arch/arm/mach-omap2/soc.h | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 1272c41..8b762a3 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -405,11 +405,18 @@ void __init omap3xxx_check_revision(void) cpu_rev = "1.0"; break; case 1: - /* FALLTHROUGH */ - default: omap_revision = TI8168_REV_ES1_1; cpu_rev = "1.1"; break; + case 2: + omap_revision = TI8168_REV_ES2_0; + cpu_rev = "2.0"; + break; + case 3: + /* FALLTHROUGH */ + default: + omap_revision = TI8168_REV_ES2_1; + cpu_rev = "2.1"; } break; case 0xb944: diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h index 197cc16..8e00226 100644 --- a/arch/arm/mach-omap2/soc.h +++ b/arch/arm/mach-omap2/soc.h @@ -383,6 +383,8 @@ IS_OMAP_TYPE(3430, 0x3430) #define TI816X_CLASS 0x81600034 #define TI8168_REV_ES1_0 TI816X_CLASS #define TI8168_REV_ES1_1 (TI816X_CLASS | (0x1 << 8)) +#define TI8168_REV_ES2_0 (TI816X_CLASS | (0x2 << 8)) +#define TI8168_REV_ES2_1 (TI816X_CLASS | (0x3 << 8)) #define TI814X_CLASS 0x81400034 #define TI8148_REV_ES1_0 TI814X_CLASS