summaryrefslogtreecommitdiff
path: root/arch/m68k/cpu/mcf547x_8x
diff options
context:
space:
mode:
authorJason Jin <Jason.jin@freescale.com>2011-08-19 10:02:32 +0800
committerjason <jason@jason-ThinkPad-T61.(none)>2011-09-04 22:46:55 +0800
commit444ddfc751038625035b0d7dddef88c1b313422b (patch)
tree1ebf75a88f87353f4e66904bc8de862f488f1130 /arch/m68k/cpu/mcf547x_8x
parent6c0bf27d74510d1d7fac9208e766eae8efac2592 (diff)
ColdFire:Update the timer_init since it was unified.
Signed-off-by: Jason Jin <Jason.jin@freescale.com>
Diffstat (limited to 'arch/m68k/cpu/mcf547x_8x')
-rw-r--r--arch/m68k/cpu/mcf547x_8x/slicetimer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
index 467a807802..ee2e35bd51 100644
--- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c
+++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c
@@ -72,7 +72,7 @@ void dtimer_interrupt(void *not_used)
}
}
-void timer_init(void)
+int timer_init(void)
{
volatile slt_t *timerp = (slt_t *) (CONFIG_SYS_TMR_BASE);
@@ -93,6 +93,7 @@ void timer_init(void)
/* set a period of 1us, set timer mode to restart and
enable timer and interrupt */
timerp->cr = SLT_CR_RUN | SLT_CR_IEN | SLT_CR_TEN;
+ return 0;
}
ulong get_timer(ulong base)