diff options
| author | Jon Hunter <jon-hunter@ti.com> | 2013-01-29 14:23:11 -0600 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-02-01 14:44:10 -0800 |
| commit | 61338d598eec1477455294f006793ee54eead795 (patch) | |
| tree | 903356963a527f8d0085970c56704d3333345819 | |
| parent | e78f96060fff8545d21360cfa5590e266a595bb9 (diff) | |
| download | op-kernel-dev-61338d598eec1477455294f006793ee54eead795.zip op-kernel-dev-61338d598eec1477455294f006793ee54eead795.tar.gz | |
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 <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>
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |
