summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/board-sx1.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2011-03-30 02:54:48 +0400
committerTony Lindgren <tony@atomide.com>2011-06-20 12:25:39 +0400
commite74984e46e899c22137a385869fb4f3ae756e3df (patch)
tree2f40fe8d66afb676fefcf307b8df36b734c28ba3 /arch/arm/mach-omap1/board-sx1.c
parent741e3a89dee8a17aa9373975d51f130a65e1683d (diff)
downloadlinux-e74984e46e899c22137a385869fb4f3ae756e3df.tar.xz
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-sx1.c')
-rw-r--r--arch/arm/mach-omap1/board-sx1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index 24f0f7b85567..9c3b7c52d9cf 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -426,5 +426,5 @@ MACHINE_START(SX1, "OMAP310 based Siemens SX1")
.reserve = omap_reserve,
.init_irq = omap_sx1_init_irq,
.init_machine = omap_sx1_init,
- .timer = &omap_timer,
+ .timer = &omap1_timer,
MACHINE_END