diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-11-08 12:40:59 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-12-24 09:36:38 -0700 |
| commit | 6bb27d7349db51b50c40534710fe164ca0d58902 (patch) | |
| tree | 8f227c8bbf27b87275302dc133bb2b949b64622f /arch/arm/mach-spear13xx/spear1310.c | |
| parent | 7704c095230e2e9863f3aacd0489a4b4cc00bf45 (diff) | |
| download | blackbird-op-linux-6bb27d7349db51b50c40534710fe164ca0d58902.tar.gz blackbird-op-linux-6bb27d7349db51b50c40534710fe164ca0d58902.zip | |
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-spear13xx/spear1310.c')
| -rw-r--r-- | arch/arm/mach-spear13xx/spear1310.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-spear13xx/spear1310.c b/arch/arm/mach-spear13xx/spear1310.c index 02f4724bb0d4..e77d05d48082 100644 --- a/arch/arm/mach-spear13xx/spear1310.c +++ b/arch/arm/mach-spear13xx/spear1310.c @@ -92,7 +92,7 @@ DT_MACHINE_START(SPEAR1310_DT, "ST SPEAr1310 SoC with Flattened Device Tree") .map_io = spear1310_map_io, .init_irq = spear13xx_dt_init_irq, .handle_irq = gic_handle_irq, - .timer = &spear13xx_timer, + .init_time = spear13xx_timer_init, .init_machine = spear1310_dt_init, .restart = spear_restart, .dt_compat = spear1310_dt_board_compat, |
