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