projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm: Move tbl to arch_global_data
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
arm920t
/
s3c24x0
/
timer.c
diff --git
a/arch/arm/cpu/arm920t/s3c24x0/timer.c
b/arch/arm/cpu/arm920t/s3c24x0/timer.c
index e59e614268a71441ace0dbb204e8b793632aae55..eb2b8d081612ab826758f48fcb1ca95d03e42dff 100644
(file)
--- a/
arch/arm/cpu/arm920t/s3c24x0/timer.c
+++ b/
arch/arm/cpu/arm920t/s3c24x0/timer.c
@@
-63,7
+63,7
@@
int timer_init(void)
tmr = (tmr & ~0x0700000) | 0x0500000;
writel(tmr, &timers->tcon);
gd->lastinc = 0;
tmr = (tmr & ~0x0700000) | 0x0500000;
writel(tmr, &timers->tcon);
gd->lastinc = 0;
- gd->tbl = 0;
+ gd->
arch.
tbl = 0;
return 0;
}
return 0;
}
@@
-130,14
+130,14
@@
unsigned long long get_ticks(void)
if (gd->lastinc >= now) {
/* normal mode */
if (gd->lastinc >= now) {
/* normal mode */
- gd->tbl += gd->lastinc - now;
+ gd->
arch.
tbl += gd->lastinc - now;
} else {
/* we have an overflow ... */
} else {
/* we have an overflow ... */
- gd->tbl += gd->lastinc + gd->arch.tbu - now;
+ gd->
arch.
tbl += gd->lastinc + gd->arch.tbu - now;
}
gd->lastinc = now;
}
gd->lastinc = now;
- return gd->tbl;
+ return gd->
arch.
tbl;
}
/*
}
/*