minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 04:26:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

PXA: Replace timer driver

Browse Source 
This new timer driver shall conform to new Timer API.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
This commit is contained in:
Marek Vasut 2011-11-26 10:02:41 +01:00 committed by Albert ARIBAUD
parent e8de0fa896
commit d1bb9443f0
1 changed files with 35 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
arch/arm/cpu/pxa/timer.c
View File

@ -1,11 +1,7 @@
/* /*
* (C) Copyright 2002 * Marvell PXA2xx/3xx timer driver
* Sysgo Real-Time Solutions, GmbH <www.elinos.com>
* Marius Groeger <mgroeger@sysgo.de>
* *
* (C) Copyright 2002 * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
* Sysgo Real-Time Solutions, GmbH <www.elinos.com>
* Alex Zuepke <azu@sysgo.de>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.
@ -31,55 +27,63 @@
#include <common.h> #include <common.h>
#include <div64.h> #include <div64.h>
#ifdef CONFIG_USE_IRQ DECLARE_GLOBAL_DATA_PTR;
#error: interrupts not implemented yet
#endif #define TIMER_LOAD_VAL 0xffffffff
#define timestamp (gd->tbl)
#define lastinc (gd->lastinc)
#if defined(CONFIG_CPU_PXA27X) || defined(CONFIG_CPU_MONAHANS) #if defined(CONFIG_CPU_PXA27X) || defined(CONFIG_CPU_MONAHANS)
#define TIMER_FREQ_HZ 3250000 #define TIMER_FREQ_HZ 3250000
#elif defined(CONFIG_CPU_PXA25X) #elif defined(CONFIG_CPU_PXA25X)
#define TIMER_FREQ_HZ 3686400 #define TIMER_FREQ_HZ 3686400
#else #else
#error "Timer frequency unknown - please config PXA CPU type" #error "Timer frequency unknown - please config PXA CPU type"
#endif #endif
static inline unsigned long long tick_to_time(unsigned long long tick) static unsigned long long tick_to_time(unsigned long long tick)
{ {
tick *= CONFIG_SYS_HZ; return tick * CONFIG_SYS_HZ / TIMER_FREQ_HZ;
do_div(tick, TIMER_FREQ_HZ);
return tick;
} }
static inline unsigned long long us_to_tick(unsigned long long us) static unsigned long long us_to_tick(unsigned long long us)
{ {
us = us * TIMER_FREQ_HZ + 999999; return (us * TIMER_FREQ_HZ) / 1000000;
do_div(us, 1000000);
return us;
} }
int timer_init (void) int timer_init(void)
{ {
writel(0, OSCR); writel(0, OSCR);
return 0; return 0;
} }
ulong get_timer (ulong base) unsigned long long get_ticks(void)
{ {
return get_timer_masked () - base; /* Current tick value */
uint32_t now = readl(OSCR);
if (now >= lastinc) {
/*
* Normal mode (non roll)
* Move stamp forward with absolute diff ticks
*/
timestamp += (now - lastinc);
} else {
/* We have rollover of incrementer */
timestamp += (TIMER_LOAD_VAL - lastinc) + now;
}
lastinc = now;
return timestamp;
} }
void __udelay (unsigned long usec) ulong get_timer(ulong base)
{ {
udelay_masked (usec); return tick_to_time(get_ticks()) - base;
} }
ulong get_timer_masked (void) void __udelay(unsigned long usec)
{
return tick_to_time(get_ticks());
}
void udelay_masked (unsigned long usec)
{ {
unsigned long long tmp; unsigned long long tmp;
ulong tmo; ulong tmo;
@ -89,25 +93,4 @@ void udelay_masked (unsigned long usec)
while (get_ticks() < tmp) /* loop till event */ while (get_ticks() < tmp) /* loop till event */
/*NOP*/; /*NOP*/;
}
/*
* 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 readl(OSCR);
}
/*
* 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)
{
ulong tbclk;
tbclk = TIMER_FREQ_HZ;
return tbclk;
} }