ARM: mx28: Remove CONFIG_ARCH_CPU_INIT

[oweals/u-boot.git] / arch / arm / cpu / arm926ejs / spear / timer.c

diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c
index 06858b4a13bacf4fcaad376eff0a7aed407cd7d1..1dc78600c2b17d5d688ab4fb10b8f434cff17445 100644 (file)
--- a/arch/arm/cpu/arm926ejs/spear/timer.c
+++ b/arch/arm/cpu/arm926ejs/spear/timer.c
@@ -36,8 +36,10 @@ static struct gpt_regs *const gpt_regs_p =
 static struct misc_regs *const misc_regs_p =
     (struct misc_regs *)CONFIG_SPEAR_MISCBASE;
 
-static ulong timestamp;
-static ulong lastdec;
+DECLARE_GLOBAL_DATA_PTR;
+
+#define timestamp gd->tbl
+#define lastdec gd->lastinc
 
 int timer_init(void)
 {
@@ -66,7 +68,9 @@ int timer_init(void)
        /* auto reload, start timer */
        writel(readl(&gpt_regs_p->control) | GPT_ENABLE, &gpt_regs_p->control);
 
-       reset_timer_masked();
+       /* Reset the timer */
+       lastdec = READ_TIMER();
+       timestamp = 0;
 
        return 0;
 }
@@ -74,22 +78,11 @@ int timer_init(void)
 /*
  * timer without interrupts
  */
-
-void reset_timer(void)
-{
-       reset_timer_masked();
-}
-
 ulong get_timer(ulong base)
 {
        return (get_timer_masked() / GPT_RESOLUTION) - base;
 }
 
-void set_timer(ulong t)
-{
-       timestamp = t;
-}
-
 void __udelay(unsigned long usec)
 {
        ulong tmo;
@@ -106,13 +99,6 @@ void __udelay(unsigned long usec)
                ;
 }
 
-void reset_timer_masked(void)
-{
-       /* reset time */
-       lastdec = READ_TIMER();
-       timestamp = 0;
-}
-
 ulong get_timer_masked(void)
 {
        ulong now = READ_TIMER();