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-zoom.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-zoom.c')
-rw-r--r-- | arch/arm/mach-omap2/board-zoom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c index d7fa31e67238..d257cf1e0abe 100644 --- a/arch/arm/mach-omap2/board-zoom.c +++ b/arch/arm/mach-omap2/board-zoom.c | |||
@@ -137,7 +137,7 @@ MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board") | |||
137 | .handle_irq = omap3_intc_handle_irq, | 137 | .handle_irq = omap3_intc_handle_irq, |
138 | .init_machine = omap_zoom_init, | 138 | .init_machine = omap_zoom_init, |
139 | .init_late = omap3430_init_late, | 139 | .init_late = omap3430_init_late, |
140 | .timer = &omap3_timer, | 140 | .init_time = omap3_sync32k_timer_init, |
141 | .restart = omap3xxx_restart, | 141 | .restart = omap3xxx_restart, |
142 | MACHINE_END | 142 | MACHINE_END |
143 | 143 | ||
@@ -150,6 +150,6 @@ MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board") | |||
150 | .handle_irq = omap3_intc_handle_irq, | 150 | .handle_irq = omap3_intc_handle_irq, |
151 | .init_machine = omap_zoom_init, | 151 | .init_machine = omap_zoom_init, |
152 | .init_late = omap3630_init_late, | 152 | .init_late = omap3630_init_late, |
153 | .timer = &omap3_timer, | 153 | .init_time = omap3_sync32k_timer_init, |
154 | .restart = omap3xxx_restart, | 154 | .restart = omap3xxx_restart, |
155 | MACHINE_END | 155 | MACHINE_END |