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-iop13xx/iq81340mc.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-iop13xx/iq81340mc.c')
-rw-r--r-- | arch/arm/mach-iop13xx/iq81340mc.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c index e3f3e7daa79e..02a8228ac2d3 100644 --- a/arch/arm/mach-iop13xx/iq81340mc.c +++ b/arch/arm/mach-iop13xx/iq81340mc.c | |||
@@ -84,17 +84,13 @@ static void __init iq81340mc_timer_init(void) | |||
84 | iop_init_time(bus_freq); | 84 | iop_init_time(bus_freq); |
85 | } | 85 | } |
86 | 86 | ||
87 | static struct sys_timer iq81340mc_timer = { | ||
88 | .init = iq81340mc_timer_init, | ||
89 | }; | ||
90 | |||
91 | MACHINE_START(IQ81340MC, "Intel IQ81340MC") | 87 | MACHINE_START(IQ81340MC, "Intel IQ81340MC") |
92 | /* Maintainer: Dan Williams <dan.j.williams@intel.com> */ | 88 | /* Maintainer: Dan Williams <dan.j.williams@intel.com> */ |
93 | .atag_offset = 0x100, | 89 | .atag_offset = 0x100, |
94 | .init_early = iop13xx_init_early, | 90 | .init_early = iop13xx_init_early, |
95 | .map_io = iop13xx_map_io, | 91 | .map_io = iop13xx_map_io, |
96 | .init_irq = iop13xx_init_irq, | 92 | .init_irq = iop13xx_init_irq, |
97 | .timer = &iq81340mc_timer, | 93 | .init_time = iq81340mc_timer_init, |
98 | .init_machine = iq81340mc_init, | 94 | .init_machine = iq81340mc_init, |
99 | .restart = iop13xx_restart, | 95 | .restart = iop13xx_restart, |
100 | MACHINE_END | 96 | MACHINE_END |