powerpc: Partialy restore core of mpc8xx

[u-boot] / arch / powerpc / lib / time.c

diff --git a/arch/powerpc/lib/time.c b/arch/powerpc/lib/time.c
index 29099612db4f4d46d243eed2546a98d997c6597f..4cbb65eb680dc6d096af6901b21e900d73582a71 100644 (file)
--- a/arch/powerpc/lib/time.c
+++ b/arch/powerpc/lib/time.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2000, 2001
  * 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>
@@ -76,9 +60,11 @@ unsigned long ticks2usec(unsigned long ticks)
 #endif
 /* ------------------------------------------------------------------------- */
 
-int init_timebase (void)
+int timer_init(void)
 {
-#if defined(CONFIG_5xx) || defined(CONFIG_8xx)
+       unsigned long temp;
+
+#if defined(CONFIG_8xx)
        volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
        /* unlock */
@@ -86,9 +72,10 @@ int init_timebase (void)
 #endif
 
        /* reset */
-       asm ("li 3,0 ; mttbu 3 ; mttbl 3 ;");
+       asm volatile("li %0,0 ; mttbu %0 ; mttbl %0;"
+            : "=&r"(temp) );
 
-#if defined(CONFIG_5xx) || defined(CONFIG_8xx)
+#if defined(CONFIG_8xx)
        /* enable */
        immap->im_sit.sit_tbscr |= TBSCR_TBE;
 #endif