From patchwork Thu Jul 3 09:51:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiubo Li X-Patchwork-Id: 366820 X-Patchwork-Delegate: yorksun@freescale.com 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 911B714012F for ; Thu, 3 Jul 2014 20:17:45 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2D9E24A03B; Thu, 3 Jul 2014 12:17:40 +0200 (CEST) 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 3+GKVmL6Ex1f; Thu, 3 Jul 2014 12:17:39 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 85BFD4A049; Thu, 3 Jul 2014 12:17:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E6F544A032 for ; Thu, 3 Jul 2014 12:10:59 +0200 (CEST) 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 V+1fKL96gEVa for ; Thu, 3 Jul 2014 12:10:56 +0200 (CEST) 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 na01-by2-obe.outbound.protection.outlook.com (mail-by2lp0239.outbound.protection.outlook.com [207.46.163.239]) by theia.denx.de (Postfix) with ESMTPS id 2794E4A03B for ; Thu, 3 Jul 2014 12:10:51 +0200 (CEST) Received: from BY2PR03CA058.namprd03.prod.outlook.com (10.141.249.31) by BL2PR03MB372.namprd03.prod.outlook.com (10.141.89.15) with Microsoft SMTP Server (TLS) id 15.0.974.11; Thu, 3 Jul 2014 09:55:02 +0000 Received: from BL2FFO11FD035.protection.gbl (2a01:111:f400:7c09::163) by BY2PR03CA058.outlook.office365.com (2a01:111:e400:2c5d::31) with Microsoft SMTP Server (TLS) id 15.0.974.11 via Frontend Transport; Thu, 3 Jul 2014 09:55:01 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD035.mail.protection.outlook.com (10.173.161.131) with Microsoft SMTP Server (TLS) id 15.0.969.12 via Frontend Transport; Thu, 3 Jul 2014 09:55:00 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s639sqcd012056; Thu, 3 Jul 2014 02:54:56 -0700 From: Xiubo Li To: , Date: Thu, 3 Jul 2014 17:51:09 +0800 Message-ID: <1404381072-42875-2-git-send-email-Li.Xiubo@freescale.com> X-Mailer: git-send-email 1.8.5 In-Reply-To: <1404381072-42875-1-git-send-email-Li.Xiubo@freescale.com> References: <1404381072-42875-1-git-send-email-Li.Xiubo@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(6009001)(189002)(199002)(104166001)(229853001)(77156001)(20776003)(99396002)(64706001)(50986999)(47776003)(89996001)(4396001)(88136002)(85306003)(36756003)(68736004)(92566001)(76176999)(26826002)(50226001)(62966002)(92726001)(31966008)(93916002)(74662001)(86362001)(21056001)(102836001)(79102001)(105606002)(76482001)(81542001)(80022001)(19580395003)(84676001)(69596002)(50466002)(44976005)(81156004)(87936001)(6806004)(48376002)(107046002)(74502001)(104016002)(95666004)(83322001)(83072002)(85852003)(97736001)(46102001)(106466001)(81342001)(87286001)(77982001)(19580405001); DIR:OUT; SFP:; SCL:1; SRVR:BL2PR03MB372; H:az84smr01.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-Forefront-PRVS: 0261CCEEDF Received-SPF: Fail (: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=Li.Xiubo@freescale.com; X-OriginatorOrg: freescale.com X-Mailman-Approved-At: Thu, 03 Jul 2014 12:17:23 +0200 Cc: R64188@freescale.com, b44548@freescale.com, marc.zyngier@arm.com, Xiubo@theia.denx.de, b46683@freescale.com, b35083@freescale.com, Li , b47053@freescale.com Subject: [U-Boot] [PATCH 1/4] ARM: fix the ARCH Timer frequency setting. 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: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de For some SoCs, the CONFIG_SYS_CLK_FREQ maybe won't equal the ARCH Timer's frequency. Here using the CONFIG_TIMER_CLK_FREQ instead if the ARCH Timer's frequency need to config here. Signed-off-by: Xiubo Li --- arch/arm/cpu/armv7/nonsec_virt.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S index 6f90988..e9766c0 100644 --- a/arch/arm/cpu/armv7/nonsec_virt.S +++ b/arch/arm/cpu/armv7/nonsec_virt.S @@ -147,11 +147,11 @@ ENTRY(_nonsec_init) * we do this here instead. * But first check if we have the generic timer. */ -#ifdef CONFIG_SYS_CLK_FREQ +#ifdef CONFIG_TIMER_CLK_FREQ mrc p15, 0, r0, c0, c1, 1 @ read ID_PFR1 and r0, r0, #CPUID_ARM_GENTIMER_MASK @ mask arch timer bits cmp r0, #(1 << CPUID_ARM_GENTIMER_SHIFT) - ldreq r1, =CONFIG_SYS_CLK_FREQ + ldreq r1, =CONFIG_TIMER_CLK_FREQ mcreq p15, 0, r1, c14, c0, 0 @ write CNTFRQ #endif