From mboxrd@z Thu Jan 1 00:00:00 1970 From: Soren Brinkmann Subject: [PATCH 2/2] time: clockevents: Adjust timer interval when frequency changes Date: Mon, 9 Dec 2013 16:34:46 -0800 Message-ID: <1386635686-15686-3-git-send-email-soren.brinkmann@xilinx.com> References: <1386635686-15686-1-git-send-email-soren.brinkmann@xilinx.com> Return-path: In-Reply-To: <1386635686-15686-1-git-send-email-soren.brinkmann@xilinx.com> Sender: linux-kernel-owner@vger.kernel.org To: Daniel Lezcano , Thomas Gleixner Cc: Rob Herring , Pawel Moll , Mark Rutland , Stephen Warren , Ian Campbell , Russell King , Michal Simek , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, =?UTF-8?q?S=C3=B6ren=20Brinkmann?= List-Id: devicetree@vger.kernel.org To adjust the timer's interval in periodic mode, the clockevent device is put into periodic mode during clockevents_update_freq() in case the timer is in periodic mode. Cc: Thomas Gleixner Signed-off-by: Soren Brinkmann --- kernel/time/clockevents.c | 9 ++++++--- 1 file 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) { clockevents_config(dev, freq); - if (dev->mode != CLOCK_EVT_MODE_ONESHOT) - return 0; + if (dev->mode == CLOCK_EVT_MODE_ONESHOT) + return clockevents_program_event(dev, dev->next_event, false); + + if (dev->mode == CLOCK_EVT_MODE_PERIODIC) + dev->set_mode(CLOCK_EVT_MODE_PERIODIC, dev); - return clockevents_program_event(dev, dev->next_event, false); + return 0; } /** -- 1.8.5.1