diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-04-24 21:13:31 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-04-24 21:13:31 +0200 |
| commit | 500fbae2043532275e09a8666d837d052c9bad9a (patch) | |
| tree | f793ba7c048230cf2d9f888faa4df7dc038fd679 /arch/microblaze/cpu/timer.c | |
| parent | b919a3f2981109c9f2aaafe9c692dbb99f1c6366 (diff) | |
| parent | 8ff972c6e99938f1a033e5500dccc9a37ce3406f (diff) | |
| download | u-boot-imx-500fbae2043532275e09a8666d837d052c9bad9a.zip u-boot-imx-500fbae2043532275e09a8666d837d052c9bad9a.tar.gz u-boot-imx-500fbae2043532275e09a8666d837d052c9bad9a.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-microblaze
Diffstat (limited to 'arch/microblaze/cpu/timer.c')
| -rw-r--r-- | arch/microblaze/cpu/timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/microblaze/cpu/timer.c b/arch/microblaze/cpu/timer.c index a91eabc..4936c62 100644 --- a/arch/microblaze/cpu/timer.c +++ b/arch/microblaze/cpu/timer.c @@ -60,7 +60,7 @@ void timer_isr (void *arg) tmr->control = tmr->control | TIMER_INTERRUPT; } -void timer_init (void) +int timer_init (void) { tmr->loadreg = CONFIG_SYS_TIMER_0_PRELOAD; tmr->control = TIMER_INTERRUPT | TIMER_RESET; @@ -68,6 +68,7 @@ void timer_init (void) TIMER_ENABLE | TIMER_ENABLE_INTR | TIMER_RELOAD | TIMER_DOWN_COUNT; reset_timer (); install_interrupt_handler (CONFIG_SYS_TIMER_0_IRQ, timer_isr, (void *)tmr); + return 0; } #endif #endif |