From patchwork Mon Jan 23 10:51:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 137344 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id CD37B1007D4 for ; Mon, 23 Jan 2012 21:51:35 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RpHUf-0000Cz-Ji; Mon, 23 Jan 2012 10:51:21 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RpHUd-0000CP-VJ for kernel-team@lists.ubuntu.com; Mon, 23 Jan 2012 10:51:20 +0000 Received: from 2-230-238-136.ip204.fastwebnet.it ([2.230.238.136] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RpHUd-0000t0-Rf for kernel-team@lists.ubuntu.com; Mon, 23 Jan 2012 10:51:19 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH] omap4: add 4430 ES2.3 support Date: Mon, 23 Jan 2012 11:51:17 +0100 Message-Id: <1327315877-6483-2-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1327315877-6483-1-git-send-email-paolo.pisati@canonical.com> References: <1327315877-6483-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Anand Gadiyar And default to 4430 ES2.3 for unidentified silicon. Change-Id: I06b0aa9c5f33af25345996cf9d0c994491093096 Signed-off-by: Anand Gadiyar Signed-off-by: Paolo Pisati --- arch/arm/mach-omap2/id.c | 10 +++++++--- arch/arm/plat-omap/include/plat/cpu.h | 11 +++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index fb63c92..847786a 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -402,9 +402,13 @@ static void __init omap4_check_revision(void) omap_chip.oc |= CHIP_IS_OMAP4430ES2_1; break; case 4: - default: omap_revision = OMAP4430_REV_ES2_2; omap_chip.oc |= CHIP_IS_OMAP4430ES2_2; + break; + case 6: + default: + omap_revision = OMAP4430_REV_ES2_3; + omap_chip.oc |= CHIP_IS_OMAP4430ES2_3; } break; case 0xb94e: @@ -422,8 +426,8 @@ static void __init omap4_check_revision(void) break; default: /* Unknown default to latest silicon rev as default */ - omap_revision = OMAP4430_REV_ES2_2; - omap_chip.oc |= CHIP_IS_OMAP4430ES2_2; + omap_revision = OMAP4430_REV_ES2_3; + omap_chip.oc |= CHIP_IS_OMAP4430ES2_3; } pr_info("OMAP%04x ES%d.%d\n", omap_rev() >> 16, diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index d8a1602..263d4fa 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -414,6 +414,7 @@ IS_OMAP_TYPE(3517, 0x3517) #define OMAP4430_REV_ES2_0 (OMAP443X_CLASS | (0x20 << 8)) #define OMAP4430_REV_ES2_1 (OMAP443X_CLASS | (0x21 << 8)) #define OMAP4430_REV_ES2_2 (OMAP443X_CLASS | (0x22 << 8)) +#define OMAP4430_REV_ES2_3 (OMAP443X_CLASS | (0x23 << 8)) #define OMAP446X_CLASS 0x44600044 #define OMAP4460_REV_ES1_0 (OMAP446X_CLASS | (0x10 << 8)) @@ -447,16 +448,18 @@ IS_OMAP_TYPE(3517, 0x3517) #define CHIP_IS_OMAP4430ES2 (1 << 11) #define CHIP_IS_OMAP4430ES2_1 (1 << 12) #define CHIP_IS_OMAP4430ES2_2 (1 << 13) -#define CHIP_IS_TI816X (1 << 14) -#define CHIP_IS_OMAP4460ES1_0 (1 << 15) -#define CHIP_IS_OMAP4460ES1_1 (1 << 16) +#define CHIP_IS_OMAP4430ES2_3 (1 << 14) +#define CHIP_IS_TI816X (1 << 15) +#define CHIP_IS_OMAP4460ES1_0 (1 << 16) +#define CHIP_IS_OMAP4460ES1_1 (1 << 17) #define CHIP_IS_OMAP24XX (CHIP_IS_OMAP2420 | CHIP_IS_OMAP2430) #define CHIP_IS_OMAP443X (CHIP_IS_OMAP4430ES1 | \ CHIP_IS_OMAP4430ES2 | \ CHIP_IS_OMAP4430ES2_1 | \ - CHIP_IS_OMAP4430ES2_2) + CHIP_IS_OMAP4430ES2_2 | \ + CHIP_IS_OMAP4430ES2_3) #define CHIP_IS_OMAP446X (CHIP_IS_OMAP4460ES1_0 | \ CHIP_IS_OMAP4460ES1_1)