Skip to content
Snippets Groups Projects
Commit 4769be21 authored by Graeme Russ's avatar Graeme Russ Committed by Wolfgang Denk
Browse files

Timer: Remove reset_timer() for non-Nios2 arches

parent e110c4fe
No related branches found
No related tags found
No related merge requests found
Showing
with 1 addition and 111 deletions
...@@ -113,11 +113,6 @@ void reset_timer_masked (void) ...@@ -113,11 +113,6 @@ void reset_timer_masked (void)
gd->tbl = 0; /* start "advancing" time stamp from 0 */ gd->tbl = 0; /* start "advancing" time stamp from 0 */
} }
void reset_timer(void)
{
reset_timer_masked();
}
unsigned long long get_ticks (void) unsigned long long get_ticks (void)
{ {
ulong now = GPTCNT; /* current tick value */ ulong now = GPTCNT; /* current tick value */
......
...@@ -73,11 +73,6 @@ inline ulong get_timer_masked(void) ...@@ -73,11 +73,6 @@ inline ulong get_timer_masked(void)
return val; return val;
} }
void reset_timer(void)
{
reset_timer_masked();
}
ulong get_timer(ulong base) ulong get_timer(ulong base)
{ {
ulong tmp; ulong tmp;
......
...@@ -57,11 +57,6 @@ int timer_init (void) ...@@ -57,11 +57,6 @@ int timer_init (void)
/* /*
* timer without interrupts * timer without interrupts
*/ */
void reset_timer (void)
{
reset_timer_masked ();
}
ulong get_timer (ulong base) ulong get_timer (ulong base)
{ {
return get_timer_masked () - base; return get_timer_masked () - base;
......
...@@ -142,11 +142,6 @@ void reset_timer_masked(void) ...@@ -142,11 +142,6 @@ void reset_timer_masked(void)
timestamp = 0; timestamp = 0;
} }
void reset_timer(void)
{
reset_timer_masked();
}
ulong get_timer_masked(void) ulong get_timer_masked(void)
{ {
unsigned long long res = get_ticks(); unsigned long long res = get_ticks();
......
...@@ -60,15 +60,6 @@ int timer_init(void) ...@@ -60,15 +60,6 @@ int timer_init(void)
return 0; return 0;
} }
void reset_timer(void)
{
lastinc = timestamp = 0;
__raw_writel(0, &regs->tcr);
__raw_writel(0, &regs->tim34);
__raw_writel(2 << 22, &regs->tcr);
}
static ulong get_timer_raw(void) static ulong get_timer_raw(void)
{ {
ulong now = __raw_readl(&regs->tim34); ulong now = __raw_readl(&regs->tim34);
......
...@@ -209,11 +209,6 @@ int timer_init (void) ...@@ -209,11 +209,6 @@ int timer_init (void)
#if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_NETARM) || defined(CONFIG_ARMADILLO) || defined(CONFIG_LPC2292) #if defined(CONFIG_IMPA7) || defined(CONFIG_EP7312) || defined(CONFIG_NETARM) || defined(CONFIG_ARMADILLO) || defined(CONFIG_LPC2292)
void reset_timer (void)
{
reset_timer_masked ();
}
ulong get_timer (ulong base) ulong get_timer (ulong base)
{ {
return get_timer_masked () - base; return get_timer_masked () - base;
......
...@@ -81,12 +81,6 @@ void reset_timer_masked(void) ...@@ -81,12 +81,6 @@ void reset_timer_masked(void)
debug("%s(): lastdec = %lx\n", __func__, lastdec); debug("%s(): lastdec = %lx\n", __func__, lastdec);
} }
void reset_timer(void)
{
debug("%s()\n", __func__);
reset_timer_masked();
}
/* /*
* return timer ticks * return timer ticks
*/ */
......
...@@ -72,12 +72,6 @@ int timer_init(void) ...@@ -72,12 +72,6 @@ int timer_init(void)
/* /*
* timer without interrupts * timer without interrupts
*/ */
void reset_timer(void)
{
reset_timer_masked();
}
ulong get_timer(ulong base) ulong get_timer(ulong base)
{ {
return get_timer_masked() - base; return get_timer_masked() - base;
......
...@@ -71,12 +71,6 @@ int timer_init (void) ...@@ -71,12 +71,6 @@ int timer_init (void)
/* /*
* timer without interrupts * timer without interrupts
*/ */
void reset_timer (void)
{
reset_timer_masked ();
}
ulong get_timer (ulong base) ulong get_timer (ulong base)
{ {
return get_timer_masked () - base; return get_timer_masked () - base;
......
...@@ -97,11 +97,6 @@ void reset_timer_masked(void) ...@@ -97,11 +97,6 @@ void reset_timer_masked(void)
timer.ticks = 0; timer.ticks = 0;
} }
void reset_timer(void)
{
reset_timer_masked();
}
void __udelay(unsigned long usec) void __udelay(unsigned long usec)
{ {
unsigned long long target; unsigned long long target;
......
...@@ -51,12 +51,6 @@ int timer_init (void) ...@@ -51,12 +51,6 @@ int timer_init (void)
/* /*
* timer without interrupts * timer without interrupts
*/ */
void reset_timer (void)
{
reset_timer_masked ();
}
ulong get_timer (ulong base) ulong get_timer (ulong base)
{ {
return get_timer_masked() - base; return get_timer_masked() - base;
......
...@@ -33,7 +33,7 @@ ulong timer_ticks; ...@@ -33,7 +33,7 @@ ulong timer_ticks;
int timer_init (void) int timer_init (void)
{ {
reset_timer(); reset_timer_masked();
return 0; return 0;
} }
...@@ -55,11 +55,6 @@ void reset_timer_masked(void) ...@@ -55,11 +55,6 @@ void reset_timer_masked(void)
timer_ticks = 0; timer_ticks = 0;
} }
void reset_timer(void)
{
reset_timer_masked();
}
ulong get_timer_masked(void) ulong get_timer_masked(void)
{ {
/* Check for timer wrap */ /* Check for timer wrap */
......
...@@ -83,12 +83,6 @@ int timer_init(void) ...@@ -83,12 +83,6 @@ int timer_init(void)
/* /*
* timer without interrupts * timer without interrupts
*/ */
void reset_timer(void)
{
reset_timer_masked();
}
ulong get_timer(ulong base) ulong get_timer(ulong base)
{ {
return get_timer_masked() - base; return get_timer_masked() - base;
......
...@@ -64,12 +64,6 @@ int timer_init (void) ...@@ -64,12 +64,6 @@ int timer_init (void)
/* /*
* timer without interrupts * timer without interrupts
*/ */
void reset_timer (void)
{
reset_timer_masked ();
}
ulong get_timer (ulong base) ulong get_timer (ulong base)
{ {
return get_timer_masked () - base; return get_timer_masked () - base;
......
...@@ -100,11 +100,6 @@ ulong get_timer_masked(void) ...@@ -100,11 +100,6 @@ ulong get_timer_masked(void)
return gd->tbu; return gd->tbu;
} }
void reset_timer(void)
{
reset_timer_masked();
}
ulong get_timer(ulong base) ulong get_timer(ulong base)
{ {
return ((get_timer_masked() / (CONFIG_SYS_HZ_CLOCK / 1000)) - return ((get_timer_masked() / (CONFIG_SYS_HZ_CLOCK / 1000)) -
......
...@@ -78,11 +78,6 @@ int timer_init(void) ...@@ -78,11 +78,6 @@ int timer_init(void)
return(0); return(0);
} }
void reset_timer(void)
{
gd->timer_reset_value = get_ticks();
}
/* /*
* Get the current 64 bit timer tick count * Get the current 64 bit timer tick count
*/ */
......
...@@ -112,11 +112,6 @@ ulong get_timer_masked(void) ...@@ -112,11 +112,6 @@ ulong get_timer_masked(void)
return timestamp; return timestamp;
} }
void reset_timer(void)
{
reset_timer_masked();
}
ulong get_timer(ulong base) ulong get_timer(ulong base)
{ {
return get_timer_masked() - base; return get_timer_masked() - base;
......
...@@ -121,11 +121,6 @@ void __udelay(unsigned long usec) ...@@ -121,11 +121,6 @@ void __udelay(unsigned long usec)
/*NOP*/; /*NOP*/;
} }
void reset_timer(void)
{
reset_timer_masked();
}
ulong get_timer(ulong base) ulong get_timer(ulong base)
{ {
return get_timer_masked() - base; return get_timer_masked() - base;
......
...@@ -130,11 +130,6 @@ void reset_timer_masked(void) ...@@ -130,11 +130,6 @@ void reset_timer_masked(void)
timestamp = 0; /* start "advancing" time stamp from 0 */ timestamp = 0; /* start "advancing" time stamp from 0 */
} }
void reset_timer(void)
{
reset_timer_masked();
}
unsigned long long get_ticks (void) unsigned long long get_ticks (void)
{ {
struct gpt_regs *gpt = (struct gpt_regs *)IMX_GPT1_BASE; struct gpt_regs *gpt = (struct gpt_regs *)IMX_GPT1_BASE;
......
...@@ -133,11 +133,6 @@ void reset_timer_masked(void) ...@@ -133,11 +133,6 @@ void reset_timer_masked(void)
timestamp = 0; /* start "advancing" time stamp from 0 */ timestamp = 0; /* start "advancing" time stamp from 0 */
} }
void reset_timer(void)
{
reset_timer_masked();
}
unsigned long long get_ticks (void) unsigned long long get_ticks (void)
{ {
struct gpt_regs *regs = (struct gpt_regs *)IMX_TIM1_BASE; struct gpt_regs *regs = (struct gpt_regs *)IMX_TIM1_BASE;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment