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

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

diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c
index bc1656f73ce535685e6563433f94ad0aa7d62a38..d970a1e4f02c480dd3b665b185bed700f6c4bc1f 100644 (file)
--- a/arch/sh/lib/time.c
+++ b/arch/sh/lib/time.c
@@ -2,156 +2,57 @@
  * (C) Copyright 2009
  * Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
  *
- * (C) Copyright 2007-2010
+ * (C) Copyright 2007-2012
  * Nobobuhiro Iwamatsu <iwamatsu@nigauri.org>
  *
  * (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>
-#include <div64.h>
 #include <asm/processor.h>
-#include <asm/clk.h>
 #include <asm/io.h>
+#include <sh_tmu.h>
 
-#define TMU_MAX_COUNTER (~0UL)
+#define TCR_TPSC 0x07
 
-static ulong timer_freq;
-static unsigned long last_tcnt;
-static unsigned long long overflow_ticks;
+static struct tmu_regs *tmu = (struct tmu_regs *)TMU_BASE;
 
-static inline unsigned long long tick_to_time(unsigned long long tick)
+unsigned long get_tbclk(void)
 {
-       tick *= CONFIG_SYS_HZ;
-       do_div(tick, timer_freq);
-
-       return tick;
+       u16 tmu_bit = (ffs(CONFIG_SYS_TMU_CLK_DIV) >> 1) - 1;
+       return get_tmu0_clk_rate() >> ((tmu_bit + 1) * 2);
 }
 
-static inline unsigned long long usec_to_tick(unsigned long long usec)
+unsigned long timer_read_counter(void)
 {
-       usec *= timer_freq;
-       do_div(usec, 1000000);
-
-       return usec;
+       return ~readl(&tmu->tcnt0);
 }
 
-static void tmu_timer_start (unsigned int timer)
+static void tmu_timer_start(unsigned int timer)
 {
        if (timer > 2)
                return;
-       writeb(readb(TSTR) | (1 << timer), TSTR);
+       writeb(readb(&tmu->tstr) | (1 << timer), &tmu->tstr);
 }
 
-static void tmu_timer_stop (unsigned int timer)
+static void tmu_timer_stop(unsigned int timer)
 {
        if (timer > 2)
                return;
-       writeb(readb(TSTR) & ~(1 << timer), TSTR);
+       writeb(readb(&tmu->tstr) & ~(1 << timer), &tmu->tstr);
 }
 
-int timer_init (void)
+int timer_init(void)
 {
-       /* Divide clock by CONFIG_SYS_TMU_CLK_DIV */
-       u16 bit = 0;
-
-       switch (CONFIG_SYS_TMU_CLK_DIV) {
-       case 1024:
-               bit = 4;
-               break;
-       case 256:
-               bit = 3;
-               break;
-       case 64:
-               bit = 2;
-               break;
-       case 16:
-               bit = 1;
-               break;
-       case 4:
-       default:
-               break;
-       }
-       writew(readw(TCR0) | bit, TCR0);
-
-       /* Calc clock rate */
-       timer_freq = get_tmu0_clk_rate() >> ((bit + 1) * 2);
+       u16 tmu_bit = (ffs(CONFIG_SYS_TMU_CLK_DIV) >> 1) - 1;
+       writew((readw(&tmu->tcr0) & ~TCR_TPSC) | tmu_bit, &tmu->tcr0);
 
        tmu_timer_stop(0);
        tmu_timer_start(0);
 
-       last_tcnt = 0;
-       overflow_ticks = 0;
-
        return 0;
 }
 
-unsigned long long get_ticks (void)
-{
-       unsigned long tcnt = 0 - readl(TCNT0);
-       unsigned long ticks;
-
-       if (last_tcnt > tcnt) { /* overflow */
-               overflow_ticks++;
-               ticks = (0xffffffff - last_tcnt) + tcnt;
-       } else {
-               ticks = tcnt;
-       }
-       last_tcnt = tcnt;
-
-       return (overflow_ticks << 32) | tcnt;
-}
-
-void __udelay (unsigned long usec)
-{
-       unsigned long long tmp;
-       ulong tmo;
-
-       tmo = usec_to_tick(usec);
-       tmp = get_ticks() + tmo;        /* get current timestamp */
-
-       while (get_ticks() < tmp)       /* loop till event */
-                /*NOP*/;
-}
-
-unsigned long get_timer (unsigned long base)
-{
-       /* return msec */
-       return tick_to_time(get_ticks()) - base;
-}
-
-void set_timer (unsigned long t)
-{
-       writel((0 - t), TCNT0);
-}
-
-void reset_timer (void)
-{
-       tmu_timer_stop(0);
-       set_timer (0);
-       tmu_timer_start(0);
-}
-
-unsigned long get_tbclk (void)
-{
-       return timer_freq;
-}