summaryrefslogtreecommitdiffstats
path: root/arch/microblaze/cpu
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2011-07-15 02:19:44 +0000
committerWolfgang Denk <wd@denx.de>2011-07-26 14:53:30 +0200
commit4769be21cca65f1e7bef27bc024d886842bc6bad (patch)
tree47053c2ed79e6e43b1b6fd49b585fe53028ff6a5 /arch/microblaze/cpu
parente110c4fe44edc34addee4839a1d20c0fbb076ad4 (diff)
downloadblackbird-obmc-uboot-4769be21cca65f1e7bef27bc024d886842bc6bad.tar.gz
blackbird-obmc-uboot-4769be21cca65f1e7bef27bc024d886842bc6bad.zip
Timer: Remove reset_timer() for non-Nios2 arches
Diffstat (limited to 'arch/microblaze/cpu')
-rw-r--r--arch/microblaze/cpu/timer.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c
index 59ed126487..a167755bdd 100644
--- a/arch/microblaze/cpu/timer.c
+++ b/arch/microblaze/cpu/timer.c
@@ -28,11 +28,6 @@
volatile int timestamp = 0;
-void reset_timer (void)
-{
- timestamp = 0;
-}
-
#ifdef CONFIG_SYS_TIMER_0
ulong get_timer (ulong base)
{
@@ -61,7 +56,7 @@ int timer_init (void)
tmr->control = TIMER_INTERRUPT | TIMER_RESET;
tmr->control =
TIMER_ENABLE | TIMER_ENABLE_INTR | TIMER_RELOAD | TIMER_DOWN_COUNT;
- reset_timer ();
+ timestamp = 0;
install_interrupt_handler (CONFIG_SYS_TIMER_0_IRQ, timer_isr, (void *)tmr);
return 0;
}
OpenPOWER on IntegriCloud