Skip to contentSkip to conversation

arm: omap2: board-generic: use omap4_local_timer_init for AM437x

PATCH New Felipe Balbi 3 participants 4 messages Oct 20, 2015 – Nov 6, 2015

Subsystems (4)
Device tree bindings Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Felipe Balbi

author
#0 lore raw

PATCH 1/1 arm: omap2: board-generic: use omap4_local_timer_init for AM437x

AM437x-based boards, can use omap4_local_timer_init() just fine. Let's use that instead.

Signed-off-by Felipe Balbi <[email protected]>
---
 arch/arm/mach-omap2/board-generic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/board-generic.c +1 -1
index fc107bdeb8ca..04a56cc04dfa 100644
@@ -276,7 +276,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
 	.init_late	= am43xx_init_late,
 	.init_irq	= omap_gic_of_init,
 	.init_machine	= omap_generic_init,
-	.init_time	= omap3_gptimer_timer_init,
+	.init_time	= omap4_local_timer_init,
 	.dt_compat	= am43_boards_compat,
 	.restart	= omap44xx_restart,
 MACHINE_END
Signature · 1 line
2.6.2
maintainer
#1 lore raw

PATCH 1/1 arm: omap2: board-generic: use omap4_local_timer_init for AM437x

Quoted 2 lines · Felipe Balbi

AM437x-based boards, can use omap4_local_timer_init() just fine. Let's use that instead.

Applying into omap-for-v4.4/soc thanks.

Tony

#2 lore raw

PATCH 1/1 arm: omap2: board-generic: use omap4_local_timer_init for AM437x

In reply to Felipe Balbi
Quoted 2 lines · Felipe Balbi

AM437x-based boards, can use omap4_local_timer_init() just fine. Let's use that instead.

This is breaking AM43x-epos board.
Today's Linux next: http://pastebin.ubuntu.com/13122620/
Reverting this patch: http://pastebin.ubuntu.com/13122621/

Thanks and regards,
Lokesh

Quoted 20 lines
Signed-off-by Felipe Balbi <[email protected]>
---
 arch/arm/mach-omap2/board-generic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/board-generic.c +1 -1
index fc107bdeb8ca..04a56cc04dfa 100644
@@ -276,7 +276,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
 	.init_late	= am43xx_init_late,
 	.init_irq	= omap_gic_of_init,
 	.init_machine	= omap_generic_init,
-	.init_time	= omap3_gptimer_timer_init,
+	.init_time	= omap4_local_timer_init,
 	.dt_compat	= am43_boards_compat,
 	.restart	= omap44xx_restart,
 MACHINE_END
author
#3 lore raw

PATCH 1/1 arm: omap2: board-generic: use omap4_local_timer_init for AM437x

Hi,

Quoted 7 lines · Lokesh Vutla
Quoted 2 lines · Felipe Balbi

AM437x-based boards, can use omap4_local_timer_init() just fine. Let's use that instead.

This is breaking AM43x-epos board.
Today's Linux next: http://pastebin.ubuntu.com/13122620/
Reverting this patch: http://pastebin.ubuntu.com/13122621/

seems like the 32k timer isn't ticking. I don't have EPOS around, care to confirm if that board has 32k oscillator populated ? If it doesn't, then we should probably disable counter32k:

arch/arm/boot/dts/am43x-epos-evm.dts +5 -0
index 86c2dfbe8875..e703e32b6da6 100644
@@ -792,3 +792,8 @@
 	tx-num-evt = <32>;
 	rx-num-evt = <32>;
 };
+
+/* 32kHz oscillator not populated */
+&counter32k {
+	status = "disabled";
+};
Signature · 8 lines
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151106/66fe5beb/attachment.sig>