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-ixp4xx/omixp-setup.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-ixp4xx/omixp-setup.c')
-rw-r--r-- | arch/arm/mach-ixp4xx/omixp-setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ixp4xx/omixp-setup.c b/arch/arm/mach-ixp4xx/omixp-setup.c index 158ddb79821d..46a89f5e8269 100644 --- a/arch/arm/mach-ixp4xx/omixp-setup.c +++ b/arch/arm/mach-ixp4xx/omixp-setup.c | |||
@@ -245,7 +245,7 @@ MACHINE_START(DEVIXP, "Omicron DEVIXP") | |||
245 | .map_io = ixp4xx_map_io, | 245 | .map_io = ixp4xx_map_io, |
246 | .init_early = ixp4xx_init_early, | 246 | .init_early = ixp4xx_init_early, |
247 | .init_irq = ixp4xx_init_irq, | 247 | .init_irq = ixp4xx_init_irq, |
248 | .timer = &ixp4xx_timer, | 248 | .init_time = ixp4xx_timer_init, |
249 | .init_machine = omixp_init, | 249 | .init_machine = omixp_init, |
250 | .restart = ixp4xx_restart, | 250 | .restart = ixp4xx_restart, |
251 | MACHINE_END | 251 | MACHINE_END |
@@ -257,7 +257,7 @@ MACHINE_START(MICCPT, "Omicron MICCPT") | |||
257 | .map_io = ixp4xx_map_io, | 257 | .map_io = ixp4xx_map_io, |
258 | .init_early = ixp4xx_init_early, | 258 | .init_early = ixp4xx_init_early, |
259 | .init_irq = ixp4xx_init_irq, | 259 | .init_irq = ixp4xx_init_irq, |
260 | .timer = &ixp4xx_timer, | 260 | .init_time = ixp4xx_timer_init, |
261 | .init_machine = omixp_init, | 261 | .init_machine = omixp_init, |
262 | #if defined(CONFIG_PCI) | 262 | #if defined(CONFIG_PCI) |
263 | .dma_zone_size = SZ_64M, | 263 | .dma_zone_size = SZ_64M, |
@@ -272,7 +272,7 @@ MACHINE_START(MIC256, "Omicron MIC256") | |||
272 | .map_io = ixp4xx_map_io, | 272 | .map_io = ixp4xx_map_io, |
273 | .init_early = ixp4xx_init_early, | 273 | .init_early = ixp4xx_init_early, |
274 | .init_irq = ixp4xx_init_irq, | 274 | .init_irq = ixp4xx_init_irq, |
275 | .timer = &ixp4xx_timer, | 275 | .init_time = ixp4xx_timer_init, |
276 | .init_machine = omixp_init, | 276 | .init_machine = omixp_init, |
277 | .restart = ixp4xx_restart, | 277 | .restart = ixp4xx_restart, |
278 | MACHINE_END | 278 | MACHINE_END |