All of lore.kernel.org
 help / color / mirror / Atom feed
From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 22/24] ARM: orion: update clock source registration
Date: Mon, 13 Dec 2010 19:22:27 +0000	[thread overview]
Message-ID: <E1PSDyd-0008Di-EB@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20101213191437.GN8665@n2100.arm.linux.org.uk>

In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new
interfaces were added which simplify (and optimize) the selection of the
divisor shift/mult constants.  Switch over to using this new interface.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/plat-orion/time.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c
index 715a301..11e2583 100644
--- a/arch/arm/plat-orion/time.c
+++ b/arch/arm/plat-orion/time.c
@@ -102,7 +102,6 @@ static cycle_t orion_clksrc_read(struct clocksource *cs)
 
 static struct clocksource orion_clksrc = {
 	.name		= "orion_clocksource",
-	.shift		= 20,
 	.rating		= 300,
 	.read		= orion_clksrc_read,
 	.mask		= CLOCKSOURCE_MASK(32),
@@ -245,8 +244,7 @@ void __init orion_time_init(unsigned int irq, unsigned int tclk)
 	writel(u & ~BRIDGE_INT_TIMER0, BRIDGE_MASK);
 	u = readl(TIMER_CTRL);
 	writel(u | TIMER0_EN | TIMER0_RELOAD_EN, TIMER_CTRL);
-	orion_clksrc.mult = clocksource_hz2mult(tclk, orion_clksrc.shift);
-	clocksource_register(&orion_clksrc);
+	clocksource_register_hz(&orion_clksrc, tclk);
 
 	/*
 	 * Setup clockevent timer (interrupt-driven.)
-- 
1.6.2.5

  parent reply	other threads:[~2010-12-13 19:22 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-13 19:14 [PATCH 0/24] Update clocksource registration Russell King - ARM Linux
2010-12-13 19:14 ` Russell King - ARM Linux
2010-12-13 19:14 ` Russell King - ARM Linux
2010-12-13 19:15 ` [PATCH 01/24] ARM: AT91: update clock source registration Russell King - ARM Linux
2010-12-13 19:15 ` [PATCH 02/24] ARM: bcmring: " Russell King - ARM Linux
2010-12-13 19:36   ` Scott Branden
2010-12-13 20:28     ` {PATCH] BCMRING maintainer change (was RE: [PATCH 02/24] ARM: bcmring: update clock source registration) JD (Jiandong) Zheng
2010-12-13 20:32       ` Scott Branden
2010-12-14 22:01       ` Russell King - ARM Linux
2010-12-13 19:15 ` [PATCH 03/24] ARM: davinci: update clock source registration Russell King - ARM Linux
2010-12-13 19:16 ` [PATCH 04/24] ARM: integrator: " Russell King - ARM Linux
2010-12-13 19:16 ` [PATCH 05/24] ARM: ixp4xx: " Russell King - ARM Linux
2010-12-13 19:17 ` [PATCH 06/24] ARM: lpc32xx: " Russell King - ARM Linux
2010-12-13 19:17 ` [PATCH 07/24] ARM: mmp: " Russell King - ARM Linux
2010-12-13 19:17 ` [PATCH 08/24] ARM: MSM: " Russell King - ARM Linux
2010-12-13 19:17   ` Russell King - ARM Linux
2010-12-14 20:32   ` Jeff Ohlstein
2010-12-14 20:32     ` Jeff Ohlstein
2010-12-13 19:18 ` [PATCH 09/24] ARM: netx: " Russell King - ARM Linux
2010-12-13 19:18 ` [PATCH 10/24] ARM: ns9xxx: " Russell King - ARM Linux
2010-12-13 19:18 ` [PATCH 11/24] ARM: omap: " Russell King - ARM Linux
2010-12-13 19:18   ` Russell King - ARM Linux
2010-12-13 19:19 ` [PATCH 12/24] ARM: PXA: " Russell King - ARM Linux
2010-12-14  3:09   ` Eric Miao
2010-12-16 10:38     ` Russell King - ARM Linux
2010-12-20 15:10       ` Eric Miao
2010-12-13 19:19 ` [PATCH 13/24] ARM: s5pv310: " Russell King - ARM Linux
2010-12-13 19:19   ` Russell King - ARM Linux
2010-12-17  4:49   ` Kukjin Kim
2010-12-17  4:49     ` Kukjin Kim
2010-12-13 19:19 ` [PATCH 14/24] ARM: SA11x0: " Russell King - ARM Linux
2010-12-13 19:20 ` [PATCH 15/24] ARM: tcc8k: " Russell King - ARM Linux
2010-12-13 19:20 ` [PATCH 16/24] ARM: U300: " Russell King - ARM Linux
2010-12-14  4:02   ` Linus WALLEIJ
2010-12-13 19:20 ` [PATCH 17/24] ARM: nuc: " Russell King - ARM Linux
2010-12-13 19:21 ` [PATCH 18/24] ARM: iop: " Russell King - ARM Linux
2010-12-13 19:21 ` [PATCH 19/24] ARM: mxc: " Russell King - ARM Linux
2010-12-14 10:46   ` Sascha Hauer
2010-12-13 19:21 ` [PATCH 20/24] ARM: nomadik: " Russell King - ARM Linux
2010-12-14  4:04   ` Linus WALLEIJ
2010-12-13 19:22 ` [PATCH 21/24] ARM: spear: " Russell King - ARM Linux
2010-12-14  4:04   ` viresh kumar
2010-12-13 19:22 ` Russell King - ARM Linux [this message]
2010-12-13 19:26   ` [PATCH 22/24] ARM: orion: " Nicolas Pitre
2010-12-13 19:22 ` [PATCH 23/24] ARM: stmp: " Russell King - ARM Linux
2010-12-13 19:23 ` [PATCH 24/24] ARM: realview/versatile: " Russell King - ARM Linux

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=E1PSDyd-0008Di-EB@rmk-PC.arm.linux.org.uk \
    --to=linux@arm.linux.org.uk \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.