projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-i2c
[oweals/u-boot.git]
/
cpu
/
blackfin
/
interrupts.c
diff --git
a/cpu/blackfin/interrupts.c
b/cpu/blackfin/interrupts.c
index 80c550545462ebe56a4d6ad2d2ab0a57335e916d..bf6fb4b4cf38cd19af4f0ee4852fa8f98b12fe01 100644
(file)
--- a/
cpu/blackfin/interrupts.c
+++ b/
cpu/blackfin/interrupts.c
@@
-48,7
+48,7
@@
ulong get_tbclk(void)
{
ulong tbclk;
{
ulong tbclk;
- tbclk = C
FG
_HZ;
+ tbclk = C
ONFIG_SYS
_HZ;
return tbclk;
}
return tbclk;
}
@@
-95,11
+95,12
@@
void udelay(unsigned long usec)
int timer_init(void)
{
*pTCNTL = 0x1;
int timer_init(void)
{
*pTCNTL = 0x1;
+ CSYNC();
*pTSCALE = 0x0;
*pTCOUNT = MAX_TIM_LOAD;
*pTPERIOD = MAX_TIM_LOAD;
*pTCNTL = 0x7;
*pTSCALE = 0x0;
*pTCOUNT = MAX_TIM_LOAD;
*pTPERIOD = MAX_TIM_LOAD;
*pTCNTL = 0x7;
-
asm("CSYNC;"
);
+
CSYNC(
);
timestamp = 0;
last_time = 0;
timestamp = 0;
last_time = 0;
@@
-151,5
+152,5
@@
ulong get_timer(ulong base)
void reset_timer(void)
{
void reset_timer(void)
{
- time
stamp = 0
;
+ time
r_init()
;
}
}