提交 09d318a8 编写于 作者: K Kumar Gala 提交者: Wolfgang Denk

fsl_i2c: Use timebase timer functions instead of get_timer()

The current implementation of get_timer() is only really useful after we
have relocated u-boot to memory.  The i2c code is used before that as part
of the SPD DDR setup.

We actually have a bug when using the get_timer() code before relocation
because the .bss hasn't been setup and thus we could be reading/writing
a random location (probably in flash).
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
上级 1ca9950b
......@@ -173,12 +173,11 @@ i2c_init(int speed, int slaveadd)
static __inline__ int
i2c_wait4bus(void)
{
ulong timeval = get_timer(0);
unsigned long long timeval = get_ticks();
while (readb(&i2c_dev[i2c_bus_num]->sr) & I2C_SR_MBB) {
if (get_timer(timeval) > I2C_TIMEOUT) {
if ((get_ticks() - timeval) > usec2ticks(I2C_TIMEOUT))
return -1;
}
}
return 0;
......@@ -188,7 +187,7 @@ static __inline__ int
i2c_wait(int write)
{
u32 csr;
ulong timeval = get_timer(0);
unsigned long long timeval = get_ticks();
do {
csr = readb(&i2c_dev[i2c_bus_num]->sr);
......@@ -213,7 +212,7 @@ i2c_wait(int write)
}
return 0;
} while (get_timer (timeval) < I2C_TIMEOUT);
} while ((get_ticks() - timeval) < usec2ticks(I2C_TIMEOUT));
debug("i2c_wait: timed out\n");
return -1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册