diff options
author | Tom Rini <trini@konsulko.com> | 2019-11-23 20:50:11 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-11-23 20:50:11 -0500 |
commit | 9a0cbae22a613dfd55e15565785749b74c19fdf0 (patch) | |
tree | e66f4ce35ba9d7ce812b95b8b441fc0bec917a4f /drivers/i2c/rk_i2c.c | |
parent | c8f2fe4e670c91172540ab36700d7a8411fc6f76 (diff) | |
parent | 8019d32c4701b95410113541deb7f28d5c2b02a5 (diff) |
Merge tag 'u-boot-rockchip-20191124' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Clean vid/pid in Kconfig and add fastboot for rk3399
- add 'u-boot, spl-fifo-mode' for mmc
- Use FIT generator for rk3229 optee and rk3368 ATF
- fan53555: add support for Silergy SYR82X and SYR83X
Diffstat (limited to 'drivers/i2c/rk_i2c.c')
-rw-r--r-- | drivers/i2c/rk_i2c.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c index cdd94bb05a9..32b2ee85787 100644 --- a/drivers/i2c/rk_i2c.c +++ b/drivers/i2c/rk_i2c.c @@ -253,7 +253,6 @@ static int rk_i2c_read(struct rk_i2c *i2c, uchar chip, uint reg, uint r_len, } i2c_exit: - rk_i2c_send_stop_bit(i2c); rk_i2c_disable(i2c); return err; @@ -332,7 +331,6 @@ static int rk_i2c_write(struct rk_i2c *i2c, uchar chip, uint reg, uint r_len, } i2c_exit: - rk_i2c_send_stop_bit(i2c); rk_i2c_disable(i2c); return err; @@ -360,6 +358,9 @@ static int rockchip_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, } } + rk_i2c_send_stop_bit(i2c); + rk_i2c_disable(i2c); + return 0; } |