diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-11-08 23:40:59 +0400 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-12-24 20:36:38 +0400 |
| commit | 6bb27d7349db51b50c40534710fe164ca0d58902 (patch) | |
| tree | 8f227c8bbf27b87275302dc133bb2b949b64622f /arch/arm/mach-nomadik | |
| parent | 7704c095230e2e9863f3aacd0489a4b4cc00bf45 (diff) | |
| download | linux-6bb27d7349db51b50c40534710fe164ca0d58902.tar.xz | |
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-nomadik')
| -rw-r--r-- | arch/arm/mach-nomadik/board-nhk8815.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index 98167a4319f7..ab756ed87ef0 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c @@ -268,10 +268,6 @@ static void __init nomadik_timer_init(void) nmdk_timer_init(io_p2v(NOMADIK_MTU0_BASE), IRQ_MTU0); } -static struct sys_timer nomadik_timer = { - .init = nomadik_timer_init, -}; - static struct i2c_board_info __initdata nhk8815_i2c0_devices[] = { { I2C_BOARD_INFO("stw4811", 0x2d), @@ -354,7 +350,7 @@ MACHINE_START(NOMADIK, "NHK8815") .map_io = cpu8815_map_io, .init_irq = cpu8815_init_irq, .handle_irq = vic_handle_irq, - .timer = &nomadik_timer, + .init_time = nomadik_timer_init, .init_machine = nhk8815_platform_init, .restart = cpu8815_restart, MACHINE_END |