From: John Stultz <john.stultz@linaro.org>
To: linux-kernel@vger.kernel.org
Cc: John Stultz <john.stultz@linaro.org>,
Nikolaus Voss <n.voss@weinmann.de>,
Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH 1/6] clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz
Date: Wed, 1 Jun 2011 00:32:45 -0700 [thread overview]
Message-ID: <1306913570-9445-2-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1306913570-9445-1-git-send-email-john.stultz@linaro.org>
Convert tcb_clksrc to use clocksource_register_hz.
Untested. Help from maintainers would be appreciated.
CC: Nikolaus Voss <n.voss@weinmann.de>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
drivers/clocksource/tcb_clksrc.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
index 79c47e8..55d0f95 100644
--- a/drivers/clocksource/tcb_clksrc.c
+++ b/drivers/clocksource/tcb_clksrc.c
@@ -59,7 +59,6 @@ static struct clocksource clksrc = {
.rating = 200,
.read = tc_get_cycles,
.mask = CLOCKSOURCE_MASK(32),
- .shift = 18,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
@@ -256,7 +255,6 @@ static int __init tcb_clksrc_init(void)
best_divisor_idx = i;
}
- clksrc.mult = clocksource_hz2mult(divided_rate, clksrc.shift);
printk(bootinfo, clksrc.name, CONFIG_ATMEL_TCB_CLKSRC_BLOCK,
divided_rate / 1000000,
@@ -292,7 +290,7 @@ static int __init tcb_clksrc_init(void)
__raw_writel(ATMEL_TC_SYNC, tcaddr + ATMEL_TC_BCR);
/* and away we go! */
- clocksource_register(&clksrc);
+ clocksource_register_hz(&clksrc, divided_rate);
/* channel 2: periodic and oneshot timer support */
setup_clkevents(tc, clk32k_divisor_idx);
--
1.7.3.2.146.gca209
next prev parent reply other threads:[~2011-06-01 7:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-01 7:32 [PATCH 0/6] clocksource_register_hz/khz cleanups John Stultz
2011-06-01 7:32 ` John Stultz [this message]
2011-06-01 7:32 ` [PATCH 2/6] clocksource: parisc: convert to clocksource_register_hz/khz John Stultz
2011-06-01 7:32 ` [PATCH 3/6] clocksource: um: " John Stultz
2011-06-01 7:32 ` [PATCH 4/6] clocksource: xtensa: " John Stultz
2011-06-01 7:32 ` [PATCH 5/6] clocksource: cris: convert to clocksource_register_khz John Stultz
2011-06-01 7:32 ` [PATCH 6/6] clocksource: tile: convert to use clocksource_register_hz John Stultz
2011-06-01 16:18 ` Chris Metcalf
2011-06-01 17:55 ` john stultz
2011-06-03 21:27 ` Chris Metcalf
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=1306913570-9445-2-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=n.voss@weinmann.de \
--cc=tglx@linutronix.de \
/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
all inboxes | Powered by JetHome®