Message ID | 1359490991-17688-1-git-send-email-jon-hunter@ti.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wednesday 30 January 2013 01:53 AM, Jon Hunter wrote: > 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>
On Wed, Jan 30, 2013 at 01:53:11, Hunter, Jon wrote: > 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(). I thought that was intentional ;) and had this change in the clkevt-clksrc interchange patch for AM33xx. Anyways, this change works for me so... Tested-by: Vaibhav Bedia <vaibhav.bedia@ti.com>
On 01/30/2013 01:18 AM, Bedia, Vaibhav wrote: > On Wed, Jan 30, 2013 at 01:53:11, Hunter, Jon wrote: >> 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(). > > I thought that was intentional ;) and had this change in the clkevt-clksrc > interchange patch for AM33xx. No definitely was not. Thanks, I had missed that detail in the patch you sent! > Anyways, this change works for me so... > > Tested-by: Vaibhav Bedia <vaibhav.bedia@ti.com> Thanks! Jon
* Jon Hunter <jon-hunter@ti.com> [130130 09:54]: > > On 01/30/2013 01:18 AM, Bedia, Vaibhav wrote: > > On Wed, Jan 30, 2013 at 01:53:11, Hunter, Jon wrote: > >> 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(). > > > > I thought that was intentional ;) and had this change in the clkevt-clksrc > > interchange patch for AM33xx. > > No definitely was not. Thanks, I had missed that detail in the patch you > sent! > > > Anyways, this change works for me so... > > > > Tested-by: Vaibhav Bedia <vaibhav.bedia@ti.com> > > Thanks! Thanks applying into omap-for-v3.9/fixes-non-critical. Tony
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;
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> --- arch/arm/mach-omap2/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)