From 730258408dfbf4a419583d1d8e028871c6f16cca Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Fri, 20 Mar 2015 14:56:37 +0100 Subject: clocksource: sun5i: Fix cpufreq interaction with sched_clock The sched_clock we use on some system is this timer, and since we started using cpufreq, the cpu clock (that is one of the timer's clock indirect parent) now changes, along with the actual sched_clock rate. We can safely remove the sched_clock on those systems, since we have other reliable sched_clock in the system. Signed-off-by: Maxime Ripard Signed-off-by: Daniel Lezcano Tested-by: Hans de Goede --- drivers/clocksource/timer-sun5i.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c index 5dcbf90b8015..58597fbcc046 100644 --- a/drivers/clocksource/timer-sun5i.c +++ b/drivers/clocksource/timer-sun5i.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -137,11 +136,6 @@ static struct irqaction sun5i_timer_irq = { .dev_id = &sun5i_clockevent, }; -static u64 sun5i_timer_sched_read(void) -{ - return ~readl(timer_base + TIMER_CNTVAL_LO_REG(1)); -} - static void __init sun5i_timer_init(struct device_node *node) { struct reset_control *rstc; @@ -172,7 +166,6 @@ static void __init sun5i_timer_init(struct device_node *node) writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD, timer_base + TIMER_CTL_REG(1)); - sched_clock_register(sun5i_timer_sched_read, 32, rate); clocksource_mmio_init(timer_base + TIMER_CNTVAL_LO_REG(1), node->name, rate, 340, 32, clocksource_mmio_readl_down); -- cgit v1.2.3