This series consists mainly of clean-ups for clockevents and clocksource timers on OMAP2+ devices. The most significant change in functionality comes from the 5th patch which is changing the selection of the clocksource timer for OMAP3 and AM335x devices when gptimers are used for clocksource. This change came about from Vaibhav Bedia's series for AM335x [1]. See patch for more details on the exact nature of the change. Boot tested with and without device-tree on OMAP2420 H4, OMAP3430 SDP, OMAP3430 Beagle Board, OMAP4430 SDP and AM335x EVM (AM335x only supports device-tree boot). Also boot tested boards with kernel boot parameter "clocksource=gp_timer". This series is based upon ARM-SoC next branch. V3 changes: - Post the intended patches this time! - Use PTR_ERR() to return the error code if clk_get() fails (thanks Russell!) V2 changes: - Fixed bug in patch that updates clocksource and clockevents timer names to use the hwmod timer names (thanks Vaibhav Bedia!) - Updated patch that removes the hard-coded ID test to return an error as soon as clk_set_parent fails instead of waiting for the end of the function. - Fixed bug in patches that "simplify system timer clock definitions" and "simplify system timer definitions" that was prevent omap4/5 boards from booting with kernel boot parameter "clocksource=gp_timer". - Updated changelog for patch "simplify system timer definitions" per feedback received from Igor. - Added new patch to store the timer ID in the omap_dm_timer structure to clean-up the code. - Added new patch to fix a sparse warning seen in ARM-SOC next. [1] https://patchwork.kernel.org/patch/1921421/ Jon Hunter (7): ARM: OMAP2+: Display correct system timer name ARM: OMAP2+: Remove hard-coded test on timer ID ARM: OMAP2+: Simplify system timer clock definitions ARM: OMAP2+: Simplify system timers definitions ARM: OMAP3: Update clocksource timer selection ARM: OMAP2+: Store ID of system timers in timer structure ARM: OMAP4+: Fix sparse warning in system timers arch/arm/mach-omap2/board-cm-t3517.c | 2 +- arch/arm/mach-omap2/board-generic.c | 2 +- arch/arm/mach-omap2/common.h | 3 +- arch/arm/mach-omap2/timer.c | 121 +++++++++++++++++----------------- 4 files changed, 65 insertions(+), 63 deletions(-) -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html