diff options
| author | Tom Rini <trini@konsulko.com> | 2023-06-06 09:46:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-06-06 09:46:27 -0400 |
| commit | d39277ff4210a1a3e07d40564a19c2e59cec04aa (patch) | |
| tree | 21203eab5efc77d2aa99b2b9cf21a58e7cbd6a7e | |
| parent | 26659d426548d1c395ef878c3b820e53a6e3b346 (diff) | |
| parent | 419ddf944cbf376e3c1d5b8571e82d89056bebfa (diff) | |
| download | u-boot-d39277ff4210a1a3e07d40564a19c2e59cec04aa.zip u-boot-d39277ff4210a1a3e07d40564a19c2e59cec04aa.tar.gz u-boot-d39277ff4210a1a3e07d40564a19c2e59cec04aa.tar.bz2 | |
Merge tag 'for-v2023-07-rc4' of https://source.denx.de/u-boot/custodians/u-boot-i2c
i2c updates for v2023-07-rc4
Bugfixes:
- rockchip: De-initialize the bus after start bit failure
from Ondrej Jirman
- cdns: Fix broken retry mechanism on arbitration lost
| -rw-r--r-- | drivers/i2c/i2c-cdns.c | 5 | ||||
| -rw-r--r-- | drivers/i2c/rk_i2c.c | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/i2c/i2c-cdns.c b/drivers/i2c/i2c-cdns.c index 1a89207..935b2ac 100644 --- a/drivers/i2c/i2c-cdns.c +++ b/drivers/i2c/i2c-cdns.c @@ -444,7 +444,7 @@ static int cdns_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, debug("i2c_xfer: %d messages\n", nmsgs); for (u8 retry = 0; retry < CDNS_I2C_ARB_LOST_MAX_RETRIES && - nmsgs > 0; nmsgs--, msg++) { + nmsgs > 0;) { debug("i2c_xfer: chip=0x%x, len=0x%x\n", msg->addr, msg->len); if (msg->flags & I2C_M_RD) { ret = cdns_i2c_read_data(i2c_bus, msg->addr, msg->buf, @@ -461,7 +461,8 @@ static int cdns_i2c_xfer(struct udevice *dev, struct i2c_msg *msg, retry); continue; } - + nmsgs--; + msg++; if (ret) { debug("i2c_write: error sending\n"); return -EREMOTEIO; diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c index f8fac45..9927af9 100644 --- a/drivers/i2c/rk_i2c.c +++ b/drivers/i2c/rk_i2c.c @@ -342,7 +342,7 @@ static int rockchip_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs) { struct rk_i2c *i2c = dev_get_priv(bus); - int ret; + int ret = 0; debug("i2c_xfer: %d messages\n", nmsgs); for (; nmsgs > 0; nmsgs--, msg++) { @@ -356,14 +356,15 @@ static int rockchip_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, } if (ret) { debug("i2c_write: error sending\n"); - return -EREMOTEIO; + ret = -EREMOTEIO; + break; } } rk_i2c_send_stop_bit(i2c); rk_i2c_disable(i2c); - return 0; + return ret; } int rockchip_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) |