summaryrefslogtreecommitdiffstats
path: root/arch/blackfin/kernel
diff options
context:
space:
mode:
authorNicolai Stange <nicstange@gmail.com>2017-03-30 15:41:09 -0400
committerJohn Stultz <john.stultz@linaro.org>2017-04-14 16:11:18 -0400
commit18154c5c978bbd3a77f05a66421c362374edca57 (patch)
tree2840a4cf8c226d00dbf7f2451dafe03408ee94f6 /arch/blackfin/kernel
parent747d04b30e5285d8fc81db6a20b745bde3830798 (diff)
blackfin: time-ts: Set ->min_delta_ticks and ->max_delta_ticks
In preparation for making the clockevents core NTP correction aware, all clockevent device drivers must set ->min_delta_ticks and ->max_delta_ticks rather than ->min_delta_ns and ->max_delta_ns: a clockevent device's rate is going to change dynamically and thus, the ratio of ns to ticks ceases to stay invariant. Make the blackfin arch's clockevent driver initialize these fields properly. This patch alone doesn't introduce any change in functionality as the clockevents core still looks exclusively at the (untouched) ->min_delta_ns and ->max_delta_ns. As soon as this has changed, a followup patch will purge the initialization of ->min_delta_ns and ->max_delta_ns from this driver. Cc: Ingo Molnar <mingo@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Richard Cochran <richardcochran@gmail.com> Cc: Prarit Bhargava <prarit@redhat.com> Cc: Stephen Boyd <sboyd@codeaurora.org> Cc: Steven Miao <realmz6@gmail.com> Signed-off-by: Nicolai Stange <nicstange@gmail.com> Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'arch/blackfin/kernel')
-rw-r--r--arch/blackfin/kernel/time-ts.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c
index 0e9fcf841d67..01350557fbd7 100644
--- a/arch/blackfin/kernel/time-ts.c
+++ b/arch/blackfin/kernel/time-ts.c
@@ -230,7 +230,9 @@ static void __init bfin_gptmr0_clockevent_init(struct clock_event_device *evt)
230 clock_tick = get_sclk(); 230 clock_tick = get_sclk();
231 evt->mult = div_sc(clock_tick, NSEC_PER_SEC, evt->shift); 231 evt->mult = div_sc(clock_tick, NSEC_PER_SEC, evt->shift);
232 evt->max_delta_ns = clockevent_delta2ns(-1, evt); 232 evt->max_delta_ns = clockevent_delta2ns(-1, evt);
233 evt->max_delta_ticks = (unsigned long)-1;
233 evt->min_delta_ns = clockevent_delta2ns(100, evt); 234 evt->min_delta_ns = clockevent_delta2ns(100, evt);
235 evt->min_delta_ticks = 100;
234 236
235 evt->cpumask = cpumask_of(0); 237 evt->cpumask = cpumask_of(0);
236 238
@@ -344,7 +346,9 @@ void bfin_coretmr_clockevent_init(void)
344 clock_tick = get_cclk() / TIME_SCALE; 346 clock_tick = get_cclk() / TIME_SCALE;
345 evt->mult = div_sc(clock_tick, NSEC_PER_SEC, evt->shift); 347 evt->mult = div_sc(clock_tick, NSEC_PER_SEC, evt->shift);
346 evt->max_delta_ns = clockevent_delta2ns(-1, evt); 348 evt->max_delta_ns = clockevent_delta2ns(-1, evt);
349 evt->max_delta_ticks = (unsigned long)-1;
347 evt->min_delta_ns = clockevent_delta2ns(100, evt); 350 evt->min_delta_ns = clockevent_delta2ns(100, evt);
351 evt->min_delta_ticks = 100;
348 352
349 evt->cpumask = cpumask_of(cpu); 353 evt->cpumask = cpumask_of(cpu);
350 354