|
@@ -189,14 +189,14 @@ static inline int i2c_pxa_is_slavemode(struct pxa_i2c *i2c)
|
|
|
|
|
|
static void i2c_pxa_abort(struct pxa_i2c *i2c)
|
|
|
{
|
|
|
- unsigned long timeout = jiffies + HZ/4;
|
|
|
+ int i = 250;
|
|
|
|
|
|
if (i2c_pxa_is_slavemode(i2c)) {
|
|
|
dev_dbg(&i2c->adap.dev, "%s: called in slave mode\n", __func__);
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- while (time_before(jiffies, timeout) && (readl(_IBMR(i2c)) & 0x1) == 0) {
|
|
|
+ while ((i > 0) && (readl(_IBMR(i2c)) & 0x1) == 0) {
|
|
|
unsigned long icr = readl(_ICR(i2c));
|
|
|
|
|
|
icr &= ~ICR_START;
|
|
@@ -206,7 +206,8 @@ static void i2c_pxa_abort(struct pxa_i2c *i2c)
|
|
|
|
|
|
show_state(i2c);
|
|
|
|
|
|
- msleep(1);
|
|
|
+ mdelay(1);
|
|
|
+ i --;
|
|
|
}
|
|
|
|
|
|
writel(readl(_ICR(i2c)) & ~(ICR_MA | ICR_START | ICR_STOP),
|