linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: dsaxena@linaro.org (Deepak Saxena)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/12] ARM: unicore32: Remove depency on LATCH
Date: Thu, 4 Aug 2011 06:47:57 -0700	[thread overview]
Message-ID: <20110804134757.GA1019@plexity.net> (raw)
In-Reply-To: <cover.1312455035.git.dsaxena@linaro.org>

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 <dsaxena@linaro.org>
---
 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 <asm-generic/timex.h>
 
 #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) { };
-- 
1.7.4.1

  parent reply	other threads:[~2011-08-04 13:47 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.1312455035.git.dsaxena@linaro.org>
2011-08-04 13:44 ` [PATCH 01/12] ARM: Remove LATCH reference for time-acorn.c Deepak Saxena
2011-08-05  9:21   ` Russell King - ARM Linux
2011-08-05  9:23   ` Russell King - ARM Linux
2011-08-05 14:59     ` Deepak Saxena
2011-08-04 13:46 ` [PATCH 02/12] ARM: at91: Remove LATCH and CLOCK_TICK_RATE dependency Deepak Saxena
2011-08-04 13:47 ` Deepak Saxena [this message]
2011-08-04 13:56   ` [PATCH 03/12] ARM: unicore32: Remove depency on LATCH Deepak Saxena
2011-08-04 13:49 ` [PATCH 04/12] ARM: clps711x: Remove LATCH and CLOCK_TICK_RATE dependency Deepak Saxena
2011-08-04 13:49 ` [PATCH 05/12] ARM: h720x: " Deepak Saxena
2011-08-04 13:50 ` [PATCH 06/12] ARM: IXP23xx: " Deepak Saxena
2011-08-04 14:03   ` Lennert Buytenhek
2011-08-04 13:50 ` [PATCH 07/12] ARM: IXP4x: " Deepak Saxena
2011-08-04 13:52 ` [PATCH 08/12] ARM: ks8695: " Deepak Saxena
2011-08-04 13:53 ` [PATCH 09/12] ARM: netx: " Deepak Saxena
2011-08-04 13:53 ` [PATCH 10/12] ARM: pnx4000: " Deepak Saxena
2011-08-04 13:53 ` [PATCH 11/12] ARM: sa1100: " Deepak Saxena
2011-08-04 13:54 ` [PATCH 12/12] ARM: Remove mach-*/include/mach/timex.h Deepak Saxena
2011-08-04 15:57   ` Linus Walleij
2011-08-04 17:52   ` H Hartley Sweeten
2011-08-04 18:14     ` H Hartley Sweeten

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110804134757.GA1019@plexity.net \
    --to=dsaxena@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).