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-mvebu/armada-370-xp.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-mvebu/armada-370-xp.c')
-rw-r--r-- | arch/arm/mach-mvebu/armada-370-xp.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c index 7434b5e36197..a5ea616d6d12 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.c +++ b/arch/arm/mach-mvebu/armada-370-xp.c | |||
@@ -56,10 +56,6 @@ void __init armada_370_xp_init_early(void) | |||
56 | init_dma_coherent_pool_size(SZ_1M); | 56 | init_dma_coherent_pool_size(SZ_1M); |
57 | } | 57 | } |
58 | 58 | ||
59 | struct sys_timer armada_370_xp_timer = { | ||
60 | .init = armada_370_xp_timer_and_clk_init, | ||
61 | }; | ||
62 | |||
63 | static void __init armada_370_xp_dt_init(void) | 59 | static void __init armada_370_xp_dt_init(void) |
64 | { | 60 | { |
65 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 61 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
@@ -78,7 +74,7 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)") | |||
78 | .init_early = armada_370_xp_init_early, | 74 | .init_early = armada_370_xp_init_early, |
79 | .init_irq = armada_370_xp_init_irq, | 75 | .init_irq = armada_370_xp_init_irq, |
80 | .handle_irq = armada_370_xp_handle_irq, | 76 | .handle_irq = armada_370_xp_handle_irq, |
81 | .timer = &armada_370_xp_timer, | 77 | .init_time = armada_370_xp_timer_and_clk_init, |
82 | .restart = mvebu_restart, | 78 | .restart = mvebu_restart, |
83 | .dt_compat = armada_370_xp_dt_compat, | 79 | .dt_compat = armada_370_xp_dt_compat, |
84 | MACHINE_END | 80 | MACHINE_END |