Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

[platform/kernel/u-boot.git] / arch / sh / lib / time_sh2.c

diff --git a/arch/sh/lib/time_sh2.c b/arch/sh/lib/time_sh2.c
index 789b46f..be3896c 100644 (file)
--- a/arch/sh/lib/time_sh2.c
+++ b/arch/sh/lib/time_sh2.c
@@ -5,23 +5,7 @@
  * (C) Copyright 2003
  * 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>
@@ -54,7 +38,7 @@ int timer_init(void)
 
        /* User Device 0 only */
        cmt_timer_stop(0);
-       set_timer(CMT_TIMER_RESET);
+       writew(CMT_TIMER_RESET, CMCOR_0);
        cmt_timer_start(0);
 
        return 0;
@@ -90,19 +74,6 @@ ulong get_timer(ulong base)
        return (get_usec() / 1000) - base;
 }
 
-void set_timer(ulong t)
-{
-       writew((u16) t, CMCOR_0);
-}
-
-void reset_timer(void)
-{
-       cmt_timer_stop(0);
-       set_timer(CMT_TIMER_RESET);
-       cmt0_timer = 0;
-       cmt_timer_start(0);
-}
-
 void __udelay(unsigned long usec)
 {
        unsigned long end = get_usec() + usec;