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-ti8168evm.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-ti8168evm.c')
-rw-r--r-- | arch/arm/mach-omap2/board-ti8168evm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-ti8168evm.c b/arch/arm/mach-omap2/board-ti8168evm.c index 1a3e056d63a7..6273c286e1d8 100644 --- a/arch/arm/mach-omap2/board-ti8168evm.c +++ b/arch/arm/mach-omap2/board-ti8168evm.c | |||
@@ -43,7 +43,7 @@ MACHINE_START(TI8168EVM, "ti8168evm") | |||
43 | .map_io = ti81xx_map_io, | 43 | .map_io = ti81xx_map_io, |
44 | .init_early = ti81xx_init_early, | 44 | .init_early = ti81xx_init_early, |
45 | .init_irq = ti81xx_init_irq, | 45 | .init_irq = ti81xx_init_irq, |
46 | .timer = &omap3_timer, | 46 | .init_time = omap3_sync32k_timer_init, |
47 | .init_machine = ti81xx_evm_init, | 47 | .init_machine = ti81xx_evm_init, |
48 | .init_late = ti81xx_init_late, | 48 | .init_late = ti81xx_init_late, |
49 | .restart = omap44xx_restart, | 49 | .restart = omap44xx_restart, |
@@ -55,7 +55,7 @@ MACHINE_START(TI8148EVM, "ti8148evm") | |||
55 | .map_io = ti81xx_map_io, | 55 | .map_io = ti81xx_map_io, |
56 | .init_early = ti81xx_init_early, | 56 | .init_early = ti81xx_init_early, |
57 | .init_irq = ti81xx_init_irq, | 57 | .init_irq = ti81xx_init_irq, |
58 | .timer = &omap3_timer, | 58 | .init_time = omap3_sync32k_timer_init, |
59 | .init_machine = ti81xx_evm_init, | 59 | .init_machine = ti81xx_evm_init, |
60 | .init_late = ti81xx_init_late, | 60 | .init_late = ti81xx_init_late, |
61 | .restart = omap44xx_restart, | 61 | .restart = omap44xx_restart, |