diff options
author | Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com> | 2011-10-12 00:13:06 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2011-10-29 06:09:33 -0400 |
commit | 24597bf8012cf3fa5703c38e1bb13df3118d7588 (patch) | |
tree | a32c2760af44828759d3712123f4a3b1405c8275 /drivers/i2c/busses/i2c-eg20t.c | |
parent | cb59f5253a5313d62e8e345fcd5dd5a44a73e0d6 (diff) |
i2c-eg20t: Add initialize processing in case i2c-error occurs
In case disconnecting physical connection,
need to initialize i2c device for retry access.
This patch adds initialize process in case bus-idle fails and Lost arbitration.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.lapis-semi.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-eg20t.c')
-rw-r--r-- | drivers/i2c/busses/i2c-eg20t.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c index a1bf62dbd27b..8cebef49aeac 100644 --- a/drivers/i2c/busses/i2c-eg20t.c +++ b/drivers/i2c/busses/i2c-eg20t.c | |||
@@ -289,6 +289,7 @@ static s32 pch_i2c_wait_for_bus_idle(struct i2c_algo_pch_data *adap, | |||
289 | 289 | ||
290 | pch_dbg(adap, "I2CSR = %x\n", ioread32(p + PCH_I2CSR)); | 290 | pch_dbg(adap, "I2CSR = %x\n", ioread32(p + PCH_I2CSR)); |
291 | pch_err(adap, "%s: Timeout Error.return%d\n", __func__, -ETIME); | 291 | pch_err(adap, "%s: Timeout Error.return%d\n", __func__, -ETIME); |
292 | pch_i2c_init(adap); | ||
292 | 293 | ||
293 | return -ETIME; | 294 | return -ETIME; |
294 | } | 295 | } |
@@ -456,6 +457,7 @@ static s32 pch_i2c_writebytes(struct i2c_adapter *i2c_adap, | |||
456 | pch_err(adap, "Lost Arbitration\n"); | 457 | pch_err(adap, "Lost Arbitration\n"); |
457 | pch_clrbit(adap->pch_base_address, PCH_I2CSR, I2CMAL_BIT); | 458 | pch_clrbit(adap->pch_base_address, PCH_I2CSR, I2CMAL_BIT); |
458 | pch_clrbit(adap->pch_base_address, PCH_I2CSR, I2CMIF_BIT); | 459 | pch_clrbit(adap->pch_base_address, PCH_I2CSR, I2CMIF_BIT); |
460 | pch_i2c_init(adap); | ||
459 | return -EAGAIN; | 461 | return -EAGAIN; |
460 | } else { /* wait-event timeout */ | 462 | } else { /* wait-event timeout */ |
461 | pch_i2c_stop(adap); | 463 | pch_i2c_stop(adap); |
@@ -634,6 +636,7 @@ static s32 pch_i2c_readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, | |||
634 | pch_err(adap, "Lost Arbitration\n"); | 636 | pch_err(adap, "Lost Arbitration\n"); |
635 | pch_clrbit(adap->pch_base_address, PCH_I2CSR, I2CMAL_BIT); | 637 | pch_clrbit(adap->pch_base_address, PCH_I2CSR, I2CMAL_BIT); |
636 | pch_clrbit(adap->pch_base_address, PCH_I2CSR, I2CMIF_BIT); | 638 | pch_clrbit(adap->pch_base_address, PCH_I2CSR, I2CMIF_BIT); |
639 | pch_i2c_init(adap); | ||
637 | return -EAGAIN; | 640 | return -EAGAIN; |
638 | } else { /* wait-event timeout */ | 641 | } else { /* wait-event timeout */ |
639 | pch_i2c_stop(adap); | 642 | pch_i2c_stop(adap); |