From patchwork Tue Nov 26 14:20:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 294336 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 4DD0F2C0086 for ; Wed, 27 Nov 2013 01:28:55 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B23E34AC04; Tue, 26 Nov 2013 15:28: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 K+mA1DxQEtwK; Tue, 26 Nov 2013 15:28:52 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 098364AC05; Tue, 26 Nov 2013 15:28:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 428E34AC09 for ; Tue, 26 Nov 2013 15:28:43 +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 JYxIOrAYiA4L for ; Tue, 26 Nov 2013 15:28:37 +0100 (CET) X-Greylist: delayed 433 seconds by postgrey-1.27 at theia; Tue, 26 Nov 2013 15:28:30 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 mail-ie0-f170.google.com (mail-ie0-f170.google.com [209.85.223.170]) by theia.denx.de (Postfix) with ESMTPS id 0A1AC4AC03 for ; Tue, 26 Nov 2013 15:28:30 +0100 (CET) Received: by mail-ie0-f170.google.com with SMTP id qd12so9398381ieb.1 for ; Tue, 26 Nov 2013 06:28:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=u8KxmALn3e3/l8LkVXlpqUTzrDwUC92HKz5Z9ld+n0w=; b=b+qmnoT3S5jSQWcanguj3DXEnKre08p/6s++TeN1rB+lXQgXghXbeZK0Xdg0mgZlgl hrI6BZuRiHMBkfLrMb0esxyMM1RxbJhBtX8JwJrDzTksMMyYpejE5UvRSB8GzvP+V+YD ndlFuKREAvQipgpXvLfCOTq4ZkeVuXOrjBQa7eXsaJeHBZHrZcuy6o7+XInxh8Y+tisn giWiO079kn6EDpgseTl0kRrSwNeTO9Ywjf7LbYl9km+1i+66QISJVHyez1IvREO5pLnj BZYm84qNqjBX1AudjsO1uaeTKj7wXAWarst1ZNFyn1vyjdeS/yxu4UUZlRx3gdC5NDYm B+/Q== X-Gm-Message-State: ALoCoQnpowW1gQ45t7kUG0j4foRUvgoy3hkm/sqEj9mlYVgGCl7VjFn+/N0XJbRDFv/hxwAn9pHq X-Received: by 10.42.44.9 with SMTP id z9mr1340072ice.88.1385475674228; Tue, 26 Nov 2013 06:21:14 -0800 (PST) Received: from slackpad.drs.calxeda.com (g224198035.adsl.alicedsl.de. [92.224.198.35]) by mx.google.com with ESMTPSA id hv5sm32472817igb.9.2013.11.26.06.21.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Nov 2013 06:21:13 -0800 (PST) From: Andre Przywara To: albert.u.boot@aribaud.net, trini@ti.com, rob.herring@calxeda.com Date: Tue, 26 Nov 2013 15:20:51 +0100 Message-Id: <1385475651-17038-1-git-send-email-andre.przywara@linaro.org> X-Mailer: git-send-email 1.7.12.1 Cc: u-boot@lists.denx.de, patches@linaro.org Subject: [U-Boot] [PATCH] ARM/VExpress: fix timer address for TC2 and other VExpress models 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 v2013.10-189-gb3a7f22 breaks u-boot on the VExpress TC2, since the hardcoded value for SP804 timer address is wrong on Versatile Express boards using the extended memory map. Replace this value with an existing macro make it work on both sets of machines. Signed-off-by: Andre Przywara Acked-by: Ian Campbell --- 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 */