On Tue, Nov 20, 2012 at 2:31 AM, Stephen Warren <swarren@xxxxxxxxxxxxx> wrote: > From: Stephen Warren <swarren@xxxxxxxxxx> > > 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 > > Signed-off-by: Stephen Warren <swarren@xxxxxxxxxx> > Tested-by: Robert Jarzmik <robert.jarzmik@xxxxxxx> > --- > v3: Minor merge conflicts due to rebasing onto next-20121115. > v2: Converted all platforms, not just Tegra. > > 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 > --- > 492 files changed, 622 insertions(+), 1199 deletions(-) I checked the patch for mach-mmp. @@ -69,7 +65,7 @@ static const char *mmp_dt_board_compat[] __initdata = { DT_MACHINE_START(PXA168_DT, "Marvell PXA168 (Device Tree Support)") .map_io = mmp_map_io, .init_irq = mmp_dt_irq_init, - .timer = &mmp_dt_timer, + .init_time = mmp_dt_init_timer, .init_machine = pxa168_dt_init, .dt_compat = mmp_dt_board_compat, MACHINE_END @@ -77,7 +73,7 @@ MACHINE_END DT_MACHINE_START(PXA910_DT, "Marvell PXA910 (Device Tree Support)") .map_io = mmp_map_io, .init_irq = mmp_dt_irq_init, - .timer = &mmp_dt_timer, + .init_time = mmp_dt_timer_init, .init_machine = pxa910_dt_init, .dt_compat = mmp_dt_board_compat, MACHINE_END This first init_time is assigned by mmp_dt_init_timer. But the second init_time is assigned by mmp_dt_timer_init. I think it's a typo error. Could you help to fix this? Regards Haojian -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
