diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-27 11:59:28 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-27 12:17:54 +0100 |
commit | 43dd6b0522d5e54c23824e9eeba1057e40047168 (patch) | |
tree | df7fd0df574e76f5115d56243fc7d6bfef076b24 /drivers/i2c | |
parent | 227dbe1f8c566fbdf7dcdcfd3eb849208df74130 (diff) | |
download | barebox-43dd6b0522d5e54c23824e9eeba1057e40047168.tar.gz barebox-43dd6b0522d5e54c23824e9eeba1057e40047168.tar.xz |
i2c: i.MX: stop after read only in last transfer of a message
Following the Linux driver the controller should be stopped in the
read transfer path only after the last transfer of a message, but
not when other transfers of the same message are following. Implement
this behaviour for the barebox driver aswell.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-imx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index e169feb3fc..c903d8dfd1 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -469,7 +469,8 @@ static int i2c_fsl_write(struct i2c_adapter *adapter, struct i2c_msg *msg) return 0; } -static int i2c_fsl_read(struct i2c_adapter *adapter, struct i2c_msg *msg) +static int i2c_fsl_read(struct i2c_adapter *adapter, struct i2c_msg *msg, + bool is_last) { struct fsl_i2c_struct *i2c_fsl = to_fsl_i2c_struct(adapter); int i, result; @@ -500,7 +501,7 @@ static int i2c_fsl_read(struct i2c_adapter *adapter, struct i2c_msg *msg) if (result) return result; - if (i == (msg->len - 1)) { + if (is_last && i == msg->len - 1) { i2c_fsl_stop(adapter); } else if (i == (msg->len - 2)) { temp = fsl_i2c_read_reg(i2c_fsl, FSL_I2C_I2CR); @@ -547,7 +548,7 @@ static int i2c_fsl_xfer(struct i2c_adapter *adapter, /* write/read data */ if (msgs[i].flags & I2C_M_RD) - result = i2c_fsl_read(adapter, &msgs[i]); + result = i2c_fsl_read(adapter, &msgs[i], i == num - 1); else result = i2c_fsl_write(adapter, &msgs[i]); if (result) |