From patchwork Thu Aug 4 13:47:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepak Saxena X-Patchwork-Id: 1035682 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p74DmA3U018428 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 4 Aug 2011 13:48:34 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QoyHK-0004Is-Ep; Thu, 04 Aug 2011 13:48:02 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QoyHJ-00073X-VO; Thu, 04 Aug 2011 13:48:01 +0000 Received: from plexity.net ([206.123.115.38]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QoyHG-00073E-Bz for linux-arm-kernel@lists.infradead.org; Thu, 04 Aug 2011 13:47:59 +0000 Received: by plexity.net (Postfix, from userid 1000) id 95C1C20C2B; Thu, 4 Aug 2011 06:47:57 -0700 (PDT) Date: Thu, 4 Aug 2011 06:47:57 -0700 From: Deepak Saxena To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 03/12] ARM: unicore32: Remove depency on LATCH Message-ID: <20110804134757.GA1019@plexity.net> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110804_094758_532691_90226AB0 X-CRM114-Status: GOOD ( 13.22 ) X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.8 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: Nicolas Pitre X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: dsaxena@plexity.net List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 04 Aug 2011 13:49:31 +0000 (UTC) As part of work to remove the global CLOCK_TICK_RATE symbol, this patch defines a sub-arch local value for use by the at91 code. Once all LATCH and CLOCK_TICK_RATE references are removed, we will remove all the definitions across sub-arches. Signed-off-by: Deepak Saxena --- arch/unicore32/include/asm/timex.h | 2 ++ arch/unicore32/kernel/time.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/unicore32/include/asm/timex.h b/arch/unicore32/include/asm/timex.h index faf16ba..e0fed26 100644 --- a/arch/unicore32/include/asm/timex.h +++ b/arch/unicore32/include/asm/timex.h @@ -29,6 +29,8 @@ #endif +#define TIMER_LATCH ((CLOCK_TICK_RATE + HZ/2) / HZ) + #include #endif diff --git a/arch/unicore32/kernel/time.c b/arch/unicore32/kernel/time.c index 080710c..3ed4ef9 100644 --- a/arch/unicore32/kernel/time.c +++ b/arch/unicore32/kernel/time.c @@ -134,7 +134,7 @@ void puv3_timer_resume(void) /* * OSMR0 is the system timer: make sure OSCR is sufficiently behind */ - writel(readl(OST_OSMR0) - LATCH, OST_OSCR); + writel(readl(OST_OSMR0) - TIMER_LATCH, OST_OSCR); } #else void puv3_timer_suspend(void) { };