Merge branch 'u-boot/master' into u-boot-arm/master

[karo-tx-uboot.git] / arch / m68k / lib / time.c

diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c
index a316cdfd4ed413f0646aacdb99b41aefcca4e07d..a85c22bcb3afabb128be0069d583e6ebbc5ff11c 100644 (file)
--- a/arch/m68k/lib/time.c
+++ b/arch/m68k/lib/time.c
@@ -4,23 +4,7 @@
  * (C) Copyright 2000
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+ 
  */
 
 #include <common.h>
@@ -91,7 +75,7 @@ void dtimer_interrupt(void *not_used)
        }
 }
 
-void timer_init(void)
+int timer_init(void)
 {
        volatile dtmr_t *timerp = (dtmr_t *) (CONFIG_SYS_TMR_BASE);
 
@@ -114,6 +98,8 @@ void timer_init(void)
        /* set a period of 1us, set timer mode to restart and enable timer and interrupt */
        timerp->tmr = CONFIG_SYS_TIMER_PRESCALER | DTIM_DTMR_CLK_DIV1 |
            DTIM_DTMR_FRR | DTIM_DTMR_ORRI | DTIM_DTMR_RST_EN;
+
+       return 0;
 }
 
 ulong get_timer(ulong base)
@@ -162,6 +148,8 @@ void timer_init(void)
        timerp->pcsr = PIT_PCSR_OVW;
        timerp->pmr = lastinc = 0;
        timerp->pcsr |= PIT_PCSR_PRE(CONFIG_SYS_PIT_PRESCALE) | PIT_PCSR_EN;
+
+       return 0;
 }
 
 ulong get_timer(ulong base)