Merge tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux

[mirror_ubuntu-zesty-kernel.git] / arch / arm / mach-mmp / time.c

diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
index fb57d1113f5c71e7ef9f10baf45698aaa8c7b96e..048997e75dd07d27b5a9216457d8a33cb591bd72 100644 (file)
--- a/arch/arm/mach-mmp/time.c
+++ b/arch/arm/mach-mmp/time.c
@@ -67,7 +67,7 @@ static inline uint32_t timer_read(void)
        return __raw_readl(mmp_timer_base + TMR_CVWR(1));
 }
 
-static u32 notrace mmp_read_sched_clock(void)
+static u64 notrace mmp_read_sched_clock(void)
 {
        return timer_read();
 }
@@ -201,7 +201,7 @@ void __init timer_init(int irq)
 {
        timer_config();
 
-       setup_sched_clock(mmp_read_sched_clock, 32, MMP_CLOCK_FREQ);
+       sched_clock_register(mmp_read_sched_clock, 32, MMP_CLOCK_FREQ);
 
        ckevt.cpumask = cpumask_of(0);