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

S5P: timer: replace bss variable by gd 

Use the global data instead of bss variable, replace as follow.

count_value -> removed
timestamp -> tbl
lastdec -> lastinc

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Albert ARIBAUD <albert.aribaud@free.fr>
This commit is contained in:
Minkyu Kang 2011-03-16 20:09:20 +09:00 committed by Albert Aribaud
parent aa44a45f73
commit 9aca34d6ab
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,11 +29,7 @@
#include <asm/arch/clk.h> #include <asm/arch/clk.h>
#include <pwm.h> #include <pwm.h>
static unsigned long count_value; DECLARE_GLOBAL_DATA_PTR;
/* Internal tick units */
static unsigned long long timestamp; /* Monotonic incrementing timer */
static unsigned long lastdec; /* Last decremneter snapshot */
/* 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)
@ -66,14 +62,14 @@ unsigned long get_timer(unsigned long base)
void set_timer(unsigned long t) void set_timer(unsigned long t)
{ {
timestamp = t; gd->tbl = t;
} }
/* delay x useconds */ /* delay x useconds */
void __udelay(unsigned long usec) void __udelay(unsigned long usec)
{ {
struct s5p_timer *const timer = s5p_get_base_timer(); struct s5p_timer *const timer = s5p_get_base_timer();
unsigned long tmo, tmp; unsigned long tmo, tmp, count_value;
count_value = readl(&timer->tcntb4); count_value = readl(&timer->tcntb4);
@ -98,7 +94,7 @@ void __udelay(unsigned long usec)
tmp = get_timer(0); tmp = get_timer(0);
/* if setting this fordward will roll time stamp */ /* if setting this fordward will roll time stamp */
/* reset "advancing" timestamp to 0, set lastdec value */ /* reset "advancing" timestamp to 0, set lastinc value */
/* else, set advancing stamp wake up time */ /* else, set advancing stamp wake up time */
if ((tmo + tmp + 1) < tmp) if ((tmo + tmp + 1) < tmp)
reset_timer_masked(); reset_timer_masked();
@ -115,23 +111,24 @@ void reset_timer_masked(void)
struct s5p_timer *const timer = s5p_get_base_timer(); struct s5p_timer *const timer = s5p_get_base_timer();
/* reset time */ /* reset time */
lastdec = readl(&timer->tcnto4); gd->lastinc = readl(&timer->tcnto4);
timestamp = 0; gd->tbl = 0;
} }
unsigned long get_timer_masked(void) unsigned long get_timer_masked(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);
unsigned long count_value = readl(&timer->tcntb4);
if (lastdec >= now) if (gd->lastinc >= now)
timestamp += lastdec - now; gd->tbl += gd->lastinc - now;
else else
timestamp += lastdec + count_value - now; gd->tbl += gd->lastinc + count_value - now;
lastdec = now; gd->lastinc = now;
return timestamp; return gd->tbl;
} }
/* /*