Skip to content

Commit

Permalink
ARM: OMAP2+: Fix selection of clockevent timer when using device-tree
Browse files Browse the repository at this point in the history
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 <jon-hunter@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Tested-by: Vaibhav Bedia <vaibhav.bedia@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Jon Hunter authored and Tony Lindgren committed Feb 1, 2013
1 parent e78f960 commit 61338d5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 61338d5

Please sign in to comment.