Skip to contentSkip to conversation

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

PATCH New Jon Hunter 4 participants 5 messages Jan 29, 2013 – Feb 1, 2013

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Jon Hunter

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 arch/arm/mach-omap2/timer.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/timer.c +1 -1
index b8ad6e6..265de51 100644
@@ -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;
Signature · 1 line
1.7.10.4
#1 lore raw

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

Quoted 9 lines · Jon Hunter

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 <[email protected]>

---

Acked-by Santosh Shilimkar <[email protected]>
#2 lore raw

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

In reply to Jon Hunter
Quoted 6 lines · Jon

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 <[email protected]>
author
#3 lore raw

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

Quoted 10 lines · Vaibhav
Quoted 6 lines · Jon

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!

Quoted 3 lines

Anyways, this change works for me so...

Tested-by Vaibhav Bedia <[email protected]>

Thanks!
Jon

maintainer
#4 lore raw

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

Quoted 13 lines · Jon Hunter
Quoted 10 lines · Vaibhav
Quoted 6 lines · Jon

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.

Quoted 8 lines

No definitely was not. Thanks, I had missed that detail in the patch you sent!

Quoted 3 lines

Anyways, this change works for me so...

Tested-by Vaibhav Bedia <[email protected]>

Thanks!

Thanks applying into omap-for-v3.9/fixes-non-critical.

Tony