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-gemini/board-wbd222.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-gemini/board-wbd222.c')
-rw-r--r-- | arch/arm/mach-gemini/board-wbd222.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-gemini/board-wbd222.c b/arch/arm/mach-gemini/board-wbd222.c index f382811c1319..fe33c825fdaf 100644 --- a/arch/arm/mach-gemini/board-wbd222.c +++ b/arch/arm/mach-gemini/board-wbd222.c | |||
@@ -80,10 +80,6 @@ static struct platform_device wbd222_leds_device = { | |||
80 | }, | 80 | }, |
81 | }; | 81 | }; |
82 | 82 | ||
83 | static struct sys_timer wbd222_timer = { | ||
84 | .init = gemini_timer_init, | ||
85 | }; | ||
86 | |||
87 | static struct mtd_partition wbd222_partitions[] = { | 83 | static struct mtd_partition wbd222_partitions[] = { |
88 | { | 84 | { |
89 | .name = "RedBoot", | 85 | .name = "RedBoot", |
@@ -132,6 +128,6 @@ MACHINE_START(WBD222, "Wiliboard WBD-222") | |||
132 | .atag_offset = 0x100, | 128 | .atag_offset = 0x100, |
133 | .map_io = gemini_map_io, | 129 | .map_io = gemini_map_io, |
134 | .init_irq = gemini_init_irq, | 130 | .init_irq = gemini_init_irq, |
135 | .timer = &wbd222_timer, | 131 | .init_time = gemini_timer_init, |
136 | .init_machine = wbd222_init, | 132 | .init_machine = wbd222_init, |
137 | MACHINE_END | 133 | MACHINE_END |