ARM: tegra: convert to common timer code

Convert tegra to use the commmon timer code.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>

diff --git a/arch/arm/cpu/tegra-common/Makefile b/arch/arm/cpu/tegra-common/Makefile
index 3aac655099889a24f4a81e396098abe07fe661e5..edfc1a83a950fb2767be371f55781acc690f45a5 100644 (file)
--- a/arch/arm/cpu/tegra-common/Makefile
+++ b/arch/arm/cpu/tegra-common/Makefile
@@ -8,4 +8,4 @@
 #
 
 obj-y += lowlevel_init.o
-obj-y  += ap.o board.o sys_info.o timer.o clock.o cache.o
+obj-y  += ap.o board.o sys_info.o clock.o cache.o

diff --git a/arch/arm/cpu/tegra-common/timer.c b/arch/arm/cpu/tegra-common/timer.c
deleted file mode 100644 (file)
index d0f783e..0000000
--- a/arch/arm/cpu/tegra-common/timer.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * (C) Copyright 2010,2011
- * NVIDIA Corporation <www.nvidia.com>
- *
- * (C) Copyright 2008
- * Texas Instruments
- *
- * Richard Woodruff <r-woodruff2@ti.com>
- * Syed Moahmmed Khasim <khasim@ti.com>
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
- * Alex Zuepke <azu@sysgo.de>
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/io.h>
-#include <asm/arch/tegra.h>
-#include <asm/arch-tegra/timer.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/* counter runs at 1MHz */
-#define TIMER_CLK      1000000
-#define TIMER_LOAD_VAL 0xffffffff
-
-/* timer without interrupts */
-ulong get_timer(ulong base)
-{
-       return get_timer_masked() - base;
-}
-
-/* delay x useconds */
-void __udelay(unsigned long usec)
-{
-       long tmo = usec * (TIMER_CLK / 1000) / 1000;
-       unsigned long now, last = timer_get_us();
-
-       while (tmo > 0) {
-               now = timer_get_us();
-               if (last > now) /* count up timer overflow */
-                       tmo -= TIMER_LOAD_VAL - last + now;
-               else
-                       tmo -= now - last;
-               last = now;
-       }
-}
-
-ulong get_timer_masked(void)
-{
-       ulong now;
-
-       /* current tick value */
-       now = timer_get_us() / (TIMER_CLK / CONFIG_SYS_HZ);
-
-       if (now >= gd->arch.lastinc)    /* normal mode (non roll) */
-               /* move stamp forward with absolute diff ticks */
-               gd->arch.tbl += (now - gd->arch.lastinc);
-       else    /* we have rollover of incrementer */
-               gd->arch.tbl += ((TIMER_LOAD_VAL / (TIMER_CLK / CONFIG_SYS_HZ))
-                               - gd->arch.lastinc) + now;
-       gd->arch.lastinc = now;
-       return gd->arch.tbl;
-}
-
-/*
- * This function is derived from PowerPC code (read timebase as long long).
- * On ARM it just returns the timer value.
- */
-unsigned long long get_ticks(void)
-{
-       return get_timer(0);
-}
-
-/*
- * This function is derived from PowerPC code (timebase clock frequency).
- * On ARM it returns the number of timer ticks per second.
- */
-ulong get_tbclk(void)
-{
-       return CONFIG_SYS_HZ;
-}
-
-unsigned long timer_get_us(void)
-{
-       struct timerus *timer_base = (struct timerus *)NV_PA_TMRUS_BASE;
-
-       return readl(&timer_base->cntr_1us);
-}

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index fc49acb28fa3f71423f4b88910014c11bd23e2b4..522cd4133d7724725862e56e576c75bac2f5d0aa 100644 (file)
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -19,6 +19,9 @@
 
 #include <asm/arch/tegra.h>            /* get chip and board defs */
 
+#define CONFIG_SYS_TIMER_RATE          1000000
+#define CONFIG_SYS_TIMER_COUNTER       NV_PA_TMRUS_BASE
+
 /*
  * Display CPU and Board information
  */