diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-05-20 19:45:37 -0400 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-11-21 22:01:42 -0500 |
| commit | f5a54dd7952e9032785cd1ef0dde72cd61025341 (patch) | |
| tree | 979f7046b55633fa53e8e02f26b33ee2af740a44 /drivers | |
| parent | 027f6ad7bfa97cf8f75e9d81c15256d828eb0809 (diff) | |
clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz
Convert tcb_clksrc to use clocksource_register_hz.
CC: Nikolaus Voss <n.voss@weinmann.de>
CC: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Nikolaus Voss <n.voss@weinmann.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | 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 79c47e88d5d1..55d0f95f82f9 100644 --- a/drivers/clocksource/tcb_clksrc.c +++ b/drivers/clocksource/tcb_clksrc.c | |||
| @@ -59,7 +59,6 @@ static struct clocksource clksrc = { | |||
| 59 | .rating = 200, | 59 | .rating = 200, |
| 60 | .read = tc_get_cycles, | 60 | .read = tc_get_cycles, |
| 61 | .mask = CLOCKSOURCE_MASK(32), | 61 | .mask = CLOCKSOURCE_MASK(32), |
| 62 | .shift = 18, | ||
| 63 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, | 62 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
| 64 | }; | 63 | }; |
| 65 | 64 | ||
| @@ -256,7 +255,6 @@ static int __init tcb_clksrc_init(void) | |||
| 256 | best_divisor_idx = i; | 255 | best_divisor_idx = i; |
| 257 | } | 256 | } |
| 258 | 257 | ||
| 259 | clksrc.mult = clocksource_hz2mult(divided_rate, clksrc.shift); | ||
| 260 | 258 | ||
| 261 | printk(bootinfo, clksrc.name, CONFIG_ATMEL_TCB_CLKSRC_BLOCK, | 259 | printk(bootinfo, clksrc.name, CONFIG_ATMEL_TCB_CLKSRC_BLOCK, |
| 262 | divided_rate / 1000000, | 260 | divided_rate / 1000000, |
| @@ -292,7 +290,7 @@ static int __init tcb_clksrc_init(void) | |||
| 292 | __raw_writel(ATMEL_TC_SYNC, tcaddr + ATMEL_TC_BCR); | 290 | __raw_writel(ATMEL_TC_SYNC, tcaddr + ATMEL_TC_BCR); |
| 293 | 291 | ||
| 294 | /* and away we go! */ | 292 | /* and away we go! */ |
| 295 | clocksource_register(&clksrc); | 293 | clocksource_register_hz(&clksrc, divided_rate); |
| 296 | 294 | ||
| 297 | /* channel 2: periodic and oneshot timer support */ | 295 | /* channel 2: periodic and oneshot timer support */ |
| 298 | setup_clkevents(tc, clk32k_divisor_idx); | 296 | setup_clkevents(tc, clk32k_divisor_idx); |
