Commit 61338d59 authored Jan 29, 2013 by Jon Hunter Committed by Tony Lindgren Feb 01, 2013

ARM: OMAP2+: Fix selection of clockevent timer when using device-tree



Commit 9725f445 (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>

parent e78f9606

arch/arm/mach-omap2/timer.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -228,7 +228,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer,
	int r = 0;		int r = 0;

	if (of_have_populated_dt()) {		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)		if (!np)
	return -ENODEV;		return -ENODEV;