summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-htcherald.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-03-29 15:54:48 -0700
committerTony Lindgren <tony@atomide.com>2011-06-20 01:25:39 -0700
commite74984e46e899c22137a385869fb4f3ae756e3df (patch)
tree2f40fe8d66afb676fefcf307b8df36b734c28ba3 /arch/arm/mach-omap1/board-htcherald.c
parent741e3a89dee8a17aa9373975d51f130a65e1683d (diff)
downloadblackbird-op-linux-e74984e46e899c22137a385869fb4f3ae756e3df.tar.gz
blackbird-op-linux-e74984e46e899c22137a385869fb4f3ae756e3df.zip
omap: Set separate timer init functions to avoid cpu_is_omap tests
This is needed for the following patches so we can initialize the rest of the hardware timers later on. As with the init_irq calls, there's no need to do cpu_is_omap calls during the timer init as we only care about the major omap generation. This means that we can initialize the sys_timer with the .timer entries alone. Note that for now we just set stubs for the various sys_timer entries that will get populated in a later patch. The following patches will also remove the omap_dm_timer_init calls and change the init for the rest of the hardware timers to happen with an arch_initcall. Signed-off-by: Tony Lindgren <tony@atomide.com> Reviewed-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-htcherald.c')
-rw-r--r--arch/arm/mach-omap1/board-htcherald.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c
index 1bd4d8e2580c..36e06ea7ec65 100644
--- a/arch/arm/mach-omap1/board-htcherald.c
+++ b/arch/arm/mach-omap1/board-htcherald.c
@@ -616,5 +616,5 @@ MACHINE_START(HERALD, "HTC Herald")
.reserve = omap_reserve,
.init_irq = htcherald_init_irq,
.init_machine = htcherald_init,
- .timer = &omap_timer,
+ .timer = &omap1_timer,
MACHINE_END
OpenPOWER on IntegriCloud