arm: remove prototype for get_timer_masked

The interruption support had be removed for ARM architecture and
the function get_timer_masked() is no more used except in some
the timer.c files.

This patch clean each timer.c which implement this function and
remove the associated prototype in u-boot-arm.h

For timer.c, I don't verify if the weak version of get_timer
(in lib/time.c) can be used

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
lime2-spi
Patrick Delaunay 6 years ago committed by Tom Rini
parent aa33fe8695
commit 6180ea7e66
  1. 7
      arch/arm/cpu/arm920t/ep93xx/timer.c
  2. 8
      arch/arm/cpu/arm920t/imx/timer.c
  3. 2
      arch/arm/cpu/arm926ejs/armada100/timer.c
  4. 2
      arch/arm/cpu/arm926ejs/mx27/timer.c
  5. 7
      arch/arm/cpu/arm926ejs/mxs/timer.c
  6. 4
      arch/arm/cpu/arm926ejs/spear/timer.c
  7. 7
      arch/arm/cpu/armv7/ls102xa/timer.c
  8. 4
      arch/arm/cpu/armv7/stv0991/timer.c
  9. 12
      arch/arm/cpu/armv7/sunxi/timer.c
  10. 7
      arch/arm/cpu/armv7/vf610/timer.c
  11. 8
      arch/arm/cpu/sa1100/timer.c
  12. 3
      arch/arm/include/asm/u-boot-arm.h
  13. 12
      arch/arm/mach-at91/arm920t/timer.c
  14. 7
      arch/arm/mach-imx/syscounter.c
  15. 3
      arch/arm/mach-omap2/timer.c
  16. 2
      arch/arm/mach-orion5x/timer.c
  17. 45
      board/armltd/integrator/timer.c

@ -66,14 +66,9 @@ unsigned long long get_ticks(void)
return sys_ticks; return sys_ticks;
} }
unsigned long get_timer_masked(void)
{
return get_ticks();
}
unsigned long get_timer(unsigned long base) unsigned long get_timer(unsigned long base)
{ {
return get_timer_masked() - base; return get_ticks() - base;
} }
void __udelay(unsigned long usec) void __udelay(unsigned long usec)

@ -36,14 +36,14 @@ int timer_init (void)
/* /*
* timer without interrupts * timer without interrupts
*/ */
ulong get_timer (ulong base) static ulong get_timer_masked (void)
{ {
return get_timer_masked() - base; return TCN1;
} }
ulong get_timer_masked (void) ulong get_timer (ulong base)
{ {
return TCN1; return get_timer_masked() - base;
} }
void __udelay (unsigned long usec) void __udelay (unsigned long usec)

@ -61,7 +61,7 @@ ulong read_timer(void)
return(readl(&armd1timers->cvwr)); return(readl(&armd1timers->cvwr));
} }
ulong get_timer_masked(void) static ulong get_timer_masked(void)
{ {
ulong now = read_timer(); ulong now = read_timer();

@ -126,7 +126,7 @@ unsigned long long get_ticks(void)
return timestamp; return timestamp;
} }
ulong get_timer_masked(void) static ulong get_timer_masked(void)
{ {
/* /*
* get_ticks() returns a long long (64 bit), it wraps in * get_ticks() returns a long long (64 bit), it wraps in

@ -110,14 +110,9 @@ unsigned long long get_ticks(void)
return timestamp; return timestamp;
} }
ulong get_timer_masked(void)
{
return tick_to_time(get_ticks());
}
ulong get_timer(ulong base) ulong get_timer(ulong base)
{ {
return get_timer_masked() - base; return tick_to_time(get_ticks()) - base;
} }
/* We use the HW_DIGCTL_MICROSECONDS register for sub-millisecond timer. */ /* We use the HW_DIGCTL_MICROSECONDS register for sub-millisecond timer. */

@ -21,6 +21,8 @@ static struct misc_regs *const misc_regs_p =
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
static ulong get_timer_masked(void);
#define timestamp gd->arch.tbl #define timestamp gd->arch.tbl
#define lastdec gd->arch.lastinc #define lastdec gd->arch.lastinc
@ -82,7 +84,7 @@ void __udelay(unsigned long usec)
; ;
} }
ulong get_timer_masked(void) static ulong get_timer_masked(void)
{ {
ulong now = READ_TIMER(); ulong now = READ_TIMER();

@ -90,14 +90,9 @@ unsigned long long get_ticks(void)
return now; return now;
} }
unsigned long get_timer_masked(void)
{
return tick_to_time(get_ticks());
}
unsigned long get_timer(ulong base) unsigned long get_timer(ulong base)
{ {
return get_timer_masked() - base; return tick_to_time(get_ticks()) - base;
} }
/* delay x useconds and preserve advance timstamp value */ /* delay x useconds and preserve advance timstamp value */

@ -21,6 +21,8 @@ DECLARE_GLOBAL_DATA_PTR;
#define timestamp gd->arch.tbl #define timestamp gd->arch.tbl
#define lastdec gd->arch.lastinc #define lastdec gd->arch.lastinc
static ulong get_timer_masked(void);
int timer_init(void) int timer_init(void)
{ {
/* Timer1 clock configuration */ /* Timer1 clock configuration */
@ -73,7 +75,7 @@ void __udelay(unsigned long usec)
; ;
} }
ulong get_timer_masked(void) static ulong get_timer_masked(void)
{ {
ulong now = READ_TIMER(); ulong now = READ_TIMER();

@ -55,12 +55,7 @@ int timer_init(void)
} }
/* timer without interrupts */ /* timer without interrupts */
ulong get_timer(ulong base) static ulong get_timer_masked(void)
{
return get_timer_masked() - base;
}
ulong get_timer_masked(void)
{ {
/* current tick value */ /* current tick value */
ulong now = TICKS_TO_HZ(read_timer()); ulong now = TICKS_TO_HZ(read_timer());
@ -77,6 +72,11 @@ ulong get_timer_masked(void)
return gd->arch.tbl; return gd->arch.tbl;
} }
ulong get_timer(ulong base)
{
return get_timer_masked() - base;
}
/* delay x useconds */ /* delay x useconds */
void __udelay(unsigned long usec) void __udelay(unsigned long usec)
{ {

@ -57,14 +57,9 @@ unsigned long long get_ticks(void)
return (((unsigned long long)gd->arch.tbu) << 32) | gd->arch.tbl; return (((unsigned long long)gd->arch.tbu) << 32) | gd->arch.tbl;
} }
ulong get_timer_masked(void)
{
return tick_to_time(get_ticks());
}
ulong get_timer(ulong base) ulong get_timer(ulong base)
{ {
return get_timer_masked() - base; return tick_to_time(get_ticks()) - base;
} }
/* delay x useconds AND preserve advance timstamp value */ /* delay x useconds AND preserve advance timstamp value */

@ -12,14 +12,14 @@
#include <common.h> #include <common.h>
#include <SA-1100.h> #include <SA-1100.h>
ulong get_timer (ulong base) static ulong get_timer_masked (void)
{ {
return get_timer_masked (); return OSCR;
} }
ulong get_timer_masked (void) ulong get_timer (ulong base)
{ {
return OSCR; return get_timer_masked ();
} }
void __udelay (unsigned long usec) void __udelay (unsigned long usec)

@ -38,9 +38,6 @@ int arch_early_init_r(void);
/* board/.../... */ /* board/.../... */
int board_init(void); int board_init(void);
/* cpu/.../interrupt.c */
ulong get_timer_masked (void);
/* calls to c from vectors.S */ /* calls to c from vectors.S */
struct pt_regs; struct pt_regs;

@ -53,11 +53,6 @@ int timer_init(void)
/* /*
* timer without interrupts * timer without interrupts
*/ */
ulong get_timer(ulong base)
{
return get_timer_masked() - base;
}
ulong get_timer_raw(void) ulong get_timer_raw(void)
{ {
at91_tc_t *tc = (at91_tc_t *) ATMEL_BASE_TC; at91_tc_t *tc = (at91_tc_t *) ATMEL_BASE_TC;
@ -77,11 +72,16 @@ ulong get_timer_raw(void)
return gd->arch.tbl; return gd->arch.tbl;
} }
ulong get_timer_masked(void) static ulong get_timer_masked(void)
{ {
return get_timer_raw()/TIMER_LOAD_VAL; return get_timer_raw()/TIMER_LOAD_VAL;
} }
ulong get_timer(ulong base)
{
return get_timer_masked() - base;
}
void __udelay(unsigned long usec) void __udelay(unsigned long usec)
{ {
u32 tmo; u32 tmo;

@ -89,14 +89,9 @@ unsigned long long get_ticks(void)
return now; return now;
} }
ulong get_timer_masked(void)
{
return tick_to_time(get_ticks());
}
ulong get_timer(ulong base) ulong get_timer(ulong base)
{ {
return get_timer_masked() - base; return tick_to_time(get_ticks()) - base;
} }
void __udelay(unsigned long usec) void __udelay(unsigned long usec)

@ -23,6 +23,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
static struct gptimer *timer_base = (struct gptimer *)CONFIG_SYS_TIMERBASE; static struct gptimer *timer_base = (struct gptimer *)CONFIG_SYS_TIMERBASE;
static ulong get_timer_masked(void);
/* /*
* Nothing really to do with interrupts, just starts up a counter. * Nothing really to do with interrupts, just starts up a counter.
@ -67,7 +68,7 @@ void __udelay(unsigned long usec)
} }
} }
ulong get_timer_masked(void) static ulong get_timer_masked(void)
{ {
/* current tick value */ /* current tick value */
ulong now = readl(&timer_base->tcrr) / (TIMER_CLOCK / CONFIG_SYS_HZ); ulong now = readl(&timer_base->tcrr) / (TIMER_CLOCK / CONFIG_SYS_HZ);

@ -78,7 +78,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define timestamp gd->arch.tbl #define timestamp gd->arch.tbl
#define lastdec gd->arch.lastinc #define lastdec gd->arch.lastinc
ulong get_timer_masked(void) static ulong get_timer_masked(void)
{ {
ulong now = read_timer(); ulong now = read_timer();

@ -93,31 +93,10 @@ int timer_init (void)
/* /*
* timer without interrupts * timer without interrupts
*/ */
ulong get_timer (ulong base_ticks)
{
return get_timer_masked () - base_ticks;
}
/* delay usec useconds */
void __udelay (unsigned long usec)
{
ulong tmo, tmp;
/* Convert to U-Boot ticks */
tmo = usec * CONFIG_SYS_HZ;
tmo /= (1000000L);
tmp = get_timer_masked(); /* get current timestamp */
tmo += tmp; /* form target timestamp */
while (get_timer_masked () < tmo) {/* loop till event */
/*NOP*/;
}
}
/* converts the timer reading to U-Boot ticks */ /* converts the timer reading to U-Boot ticks */
/* the timestamp is the number of ticks since reset */ /* the timestamp is the number of ticks since reset */
ulong get_timer_masked (void) static ulong get_timer_masked (void)
{ {
/* get current count */ /* get current count */
unsigned long long now = READ_TIMER; unsigned long long now = READ_TIMER;
@ -138,6 +117,28 @@ ulong get_timer_masked (void)
return timestamp; return timestamp;
} }
ulong get_timer (ulong base_ticks)
{
return get_timer_masked () - base_ticks;
}
/* delay usec useconds */
void __udelay (unsigned long usec)
{
ulong tmo, tmp;
/* Convert to U-Boot ticks */
tmo = usec * CONFIG_SYS_HZ;
tmo /= (1000000L);
tmp = get_timer_masked(); /* get current timestamp */
tmo += tmp; /* form target timestamp */
while (get_timer_masked () < tmo) {/* loop till event */
/*NOP*/;
}
}
/* /*
* This function is derived from PowerPC code (read timebase as long long). * This function is derived from PowerPC code (read timebase as long long).
* On ARM it just returns the timer value. * On ARM it just returns the timer value.

Loading…
Cancel
Save