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

arm/s5pxx: Fix get_timer_masked to get the time.

Browse Source 
In general, The get_timer_masked function get the system time,
no the number of ticks. Such as the nand_wait_ready will use
get_timer_masked to delay the operations. And change the system
time to adopt to the CONFIG_SYS_HZ.

Signed-off-by: Hongbo Zhong <bocui107@gmail.com>
Tested-by: Jaehoon Chung<jh80.chung@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
This commit is contained in:
Zhong Hongbo 2012-07-02 13:50:49 +00:00 committed by Albert ARIBAUD
parent 42e14f0521
commit 3936b4f057
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv7/s5p-common/pwm.c
View File

@ -170,7 +170,7 @@ int pwm_init(int pwm_id, int div, int invert)
timer_rate_hz = get_pwm_clk() / ((prescaler + 1) * timer_rate_hz = get_pwm_clk() / ((prescaler + 1) *
(div + 1)); (div + 1));
timer_rate_hz = timer_rate_hz / 100; timer_rate_hz = timer_rate_hz / CONFIG_SYS_HZ;
/* set count value */ /* set count value */
offset = pwm_id * 3; offset = pwm_id * 3;

20
arch/arm/cpu/armv7/s5p-common/timer.c
View File

@ -31,6 +31,8 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
unsigned long get_current_tick(void);
/* macro to read the 16 bit timer */ /* macro to read the 16 bit timer */
static inline struct s5p_timer *s5p_get_base_timer(void) static inline struct s5p_timer *s5p_get_base_timer(void)
{ {
@ -44,6 +46,8 @@ int timer_init(void)
pwm_config(4, 0, 0); pwm_config(4, 0, 0);
pwm_enable(4); pwm_enable(4);
reset_timer_masked();
return 0; return 0;
} }
@ -72,16 +76,16 @@ void __udelay(unsigned long usec)
* 3. finish normalize. * 3. finish normalize.
*/ */
tmo = usec / 1000; tmo = usec / 1000;
tmo *= (CONFIG_SYS_HZ * count_value / 10); tmo *= (CONFIG_SYS_HZ * count_value);
tmo /= 1000; tmo /= 1000;
} else { } else {
/* else small number, don't kill it prior to HZ multiply */ /* else small number, don't kill it prior to HZ multiply */
tmo = usec * CONFIG_SYS_HZ * count_value / 10; tmo = usec * CONFIG_SYS_HZ * count_value;
tmo /= (1000 * 1000); tmo /= (1000 * 1000);
} }
/* get current timestamp */ /* get current timestamp */
tmp = get_timer(0); tmp = get_current_tick();
/* if setting this fordward will roll time stamp */ /* if setting this fordward will roll time stamp */
/* reset "advancing" timestamp to 0, set lastinc value */ /* reset "advancing" timestamp to 0, set lastinc value */
@ -92,7 +96,7 @@ void __udelay(unsigned long usec)
tmo += tmp; tmo += tmp;
/* loop till event */ /* loop till event */
while (get_timer_masked() < tmo) while (get_current_tick() < tmo)
; /* nop */ ; /* nop */
} }
@ -106,6 +110,14 @@ void reset_timer_masked(void)
} }
unsigned long get_timer_masked(void) unsigned long get_timer_masked(void)
{
struct s5p_timer *const timer = s5p_get_base_timer();
unsigned long count_value = readl(&timer->tcntb4);
return get_current_tick() / count_value;
}
unsigned long get_current_tick(void)
{ {
struct s5p_timer *const timer = s5p_get_base_timer(); struct s5p_timer *const timer = s5p_get_base_timer();
unsigned long now = readl(&timer->tcnto4); unsigned long now = readl(&timer->tcnto4);