From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933001Ab3LEQj0 (ORCPT ); Thu, 5 Dec 2013 11:39:26 -0500 Received: from mail-ea0-f181.google.com ([209.85.215.181]:34562 "EHLO mail-ea0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932797Ab3LEQjX (ORCPT ); Thu, 5 Dec 2013 11:39:23 -0500 Message-ID: <52A0AC37.5010006@linaro.org> Date: Thu, 05 Dec 2013 17:39:19 +0100 From: Daniel Lezcano User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Thomas Gleixner , Ingo Molnar CC: Axel Lin , Dinh Nguyen , Ezequiel Garcia , Marc Zyngier , Thierry Reding , Linux Kernel Mailing List Subject: [GIT PULL] clocksource/clockevents fixes for 3.13 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Thomas, here are the fixes for 3.13 based on timers/urgent * Axel Lin removed the bcm_timer_ids which are no longer used due to the conversion to clksrc-of and added a missing dependency on CLKSRC_MMIO in the Kconfig for the time-efm32. * Dinh Nguyen fixed read_sched_clock to return the right value for the dw_apb_timer. * Ezequiel Garcia registered the sched clock after the counter, thus preventing time jump in the traces for the armada-370-xp. * Marc Zyngier stopped the timer before enabling the irq in order to prevent it to be fired before the clockevent is registered for the sunxi. * Thierry Reding removed a of_node_put in clksrc-of because the reference is not held. Thanks -- Daniel The following changes since commit 0e576acbc1d9600cf2d9b4a141a2554639959d50: nohz: Fix another inconsistency between CONFIG_NO_HZ=n and nohz=off (2013-11-29 12:23:03 +0100) are available in the git repository at: git://git.linaro.org/people/dlezcano/linux.git clockevents/fixes for you to fetch changes up to 75bf1f2333a0df1471b06ab4be220d2a7f877284: clocksource: sunxi: Stop timer from ticking before enabling interrupts (2013-12-05 17:30:27 +0100) ---------------------------------------------------------------- Axel Lin (2): clocksource: time-efm32: Select CLKSRC_MMIO clocksource: bcm_kona_timer: Remove unused bcm_timer_ids Dinh Nguyen (2): clocksource: dw_apb_timer: Move timer defines to header file. clocksource: dw_apb_timer_of: Fix read_sched_clock Ezequiel Garcia (1): clocksource: armada-370-xp: Register sched_clock after the counter reset Marc Zyngier (1): clocksource: sunxi: Stop timer from ticking before enabling interrupts Thierry Reding (1): clocksource: clksrc-of: Do not drop unheld reference on device node drivers/clocksource/Kconfig | 1 + drivers/clocksource/bcm_kona_timer.c | 6 ------ drivers/clocksource/clksrc-of.c | 1 - drivers/clocksource/dw_apb_timer.c | 19 ------------------- drivers/clocksource/dw_apb_timer_of.c | 9 +++++---- drivers/clocksource/sun4i_timer.c | 3 +++ drivers/clocksource/time-armada-370-xp.c | 10 +++++----- include/linux/dw_apb_timer.h | 19 +++++++++++++++++++ 8 files changed, 33 insertions(+), 35 deletions(-) -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog