From: Jon Hunter Date: Tue, 29 Jan 2013 20:23:11 +0000 (-0600) Subject: ARM: OMAP2+: Fix selection of clockevent timer when using device-tree X-Git-Tag: v3.9-rc1~123^2~10^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61338d598eec1477455294f006793ee54eead795;p=profile%2Fivi%2Fkernel-x86-ivi.git ARM: OMAP2+: Fix selection of clockevent timer when using device-tree Commit 9725f44 (ARM: OMAP: Add DT support for timer driver) added device-tree support for selecting a clockevent timer by property. However, the code is currently ignoring the property passed and selecting the first available timer found. Hence, for the OMAP3 beagle board timer-12 is not being selected as expected. Fix this problem by ensuring the timer property is passed to omap_get_timer_dt(). Signed-off-by: Jon Hunter Acked-by: Santosh Shilimkar Tested-by: Vaibhav Bedia Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index b8ad6e6..265de51 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -228,7 +228,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, int r = 0; if (of_have_populated_dt()) { - np = omap_get_timer_dt(omap_timer_match, NULL); + np = omap_get_timer_dt(omap_timer_match, property); if (!np) return -ENODEV;