diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-17 12:01:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-17 12:01:51 -0700 |
| commit | 194cf4825638256e9afe1d360831aa5379b3517a (patch) | |
| tree | 5ed04e8f5dfb13bdae489523bd08c5dca10d995c | |
| parent | 0c93ac69407d63a85be0129aa55ffaec27ffebd3 (diff) | |
| parent | 39930213e7779b9c4257499972b8afb8858f1a2d (diff) | |
| download | linux-194cf4825638256e9afe1d360831aa5379b3517a.tar.gz linux-194cf4825638256e9afe1d360831aa5379b3517a.tar.bz2 linux-194cf4825638256e9afe1d360831aa5379b3517a.zip | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fix from Wolfram Sang:
"One more driver bugfix for I2C"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: mv64xxx: Fix random system lock caused by runtime PM
| -rw-r--r-- | drivers/i2c/busses/i2c-mv64xxx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index c590d36b5fd1..5c8e94b6cdb5 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -221,6 +221,10 @@ mv64xxx_i2c_hw_init(struct mv64xxx_i2c_data *drv_data) writel(0, drv_data->reg_base + drv_data->reg_offsets.ext_addr); writel(MV64XXX_I2C_REG_CONTROL_TWSIEN | MV64XXX_I2C_REG_CONTROL_STOP, drv_data->reg_base + drv_data->reg_offsets.control); + + if (drv_data->errata_delay) + udelay(5); + drv_data->state = MV64XXX_I2C_STATE_IDLE; } |