diff options
Diffstat (limited to 'drivers/clocksource')
| -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", |
