Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754435Ab3CKUER (ORCPT ); Mon, 11 Mar 2013 16:04:17 -0400 Received: from mail-oa0-f41.google.com ([209.85.219.41]:43186 "EHLO mail-oa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750948Ab3CKUEQ (ORCPT ); Mon, 11 Mar 2013 16:04:16 -0400 Message-ID: <513E38BD.4080407@gmail.com> Date: Mon, 11 Mar 2013 15:04:13 -0500 From: Rob Herring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130106 Thunderbird/17.0.2 MIME-Version: 1.0 To: "arm@kernel.org" CC: "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Thomas Gleixner , Russell King - ARM Linux Subject: [GIT PULL] clocksource cleanup for 3.10 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2352 Lines: 56 Arnd, Olof, Please pull. This improves the clocksource init to avoid double matching to the DT device node. The clocksource init function changes are needed for any other clocksource conversions to CLKSRC_OF, so we need to make sure any other conversions use this branch (It happens to silently work without warnings, but there would be a mismatch in function ptrs). I'm including the twd_smp timer support for CLKSRC_OF here because of the dependency on this change. Rob The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9: Linux 3.9-rc2 (2013-03-10 16:54:19 -0700) are available in the git repository at: git://sources.calxeda.com/kernel/linux.git tags/clksrc-cleanup-for-3.10 for you to fetch changes up to da4a686a2cfb077a8bfc1697f597e7f86235b822: ARM: smp_twd: convert to use CLKSRC_OF init (2013-03-11 08:42:08 -0500) ---------------------------------------------------------------- - Add device_node ptr to clocksource init functions - Add CLKSRC_OF support to twd_smp timer ---------------------------------------------------------------- Rob Herring (4): clocksource: add empty version of clocksource_of_init clocksource: pass DT node pointer to init functions clocksource: tegra20: use the device_node pointer passed to init ARM: smp_twd: convert to use CLKSRC_OF init arch/arm/Kconfig | 1 + arch/arm/include/asm/smp_twd.h | 8 ---- arch/arm/kernel/smp_twd.c | 17 ++------ arch/arm/mach-highbank/highbank.c | 5 +-- arch/arm/mach-imx/mach-imx6q.c | 5 +-- arch/arm/mach-omap2/timer.c | 2 +- arch/arm/mach-spear13xx/spear13xx.c | 4 +- arch/arm/mach-ux500/timer.c | 3 +- arch/arm/mach-vexpress/v2m.c | 6 +-- drivers/clocksource/bcm2835_timer.c | 12 +----- drivers/clocksource/clksrc-of.c | 4 +- drivers/clocksource/tegra20_timer.c | 73 +++++++++++++---------------------- drivers/clocksource/vt8500_timer.c | 14 +------ include/linux/clocksource.h | 1 + 14 files changed, 49 insertions(+), 106 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/