diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-07-18 19:21:25 -0400 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2013-07-30 14:24:53 -0400 |
commit | 2902b30e0bd78686e7d891519dbfe2e4e43825fd (patch) | |
tree | 6d4486aba0e67c7b6eff44e33c6e4535be91416e /drivers/clocksource/samsung_pwm_timer.c | |
parent | e25bc5f5ad192cf8782db64acb83962a0b27c4e0 (diff) |
clocksource: samsung_pwm_timer: Switch to sched_clock_register()
The 32 bit sched_clock interface now supports 64 bits. Upgrade to
the 64 bit function to allow us to remove the 32 bit registration
interface.
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/clocksource/samsung_pwm_timer.c')
-rw-r--r-- | drivers/clocksource/samsung_pwm_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c index 584b5472eea3..09e8bc7bc92f 100644 --- a/drivers/clocksource/samsung_pwm_timer.c +++ b/drivers/clocksource/samsung_pwm_timer.c | |||
@@ -310,7 +310,7 @@ static void __iomem *samsung_timer_reg(void) | |||
310 | * this wraps around for now, since it is just a relative time | 310 | * this wraps around for now, since it is just a relative time |
311 | * stamp. (Inspired by U300 implementation.) | 311 | * stamp. (Inspired by U300 implementation.) |
312 | */ | 312 | */ |
313 | static u32 notrace samsung_read_sched_clock(void) | 313 | static u64 notrace samsung_read_sched_clock(void) |
314 | { | 314 | { |
315 | void __iomem *reg = samsung_timer_reg(); | 315 | void __iomem *reg = samsung_timer_reg(); |
316 | 316 | ||
@@ -337,7 +337,7 @@ static void __init samsung_clocksource_init(void) | |||
337 | samsung_time_setup(pwm.source_id, pwm.tcnt_max); | 337 | samsung_time_setup(pwm.source_id, pwm.tcnt_max); |
338 | samsung_time_start(pwm.source_id, true); | 338 | samsung_time_start(pwm.source_id, true); |
339 | 339 | ||
340 | setup_sched_clock(samsung_read_sched_clock, | 340 | sched_clock_register(samsung_read_sched_clock, |
341 | pwm.variant.bits, clock_rate); | 341 | pwm.variant.bits, clock_rate); |
342 | 342 | ||
343 | ret = clocksource_mmio_init(reg, "samsung_clocksource_timer", | 343 | ret = clocksource_mmio_init(reg, "samsung_clocksource_timer", |