diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-11-08 20:40:59 +0100 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-12-24 17:36:38 +0100 |
| commit | 6bb27d7349db51b50c40534710fe164ca0d58902 (patch) | |
| tree | 8f227c8bbf27b87275302dc133bb2b949b64622f /arch/arm/mach-davinci/da8xx-dt.c | |
| parent | ARM: remove struct sys_timer suspend and resume fields (diff) | |
| download | linux-6bb27d7349db51b50c40534710fe164ca0d58902.tar.xz 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-davinci/da8xx-dt.c')
| -rw-r--r-- | arch/arm/mach-davinci/da8xx-dt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index 37c27af18fa0..9a7c76efc8f8 100644 --- a/arch/arm/mach-davinci/da8xx-dt.c +++ b/arch/arm/mach-davinci/da8xx-dt.c @@ -56,7 +56,7 @@ static const char *da850_boards_compat[] __initdata = { DT_MACHINE_START(DA850_DT, "Generic DA850/OMAP-L138/AM18x") .map_io = da850_init, .init_irq = da8xx_init_irq, - .timer = &davinci_timer, + .init_time = davinci_timer_init, .init_machine = da850_init_machine, .dt_compat = da850_boards_compat, .init_late = davinci_init_late, |