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-orion5x/common.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-orion5x/common.c')
-rw-r--r-- | arch/arm/mach-orion5x/common.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 550f92320afb..d068f1431c40 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c | |||
@@ -217,7 +217,7 @@ int __init orion5x_find_tclk(void) | |||
217 | return 166666667; | 217 | return 166666667; |
218 | } | 218 | } |
219 | 219 | ||
220 | static void __init orion5x_timer_init(void) | 220 | void __init orion5x_timer_init(void) |
221 | { | 221 | { |
222 | orion5x_tclk = orion5x_find_tclk(); | 222 | orion5x_tclk = orion5x_find_tclk(); |
223 | 223 | ||
@@ -225,10 +225,6 @@ static void __init orion5x_timer_init(void) | |||
225 | IRQ_ORION5X_BRIDGE, orion5x_tclk); | 225 | IRQ_ORION5X_BRIDGE, orion5x_tclk); |
226 | } | 226 | } |
227 | 227 | ||
228 | struct sys_timer orion5x_timer = { | ||
229 | .init = orion5x_timer_init, | ||
230 | }; | ||
231 | |||
232 | 228 | ||
233 | /***************************************************************************** | 229 | /***************************************************************************** |
234 | * General | 230 | * General |