| Message ID | 50C1BC10.8000506@compulab.co.il (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 12/07/2012 02:51 AM, Igor Grinberg wrote: > Hi Stephen, > > I've only now bumped into the patchset (working the back log on linux-arm). > Sorry for late reply, but I guess you should have Cc'd the relevant > mailing lists with such changes. > Cc'd now. Perhaps. There's a trade-off with spamming tens of subarch lists though, and the OMAP maintainer and LAKML were CC'd. > On 11/19/12 20:31, Stephen Warren wrote: >> Now that the only field in struct sys_timer is .init, delete the struct, >> and replace the machine descriptor .timer field with the initialization >> function itself. >> >> This will enable moving timer drivers into drivers/clocksource without >> having to place a public prototype of each struct sys_timer object into >> include/linux; the intent is to create a single of_clocksource_init() >> function that determines which timer driver to initialize by scanning >> the device dtree, much like the proposed irqchip_init() at: >> http://www.spinics.net/lists/arm-kernel/msg203686.html ... >> The patch is very large, so I've trimmed it for the mailing list, leaving >> only the core ARM changes, changes outside arch/arm, and a single machine >> example. The full series can be found at: >> >> git://nv-tegra.nvidia.com/user/swarren/linux-2.6 arm_timer_rework ... > I've looked at the omap2+ changes and I think OMAP4 and 5 got messed up a bit... > the below (compile tested on omap2plus only) should be applied: Thanks; your patch looks correct. I'll fold it into my series.
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 2e0c446..f5d5f59 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -725,6 +725,6 @@ MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board") .handle_irq = gic_handle_irq, .init_machine = omap_4430sdp_init, .init_late = omap4430_init_late, - .init_time = omap4_sync32k_timer_init, + .init_time = omap4_local_timer_init, .restart = omap44xx_restart, MACHINE_END diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 5da84a9..8a5f814 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -159,7 +159,7 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)") .handle_irq = gic_handle_irq, .init_machine = omap_generic_init, .init_late = omap4430_init_late, - .init_time = omap4_sync32k_timer_init, + .init_time = omap4_local_timer_init, .dt_compat = omap4_boards_compat, .restart = omap44xx_restart, MACHINE_END @@ -179,7 +179,7 @@ DT_MACHINE_START(OMAP5_DT, "Generic OMAP5 (Flattened Device Tree)") .init_irq = omap_gic_of_init, .handle_irq = gic_handle_irq, .init_machine = omap_generic_init, - .init_time = omap5_sync32k_timer_init, + .init_time = omap5_realtime_timer_init, .dt_compat = omap5_boards_compat, .restart = omap44xx_restart, MACHINE_END diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index fcae01e..ed8240c 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -456,6 +456,6 @@ MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board") .handle_irq = gic_handle_irq, .init_machine = omap4_panda_init, .init_late = omap4430_init_late, - .init_time = omap4_sync32k_timer_init, + .init_time = omap4_local_timer_init, .restart = omap44xx_restart, MACHINE_END diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 56a3281..b435027 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -84,8 +84,8 @@ extern void omap3_sync32k_timer_init(void); extern void omap3_secure_sync32k_timer_init(void); extern void omap3_gp_gptimer_timer_init(void); extern void omap3_am33xx_gptimer_timer_init(void); -extern void omap4_sync32k_timer_init(void); -extern void omap5_sync32k_timer_init(void); +extern void omap4_local_timer_init(void); +extern void omap5_realtime_timer_init(void); void omap2420_init_early(void); void omap2430_init_early(void);