From patchwork Sat Dec 7 11:11:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 298660 X-Patchwork-Delegate: albert.aribaud@free.fr Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id A1DEF2C00C1 for ; Sat, 7 Dec 2013 22:25:57 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AC3634BDE9; Sat, 7 Dec 2013 12:25:52 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1lBpmtyHq9eN; Sat, 7 Dec 2013 12:25:52 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 09F884BDE5; Sat, 7 Dec 2013 12:25:40 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D37C64BDAF for ; Sat, 7 Dec 2013 12:25:34 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jyn1jAUKUGFZ for ; Sat, 7 Dec 2013 12:25:34 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from inca-roads.misterjones.org (inca-roads.misterjones.org [213.251.177.50]) by theia.denx.de (Postfix) with ESMTPS id 065CE4BDCB for ; Sat, 7 Dec 2013 12:25:21 +0100 (CET) Received: from [176.254.219.58] (helo=why.wild-wind.fr.eu.org) by cheepnis.misterjones.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1VpFnm-00055E-M7; Sat, 07 Dec 2013 12:12:02 +0100 From: Marc Zyngier To: u-boot@lists.denx.de Date: Sat, 7 Dec 2013 11:11:42 +0000 Message-Id: <1386414702-8498-1-git-send-email-marc.zyngier@arm.com> X-Mailer: git-send-email 1.8.4.3 X-SA-Exim-Connect-IP: 176.254.219.58 X-SA-Exim-Rcpt-To: u-boot@lists.denx.de, rob.herring@calxeda.com, maz@misterjones.org X-SA-Exim-Mail-From: marc.zyngier@arm.com X-SA-Exim-Scanned: No (on cheepnis.misterjones.org); SAEximRunCond expanded to false Cc: maz@misterjones.org, Rob Herring Subject: [U-Boot] [PATCH] vexpress: fix timer address on non-A9 platforms X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Commit b3a7f22b3e09 (ARM: vexpress: convert to common timer code) converted the VE timer code to the generic framework, but hardcoded the timer address of the A9 testchip. Change it for the appropriate macro that works on both core tiles. Signed-off-by: Marc Zyngier --- include/configs/vexpress_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 6da5e8f..7e78f8a 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -132,7 +132,7 @@ #define VEXPRESS_FLASHPROG_FLVPPEN (1 << 0) #define CONFIG_SYS_TIMER_RATE 1000000 -#define CONFIG_SYS_TIMER_COUNTER (0x10011000 + 0x4) +#define CONFIG_SYS_TIMER_COUNTER (V2M_TIMER01 + 0x4) #define CONFIG_SYS_TIMER_COUNTS_DOWN /* SMSC9115 Ethernet from SMSC9118 family */