diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-04-15 00:03:09 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-15 00:03:09 +0300 |
| commit | 2886a734081ed31f3279550ea9d50ef1d84a84e6 (patch) | |
| tree | 784ced963e0db15f631b1ecb94da6c5e031ca5af /drivers/clocksource/dw_apb_timer.c | |
| parent | ad19638463a4b5c909fcebf0f19358c4bf4fed48 (diff) | |
| parent | 6fc46497a9fb283c4f8e8d04ae4f0bf3c0041f7e (diff) | |
| download | linux-2886a734081ed31f3279550ea9d50ef1d84a84e6.tar.xz | |
Merge branch 'fortglx/4.12/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Merge timer updates from John Stultz:
A preparatory patch series for correcting the clock event devices via NTP
to avoid early timer expiry and reprogramming.
Diffstat (limited to 'drivers/clocksource/dw_apb_timer.c')
| -rw-r--r-- | drivers/clocksource/dw_apb_timer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clocksource/dw_apb_timer.c b/drivers/clocksource/dw_apb_timer.c index 63e4f5519577..880f37e8278f 100644 --- a/drivers/clocksource/dw_apb_timer.c +++ b/drivers/clocksource/dw_apb_timer.c @@ -257,7 +257,9 @@ dw_apb_clockevent_init(int cpu, const char *name, unsigned rating, clockevents_calc_mult_shift(&dw_ced->ced, freq, APBT_MIN_PERIOD); dw_ced->ced.max_delta_ns = clockevent_delta2ns(0x7fffffff, &dw_ced->ced); + dw_ced->ced.max_delta_ticks = 0x7fffffff; dw_ced->ced.min_delta_ns = clockevent_delta2ns(5000, &dw_ced->ced); + dw_ced->ced.min_delta_ticks = 5000; dw_ced->ced.cpumask = cpumask_of(cpu); dw_ced->ced.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_DYNIRQ; |