diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2020-01-15 20:31:37 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2020-01-15 20:31:37 +0300 |
| commit | d02e5ee09bd98b8cec9c2e26b486ed4d6d1b7e2a (patch) | |
| tree | 7cb6fa45fd1cb4bdad89c7b7832a72df893c838c /drivers/i2c/i2c-core-base.c | |
| parent | 9f7a03642e0e25dc0561be124bddae2b8ed787ab (diff) | |
| parent | 24a49678f5e20f18006e71b90ac1531876b27eb1 (diff) | |
| download | linux-d02e5ee09bd98b8cec9c2e26b486ed4d6d1b7e2a.tar.xz | |
Merge branch 'i2c/for-current' into i2c/for-5.6
Diffstat (limited to 'drivers/i2c/i2c-core-base.c')
| -rw-r--r-- | drivers/i2c/i2c-core-base.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index a1eb28a3cc54..19d929948cd2 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c @@ -186,10 +186,11 @@ int i2c_generic_scl_recovery(struct i2c_adapter *adap) * If we can set SDA, we will always create a STOP to ensure additional * pulses will do no harm. This is achieved by letting SDA follow SCL * half a cycle later. Check the 'incomplete_write_byte' fault injector - * for details. + * for details. Note that we must honour tsu:sto, 4us, but lets use 5us + * here for simplicity. */ bri->set_scl(adap, scl); - ndelay(RECOVERY_NDELAY / 2); + ndelay(RECOVERY_NDELAY); if (bri->set_sda) bri->set_sda(adap, scl); ndelay(RECOVERY_NDELAY / 2); @@ -211,7 +212,13 @@ int i2c_generic_scl_recovery(struct i2c_adapter *adap) scl = !scl; bri->set_scl(adap, scl); /* Creating STOP again, see above */ - ndelay(RECOVERY_NDELAY / 2); + if (scl) { + /* Honour minimum tsu:sto */ + ndelay(RECOVERY_NDELAY); + } else { + /* Honour minimum tf and thd:dat */ + ndelay(RECOVERY_NDELAY / 2); + } if (bri->set_sda) bri->set_sda(adap, scl); ndelay(RECOVERY_NDELAY / 2); |