diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-11-08 14:40:59 -0500 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-12-24 11:36:38 -0500 |
commit | 6bb27d7349db51b50c40534710fe164ca0d58902 (patch) | |
tree | 8f227c8bbf27b87275302dc133bb2b949b64622f /arch/arm/mach-omap2/board-cm-t35.c | |
parent | 7704c095230e2e9863f3aacd0489a4b4cc00bf45 (diff) |
ARM: delete struct sys_timer
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
Includes mach-omap2 fixes from Igor Grinberg.
Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-cm-t35.c')
-rw-r--r-- | arch/arm/mach-omap2/board-cm-t35.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index b3102c2f4a3c..68647c389190 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c | |||
@@ -751,7 +751,7 @@ MACHINE_START(CM_T35, "Compulab CM-T35") | |||
751 | .handle_irq = omap3_intc_handle_irq, | 751 | .handle_irq = omap3_intc_handle_irq, |
752 | .init_machine = cm_t35_init, | 752 | .init_machine = cm_t35_init, |
753 | .init_late = omap35xx_init_late, | 753 | .init_late = omap35xx_init_late, |
754 | .timer = &omap3_timer, | 754 | .init_time = omap3_sync32k_timer_init, |
755 | .restart = omap3xxx_restart, | 755 | .restart = omap3xxx_restart, |
756 | MACHINE_END | 756 | MACHINE_END |
757 | 757 | ||
@@ -764,6 +764,6 @@ MACHINE_START(CM_T3730, "Compulab CM-T3730") | |||
764 | .handle_irq = omap3_intc_handle_irq, | 764 | .handle_irq = omap3_intc_handle_irq, |
765 | .init_machine = cm_t3730_init, | 765 | .init_machine = cm_t3730_init, |
766 | .init_late = omap3630_init_late, | 766 | .init_late = omap3630_init_late, |
767 | .timer = &omap3_timer, | 767 | .init_time = omap3_sync32k_timer_init, |
768 | .restart = omap3xxx_restart, | 768 | .restart = omap3xxx_restart, |
769 | MACHINE_END | 769 | MACHINE_END |