diff options
| author | Ondrej Jirman <megi@xff.cz> | 2023-05-25 14:18:17 +0200 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2023-06-05 06:52:46 +0200 |
| commit | ba5b9203f55bae1ef3566a84648cad46c6949270 (patch) | |
| tree | 633bc11163c39407b9cd1c19179250e777cfa226 /drivers/i2c/rk_i2c.c | |
| parent | 26659d426548d1c395ef878c3b820e53a6e3b346 (diff) | |
| download | u-boot-ba5b9203f55bae1ef3566a84648cad46c6949270.zip u-boot-ba5b9203f55bae1ef3566a84648cad46c6949270.tar.gz u-boot-ba5b9203f55bae1ef3566a84648cad46c6949270.tar.bz2 | |
i2c: rockchip: De-initialize the bus after start bit failure
Failure can happen when i2c is used without initializing pinctrl properly,
which U-Boot happily allows in SPL. Without this fix, further I2C access would
fail, even after proper pinctrl initialization.
Signed-off-by: Ondrej Jirman <megi@xff.cz>
Cc: Heiko Schocher <hs@denx.de>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'drivers/i2c/rk_i2c.c')
| -rw-r--r-- | drivers/i2c/rk_i2c.c | 7 |
1 files changed, 4 insertions, 3 deletions
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) |