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-imx/mach-mx35_3ds.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-imx/mach-mx35_3ds.c')
-rw-r--r-- | arch/arm/mach-imx/mach-mx35_3ds.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/mach-mx35_3ds.c b/arch/arm/mach-imx/mach-mx35_3ds.c index 5277da45d60c..a42f4f07051f 100644 --- a/arch/arm/mach-imx/mach-mx35_3ds.c +++ b/arch/arm/mach-imx/mach-mx35_3ds.c | |||
@@ -602,10 +602,6 @@ static void __init mx35pdk_timer_init(void) | |||
602 | mx35_clocks_init(); | 602 | mx35_clocks_init(); |
603 | } | 603 | } |
604 | 604 | ||
605 | static struct sys_timer mx35pdk_timer = { | ||
606 | .init = mx35pdk_timer_init, | ||
607 | }; | ||
608 | |||
609 | static void __init mx35_3ds_reserve(void) | 605 | static void __init mx35_3ds_reserve(void) |
610 | { | 606 | { |
611 | /* reserve MX35_3DS_CAMERA_BUF_SIZE bytes for mx3-camera */ | 607 | /* reserve MX35_3DS_CAMERA_BUF_SIZE bytes for mx3-camera */ |
@@ -620,7 +616,7 @@ MACHINE_START(MX35_3DS, "Freescale MX35PDK") | |||
620 | .init_early = imx35_init_early, | 616 | .init_early = imx35_init_early, |
621 | .init_irq = mx35_init_irq, | 617 | .init_irq = mx35_init_irq, |
622 | .handle_irq = imx35_handle_irq, | 618 | .handle_irq = imx35_handle_irq, |
623 | .timer = &mx35pdk_timer, | 619 | .init_time = mx35pdk_timer_init, |
624 | .init_machine = mx35_3ds_init, | 620 | .init_machine = mx35_3ds_init, |
625 | .reserve = mx35_3ds_reserve, | 621 | .reserve = mx35_3ds_reserve, |
626 | .restart = mxc_restart, | 622 | .restart = mxc_restart, |