brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-29 08:00:26 +09:00
Code Issues Projects Releases Wiki Activity

arm: Move timer_rate_hz into arch_global_data

Browse Source 
Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2012-12-13 20:48:32 +00:00 committed by Tom Rini
parent f47e6ecd5d
commit b339051c0d
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/cpu/arm920t/a320/timer.c
View File

@ -31,14 +31,14 @@ DECLARE_GLOBAL_DATA_PTR;
static inline unsigned long long tick_to_time(unsigned long long tick) static inline unsigned long long tick_to_time(unsigned long long tick)
{ {
tick *= CONFIG_SYS_HZ; tick *= CONFIG_SYS_HZ;
do_div(tick, gd->timer_rate_hz); do_div(tick, gd->arch.timer_rate_hz);
return tick; return tick;
} }
static inline unsigned long long usec_to_tick(unsigned long long usec) static inline unsigned long long usec_to_tick(unsigned long long usec)
{ {
usec *= gd->timer_rate_hz; usec *= gd->arch.timer_rate_hz;
do_div(usec, 1000000); do_div(usec, 1000000);
return usec; return usec;
@ -74,7 +74,7 @@ int timer_init(void)
cr |= FTTMR010_TM3_ENABLE; cr |= FTTMR010_TM3_ENABLE;
writel(cr, &tmr->cr); writel(cr, &tmr->cr);
gd->timer_rate_hz = TIMER_CLOCK; gd->arch.timer_rate_hz = TIMER_CLOCK;
gd->tbu = gd->tbl = 0; gd->tbu = gd->tbl = 0;
return 0; return 0;
@ -126,5 +126,5 @@ ulong get_timer(ulong base)
*/ */
ulong get_tbclk(void) ulong get_tbclk(void)
{ {
return gd->timer_rate_hz; return gd->arch.timer_rate_hz;
} }

4
arch/arm/cpu/arm920t/s3c24x0/timer.c
View File

@ -52,7 +52,7 @@ int timer_init(void)
* @33.25MHz and 15625 @ 50 MHz * @33.25MHz and 15625 @ 50 MHz
*/ */
gd->tbu = get_PCLK() / (2 * 16 * 100); gd->tbu = get_PCLK() / (2 * 16 * 100);
gd->timer_rate_hz = get_PCLK() / (2 * 16); gd->arch.timer_rate_hz = get_PCLK() / (2 * 16);
} }
/* load value for 10 ms timeout */ /* load value for 10 ms timeout */
writel(gd->tbu, &timers->tcntb4); writel(gd->tbu, &timers->tcntb4);
@ -93,7 +93,7 @@ ulong get_timer_masked(void)
{ {
ulong tmr = get_ticks(); ulong tmr = get_ticks();
return tmr / (gd->timer_rate_hz / CONFIG_SYS_HZ); return tmr / (gd->arch.timer_rate_hz / CONFIG_SYS_HZ);
} }
void udelay_masked(unsigned long usec) void udelay_masked(unsigned long usec)

8
arch/arm/cpu/arm926ejs/at91/timer.c
View File

@ -52,14 +52,14 @@ DECLARE_GLOBAL_DATA_PTR;
static inline unsigned long long tick_to_time(unsigned long long tick) static inline unsigned long long tick_to_time(unsigned long long tick)
{ {
tick *= CONFIG_SYS_HZ; tick *= CONFIG_SYS_HZ;
do_div(tick, gd->timer_rate_hz); do_div(tick, gd->arch.timer_rate_hz);
return tick; return tick;
} }
static inline unsigned long long usec_to_tick(unsigned long long usec) static inline unsigned long long usec_to_tick(unsigned long long usec)
{ {
usec *= gd->timer_rate_hz; usec *= gd->arch.timer_rate_hz;
do_div(usec, 1000000); do_div(usec, 1000000);
return usec; return usec;
@ -79,7 +79,7 @@ int timer_init(void)
/* Enable PITC */ /* Enable PITC */
writel(TIMER_LOAD_VAL | AT91_PIT_MR_EN , &pit->mr); writel(TIMER_LOAD_VAL | AT91_PIT_MR_EN , &pit->mr);
gd->timer_rate_hz = gd->arch.mck_rate_hz / 16; gd->arch.timer_rate_hz = gd->arch.mck_rate_hz / 16;
gd->tbu = gd->tbl = 0; gd->tbu = gd->tbl = 0;
return 0; return 0;
@ -132,5 +132,5 @@ ulong get_timer(ulong base)
*/ */
ulong get_tbclk(void) ulong get_tbclk(void)
{ {
return gd->timer_rate_hz; return gd->arch.timer_rate_hz;
} }

9
arch/arm/cpu/arm926ejs/davinci/timer.c
View File

@ -60,7 +60,7 @@ int timer_init(void)
writel(0x0, &timer->tim34); writel(0x0, &timer->tim34);
writel(TIMER_LOAD_VAL, &timer->prd34); writel(TIMER_LOAD_VAL, &timer->prd34);
writel(2 << 22, &timer->tcr); writel(2 << 22, &timer->tcr);
gd->timer_rate_hz = CONFIG_SYS_HZ_CLOCK / TIM_CLK_DIV; gd->arch.timer_rate_hz = CONFIG_SYS_HZ_CLOCK / TIM_CLK_DIV;
gd->timer_reset_value = 0; gd->timer_reset_value = 0;
return(0); return(0);
@ -87,14 +87,15 @@ ulong get_timer(ulong base)
timer_diff = get_ticks() - gd->timer_reset_value; timer_diff = get_ticks() - gd->timer_reset_value;
return lldiv(timer_diff, (gd->timer_rate_hz / CONFIG_SYS_HZ)) - base; return lldiv(timer_diff,
(gd->arch.timer_rate_hz / CONFIG_SYS_HZ)) - base;
} }
void __udelay(unsigned long usec) void __udelay(unsigned long usec)
{ {
unsigned long long endtime; unsigned long long endtime;
endtime = lldiv((unsigned long long)usec * gd->timer_rate_hz, endtime = lldiv((unsigned long long)usec * gd->arch.timer_rate_hz,
1000000UL); 1000000UL);
endtime += get_ticks(); endtime += get_ticks();
@ -108,7 +109,7 @@ void __udelay(unsigned long usec)
*/ */
ulong get_tbclk(void) ulong get_tbclk(void)
{ {
return gd->timer_rate_hz; return gd->arch.timer_rate_hz;
} }
#ifdef CONFIG_HW_WATCHDOG #ifdef CONFIG_HW_WATCHDOG

3
arch/arm/include/asm/global_data.h
View File

@ -35,6 +35,8 @@ struct arch_global_data {
unsigned long pllb_rate_hz; unsigned long pllb_rate_hz;
unsigned long at91_pllb_usb_init; unsigned long at91_pllb_usb_init;
#endif #endif
/* "static data" needed by most of timer.c on ARM platforms */
unsigned long timer_rate_hz;
}; };
/* /*
@ -61,7 +63,6 @@ typedef struct global_data {
#endif #endif
#ifdef CONFIG_ARM #ifdef CONFIG_ARM
/* "static data" needed by most of timer.c on ARM platforms */ /* "static data" needed by most of timer.c on ARM platforms */
unsigned long timer_rate_hz;
unsigned long tbl; unsigned long tbl;
unsigned long tbu; unsigned long tbu;
unsigned long long timer_reset_value; unsigned long long timer_reset_value;