From patchwork Wed Sep 21 20:17:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Salveti X-Patchwork-Id: 4230 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4AD2223EFD for ; Wed, 21 Sep 2011 20:18:13 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 393A0A18656 for ; Wed, 21 Sep 2011 20:18:13 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id 23so2878814fxe.11 for ; Wed, 21 Sep 2011 13:18:13 -0700 (PDT) Received: by 10.223.74.89 with SMTP id t25mr1634048faj.65.1316636292537; Wed, 21 Sep 2011 13:18:12 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.18.198 with SMTP id y6cs142606lad; Wed, 21 Sep 2011 13:18:12 -0700 (PDT) Received: by 10.150.170.10 with SMTP id s10mr1465103ybe.171.1316636291479; Wed, 21 Sep 2011 13:18:11 -0700 (PDT) Received: from mail-gx0-f178.google.com (mail-gx0-f178.google.com [209.85.161.178]) by mx.google.com with ESMTPS id b14si7139235ybc.42.2011.09.21.13.18.10 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Sep 2011 13:18:11 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.161.178 is neither permitted nor denied by best guess record for domain of ricardo.salveti@linaro.org) client-ip=209.85.161.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.161.178 is neither permitted nor denied by best guess record for domain of ricardo.salveti@linaro.org) smtp.mail=ricardo.salveti@linaro.org Received: by gxk21 with SMTP id 21so2821170gxk.37 for ; Wed, 21 Sep 2011 13:18:10 -0700 (PDT) Received: by 10.101.125.9 with SMTP id c9mr1190816ann.109.1316636290643; Wed, 21 Sep 2011 13:18:10 -0700 (PDT) Received: from localhost.localdomain ([189.61.233.110]) by mx.google.com with ESMTPS id h20sm24134769ann.7.2011.09.21.13.18.05 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Sep 2011 13:18:09 -0700 (PDT) From: Ricardo Salveti de Araujo To: u-boot@lists.denx.de Cc: patches@linaro.org, aneesh@ti.com, john.rigby@linaro.org, s-jan@ti.com, s-paulraj@ti.com, Ricardo Salveti de Araujo Subject: [PATCH 1/3] omap4: replacing OMAP4_CONTROL with OMAP4430_CONTROL Date: Wed, 21 Sep 2011 17:17:29 -0300 Message-Id: <1316636251-23961-2-git-send-email-ricardo.salveti@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1316636251-23961-1-git-send-email-ricardo.salveti@linaro.org> References: <1316636251-23961-1-git-send-email-ricardo.salveti@linaro.org> OMAP4460 has a different set of values for the ID code, so moving the old ones to be related just with 4430. Signed-off-by: Ricardo Salveti de Araujo 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap4/board.c index 309b244..140562b 100644 --- a/arch/arm/cpu/armv7/omap4/board.c +++ b/arch/arm/cpu/armv7/omap4/board.c @@ -200,13 +200,13 @@ static void init_omap4_revision(void) break; case MIDR_CORTEX_A9_R1P2: switch (readl(CONTROL_ID_CODE)) { - case OMAP4_CONTROL_ID_CODE_ES2_0: + case OMAP4430_CONTROL_ID_CODE_ES2_0: *omap4_revision = OMAP4430_ES2_0; break; - case OMAP4_CONTROL_ID_CODE_ES2_1: + case OMAP4430_CONTROL_ID_CODE_ES2_1: *omap4_revision = OMAP4430_ES2_1; break; - case OMAP4_CONTROL_ID_CODE_ES2_2: + case OMAP4430_CONTROL_ID_CODE_ES2_2: *omap4_revision = OMAP4430_ES2_2; break; default: diff --git a/arch/arm/include/asm/arch-omap4/omap4.h b/arch/arm/include/asm/arch-omap4/omap4.h index a6e1e42..5d2d01d 100644 --- a/arch/arm/include/asm/arch-omap4/omap4.h +++ b/arch/arm/include/asm/arch-omap4/omap4.h @@ -57,11 +57,11 @@ /* CONTROL_ID_CODE */ #define CONTROL_ID_CODE 0x4A002204 -#define OMAP4_CONTROL_ID_CODE_ES1_0 0x0B85202F -#define OMAP4_CONTROL_ID_CODE_ES2_0 0x1B85202F -#define OMAP4_CONTROL_ID_CODE_ES2_1 0x3B95C02F -#define OMAP4_CONTROL_ID_CODE_ES2_2 0x4B95C02F -#define OMAP4_CONTROL_ID_CODE_ES2_3 0x6B95C02F +#define OMAP4430_CONTROL_ID_CODE_ES1_0 0x0B85202F +#define OMAP4430_CONTROL_ID_CODE_ES2_0 0x1B85202F +#define OMAP4430_CONTROL_ID_CODE_ES2_1 0x3B95C02F +#define OMAP4430_CONTROL_ID_CODE_ES2_2 0x4B95C02F +#define OMAP4430_CONTROL_ID_CODE_ES2_3 0x6B95C02F /* UART */ #define UART1_BASE (OMAP44XX_L4_PER_BASE + 0x6a000)