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: 21782 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5D03C202DA for ; Tue, 26 Nov 2013 14:21:17 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id ld13sf12577748vcb.1 for ; Tue, 26 Nov 2013 06:21:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=u8KxmALn3e3/l8LkVXlpqUTzrDwUC92HKz5Z9ld+n0w=; b=XLi6NxJCARmS+nQTH7CMr+jSuQkyU6ooWFgM+/DtyjPRfAAvWizWNE6w+1lIdbhQXQ r1epHI/f4G02q+uKrNYMTRzQV8LbIV69hGJRCQyb4UOYwkbnmxxIRxL2eeXTcnsewRtg AcMS3Y69afTCg/jVlUXPOEj0it1RPOK7JfX5MwKTFYSYJtsKQPsa8+Aqd+5g/1QClpGt AfvHzv8elyMow/2Otk7CvAHzRZ+PhZf0xq3I9bs+71ONoPRAaJLp0wJm7CMDb1N3rr1o yMSKGIk8KTi81eIWjWCA21z/4+wo/W2k2UQSj1PNZe/zW+JizyWNEDj0AknTPCSuqRER MWPQ== X-Gm-Message-State: ALoCoQmqVLFrgKTW72RworUYg/dxurTR96bVhVa+/ucx2R4PucxjmU4bASSzB+Kq4AHJNuCkJp31 X-Received: by 10.236.89.113 with SMTP id b77mr10009536yhf.43.1385475676452; Tue, 26 Nov 2013 06:21:16 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.53.68 with SMTP id z4ls2773921qeo.2.gmail; Tue, 26 Nov 2013 06:21:16 -0800 (PST) X-Received: by 10.220.97.145 with SMTP id l17mr196494vcn.35.1385475676241; Tue, 26 Nov 2013 06:21:16 -0800 (PST) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by mx.google.com with ESMTPS id td8si19553156vdc.27.2013.11.26.06.21.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Nov 2013 06:21:16 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.49 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.49; Received: by mail-vb0-f49.google.com with SMTP id p5so3807644vbn.8 for ; Tue, 26 Nov 2013 06:21:16 -0800 (PST) X-Received: by 10.220.123.6 with SMTP id n6mr4516389vcr.28.1385475676134; Tue, 26 Nov 2013 06:21:16 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp216039vcz; Tue, 26 Nov 2013 06:21:15 -0800 (PST) X-Received: by 10.50.134.99 with SMTP id pj3mr17368922igb.14.1385475675229; Tue, 26 Nov 2013 06:21:15 -0800 (PST) Received: from mail-ie0-f169.google.com (mail-ie0-f169.google.com [209.85.223.169]) by mx.google.com with ESMTPS id cw3si16495187icc.43.2013.11.26.06.21.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Nov 2013 06:21:15 -0800 (PST) Received-SPF: neutral (google.com: 209.85.223.169 is neither permitted nor denied by best guess record for domain of andre.przywara@linaro.org) client-ip=209.85.223.169; Received: by mail-ie0-f169.google.com with SMTP id e14so9559962iej.28 for ; Tue, 26 Nov 2013 06:21:14 -0800 (PST) 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 Cc: u-boot@lists.denx.de, patches@linaro.org, Andre Przywara Subject: [PATCH] ARM/VExpress: fix timer address for TC2 and other VExpress models 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 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: andre.przywara@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.49 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 */