From patchwork Thu Oct 8 17:31:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 52543 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n98HbXCK008953 for ; Thu, 8 Oct 2009 17:37:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757984AbZJHRcl (ORCPT ); Thu, 8 Oct 2009 13:32:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758844AbZJHRck (ORCPT ); Thu, 8 Oct 2009 13:32:40 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:35378 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757915AbZJHRcj (ORCPT ); Thu, 8 Oct 2009 13:32:39 -0400 Received: from dlep34.itg.ti.com ([157.170.170.115]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id n98HVxxY009671 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 8 Oct 2009 12:31:59 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id n98HVrM6007154; Thu, 8 Oct 2009 12:31:53 -0500 (CDT) Received: from senorita (senorita.am.dhcp.ti.com [128.247.75.1]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id n98HVrZ06464; Thu, 8 Oct 2009 12:31:53 -0500 (CDT) Received: by senorita (Postfix, from userid 1000) id 193ADC16A; Thu, 8 Oct 2009 12:31:53 -0500 (CDT) From: Nishanth Menon To: linux-omap Cc: Nishanth Menon , Madhusudhan Chikkature Rajashekar , Vikram Pandita , Allen Pais , Anand Gadiyar , Benoit Cousson , Felipe Balbi , Kevin Hilman , Sanjeev Premi , Santosh Shilimkar , Sergio Alberto Aguirre Rodriguez , Tony Lindgren Subject: [PATCH v2] OMAP3: introduce OMAP3630 Date: Thu, 8 Oct 2009 12:31:52 -0500 Message-Id: <1255023112-14125-1-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <[RFC][PATCH] OMAP3: introduce OMAP3630> References: <[RFC][PATCH] OMAP3: introduce OMAP3630> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 03b80f2..3fc5e4e 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -186,6 +186,7 @@ void __init omap3_check_revision(void) { u32 cpuid, idcode; u16 hawkeye; + u16 omap_type; u8 rev; char *rev_name = "ES1.0"; @@ -210,7 +211,10 @@ void __init omap3_check_revision(void) hawkeye = (idcode >> 12) & 0xffff; rev = (idcode >> 28) & 0xff; - if (hawkeye == 0xb7ae) { + omap_type = omap_rev() >> 16; + switch (hawkeye) { + case 0xb7ae: + /* Handle 34xx devices */ switch (rev) { case 0: omap_revision = OMAP3430_REV_ES2_0; @@ -231,12 +235,33 @@ void __init omap3_check_revision(void) default: /* Use the latest known revision as default */ omap_revision = OMAP3430_REV_ES3_1; - rev_name = "Unknown revision\n"; + rev_name = "Unknown 34xx revision\n"; } + break; + case 0xb891: + /* Handle 36xx devices + * But, override for display purposes + */ + omap_type = 0x3630; + switch (rev) { + case 0: + omap_revision = OMAP3630_REV_ES1_0; + rev_name = "ES1.0"; + break; + default: + /* Use the latest known revision as default */ + omap_revision = OMAP3630_REV_ES1_0; + rev_name = "Unknown 36xx revision\n"; + } + break; + default: + /* Unknown default to latest rev as default*/ + omap_revision = OMAP3630_REV_ES1_0; + rev_name = "Unknown revision\n"; } out: - pr_info("OMAP%04x %s\n", omap_rev() >> 16, rev_name); + pr_info("OMAP%04x %s\n", omap_type, rev_name); } #define OMAP3_SHOW_FEATURE(feat) \ diff --git a/arch/arm/plat-omap/include/mach/cpu.h b/arch/arm/plat-omap/include/mach/cpu.h index 431fec4..af1080f 100644 --- a/arch/arm/plat-omap/include/mach/cpu.h +++ b/arch/arm/plat-omap/include/mach/cpu.h @@ -383,6 +383,12 @@ IS_OMAP_TYPE(3430, 0x3430) #define OMAP3430_REV_ES2_1 0x34302034 #define OMAP3430_REV_ES3_0 0x34303034 #define OMAP3430_REV_ES3_1 0x34304034 +/* NOTE: Add 36xx series below + * If additional 34xx series are added, OMAP3430_REV_ESXXXX can be + * added above the 3630 defines and series renumbered to ensure + * rev() > checks to work + */ +#define OMAP3630_REV_ES1_0 0x34305034 #define OMAP443X_CLASS 0x44300034