diff options
author | Soren Brinkmann <soren.brinkmann@xilinx.com> | 2014-02-03 17:34:32 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-02-07 09:34:29 -0500 |
commit | fe79a9ba11962a603fb6af68fcb476e64031e46c (patch) | |
tree | e637be5acb585c8910173d6e1d779bb57feebf26 | |
parent | 627ee7947e2e83ba565c31c5c9373d6e364b1ecd (diff) |
clockevents: Adjust timer interval when frequency changes
clockevent devices in periodic mode are not updated when the frequency
of the device changes. Issue a dev->set_mode() callback which forces
the device to reevaluate the timer settings.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Michal Simek <michal.simek@xilinx.com>
Link: http://lkml.kernel.org/r/1391466877-28908-3-git-send-email-soren.brinkmann@xilinx.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | kernel/time/clockevents.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c index 641d91003a45..f85e5fda9c66 100644 --- a/kernel/time/clockevents.c +++ b/kernel/time/clockevents.c | |||
@@ -443,10 +443,13 @@ int __clockevents_update_freq(struct clock_event_device *dev, u32 freq) | |||
443 | { | 443 | { |
444 | clockevents_config(dev, freq); | 444 | clockevents_config(dev, freq); |
445 | 445 | ||
446 | if (dev->mode != CLOCK_EVT_MODE_ONESHOT) | 446 | if (dev->mode == CLOCK_EVT_MODE_ONESHOT) |
447 | return 0; | 447 | return clockevents_program_event(dev, dev->next_event, false); |
448 | |||
449 | if (dev->mode == CLOCK_EVT_MODE_PERIODIC) | ||
450 | dev->set_mode(CLOCK_EVT_MODE_PERIODIC, dev); | ||
448 | 451 | ||
449 | return clockevents_program_event(dev, dev->next_event, false); | 452 | return 0; |
450 | } | 453 | } |
451 | 454 | ||
452 | /** | 455 | /** |