leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: atmel: arm9: switch to use common timer functions

Browse Source 
Signed-off-by: Bo Shen <voice.shen@atmel.com>
[rebase on current master]
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
This commit is contained in:
Bo Shen 2015-02-04 15:53:01 +08:00 committed by Andreas Bießmann
parent 02fc64d1d9
commit a02c8a31bd
7 changed files with 18 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
arch/arm/mach-at91/arm926ejs/timer.c
View File

@ -33,22 +33,6 @@ DECLARE_GLOBAL_DATA_PTR;
#define TIMER_LOAD_VAL 0xfffff #define TIMER_LOAD_VAL 0xfffff
static inline unsigned long long tick_to_time(unsigned long long tick)
{
tick *= CONFIG_SYS_HZ;
do_div(tick, gd->arch.timer_rate_hz);
return tick;
}
static inline unsigned long long usec_to_tick(unsigned long long usec)
{
usec *= gd->arch.timer_rate_hz;
do_div(usec, 1000000);
return usec;
}
/* /*
* Use the PITC in full 32 bit incrementing mode * Use the PITC in full 32 bit incrementing mode
*/ */
@ -64,53 +48,10 @@ int timer_init(void)
writel(TIMER_LOAD_VAL | AT91_PIT_MR_EN , &pit->mr); writel(TIMER_LOAD_VAL | AT91_PIT_MR_EN , &pit->mr);
gd->arch.timer_rate_hz = gd->arch.mck_rate_hz / 16; gd->arch.timer_rate_hz = gd->arch.mck_rate_hz / 16;
gd->arch.tbu = gd->arch.tbl = 0;
return 0; return 0;
} }
/*
* Get the current 64 bit timer tick count
*/
unsigned long long get_ticks(void)
{
at91_pit_t *pit = (at91_pit_t *) ATMEL_BASE_PIT;
ulong now = readl(&pit->piir);
/* increment tbu if tbl has rolled over */
if (now < gd->arch.tbl)
gd->arch.tbu++;
gd->arch.tbl = now;
return (((unsigned long long)gd->arch.tbu) << 32) | gd->arch.tbl;
}
void __udelay(unsigned long usec)
{
unsigned long long start;
ulong tmo;
start = get_ticks(); /* get current timestamp */
tmo = usec_to_tick(usec); /* convert usecs to ticks */
while ((get_ticks() - start) < tmo)
; /* loop till time has passed */
}
/*
* get_timer(base) can be used to check for timeouts or
* to measure elasped time relative to an event:
*
* ulong start_time = get_timer(0) sets start_time to the current
* time value.
* get_timer(start_time) returns the time elapsed since then.
*
* The time is used in CONFIG_SYS_HZ units!
*/
ulong get_timer(ulong base)
{
return tick_to_time(get_ticks()) - base;
}
/* /*
* Return the number of timer ticks per second. * Return the number of timer ticks per second.
*/ */

3
arch/arm/mach-at91/include/mach/at91sam9260.h
View File

@ -133,6 +133,9 @@
#define ATMEL_BASE_CS6 0x70000000 #define ATMEL_BASE_CS6 0x70000000
#define ATMEL_BASE_CS7 0x80000000 #define ATMEL_BASE_CS7 0x80000000
/* Timer */
#define CONFIG_SYS_TIMER_COUNTER 0xfffffd3c
/* /*
* Other misc defines * Other misc defines
*/ */

3
arch/arm/mach-at91/include/mach/at91sam9261.h
View File

@ -117,6 +117,9 @@
#define ATMEL_BASE_CS6 0x70000000 #define ATMEL_BASE_CS6 0x70000000
#define ATMEL_BASE_CS7 0x80000000 #define ATMEL_BASE_CS7 0x80000000
/* Timer */
#define CONFIG_SYS_TIMER_COUNTER 0xfffffd3c
/* /*
* Other misc defines * Other misc defines
*/ */

3
arch/arm/mach-at91/include/mach/at91sam9263.h
View File

@ -132,6 +132,9 @@
#define ATMEL_BASE_CS6 0x70000000 #define ATMEL_BASE_CS6 0x70000000
#define ATMEL_BASE_CS7 0x80000000 #define ATMEL_BASE_CS7 0x80000000
/* Timer */
#define CONFIG_SYS_TIMER_COUNTER 0xfffffd3c
/* /*
* Other misc defines * Other misc defines
*/ */

3
arch/arm/mach-at91/include/mach/at91sam9g45.h
View File

@ -136,6 +136,9 @@
#define ATMEL_BASE_CS6 0x70000000 #define ATMEL_BASE_CS6 0x70000000
#define ATMEL_BASE_CS7 0x80000000 #define ATMEL_BASE_CS7 0x80000000
/* Timer */
#define CONFIG_SYS_TIMER_COUNTER 0xfffffd3c
/* /*
* Other misc defines * Other misc defines
*/ */

3
arch/arm/mach-at91/include/mach/at91sam9rl.h
View File

@ -116,6 +116,9 @@
#define ATMEL_BASE_CS4 0x50000000 /* Compact Flash Slot 0 */ #define ATMEL_BASE_CS4 0x50000000 /* Compact Flash Slot 0 */
#define ATMEL_BASE_CS5 0x60000000 /* Compact Flash Slot 1 */ #define ATMEL_BASE_CS5 0x60000000 /* Compact Flash Slot 1 */
/* Timer */
#define CONFIG_SYS_TIMER_COUNTER 0xfffffd3c
/* /*
* Other misc defines * Other misc defines
*/ */

3
arch/arm/mach-at91/include/mach/at91sam9x5.h
View File

@ -154,6 +154,9 @@
#define ATMEL_CPU_NAME get_cpu_name() #define ATMEL_CPU_NAME get_cpu_name()
#endif #endif
/* Timer */
#define CONFIG_SYS_TIMER_COUNTER 0xfffffe3c
/* /*
* Other misc defines * Other misc defines
*/ */