Skip to contentSkip to conversation

arm: am4: initialiaze twd local timer

PATCH New Felipe Balbi 1 participant 3 messages Sep 14, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover arm: am4: initialiaze twd local timer

Hi,

the following patches are a rebase of the old series [1] to make use of TWD/Global timers with AM437x devices.

Note that this depends on another patch which used to be part of this series, but now it was sent separately [2].

[1] http://marc.info/?l=linux-omap&m=143940944508625&w=2
[2] http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=8434/1

Felipe Balbi (2):
arm: omap2: Kconfig: select TWD and global timer on AM43xx devices
arm: omap2: board-generic: use omap4_local_timer_init for AM437x

 arch/arm/kernel/smp_twd.c           | 4 ----
 arch/arm/mach-omap2/Kconfig         | 3 +++
 arch/arm/mach-omap2/board-generic.c | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)
Signature · 1 line
2.5.0
#1 lore raw

PATCH 1/2 arm: omap2: Kconfig: select TWD and global timer on AM43xx devices

Make sure to tell the kernel that AM437x has
TWD and global timers.

---
 arch/arm/mach-omap2/Kconfig | 3 +++
 1 file changed, 3 insertions(+)
arch/arm/mach-omap2/Kconfig +3 -0
index 07d2e100caab..88ef10b2d415 100644
@@ -63,6 +63,9 @@ config SOC_AM43XX
 	select MACH_OMAP_GENERIC
 	select MIGHT_HAVE_CACHE_L2X0
 	select HAVE_ARM_SCU
+	select HAVE_ARM_TWD
+	select ARM_GLOBAL_TIMER
+	select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
 
 config SOC_DRA7XX
 	bool "TI DRA7XX"
Signature · 1 line
2.5.0
#2 lore raw

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

In reply to Felipe Balbi

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

---
 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 24c9afc9e8a7..89bf39663d61 100644
@@ -279,7 +279,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.5.0