]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
i2c: algo-bit: add support for I2C_M_STOP
authorJean Delvare <jdelvare@suse.de>
Wed, 21 Jun 2017 07:24:02 +0000 (09:24 +0200)
committerWolfram Sang <wsa@the-dreams.de>
Fri, 23 Jun 2017 18:45:43 +0000 (20:45 +0200)
Support for enforced STOPs will allow us to use SCCB compatible devices.

Based on a preliminary patch by Wolfram Sang.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/algos/i2c-algo-bit.c

index a8e89df665b904d77b86586853a3fb5f010f92e0..1147bddb8b2c8a877e04a24a4f35acf8cb69ae2b 100644 (file)
@@ -553,9 +553,16 @@ static int bit_xfer(struct i2c_adapter *i2c_adap,
                nak_ok = pmsg->flags & I2C_M_IGNORE_NAK;
                if (!(pmsg->flags & I2C_M_NOSTART)) {
                        if (i) {
-                               bit_dbg(3, &i2c_adap->dev, "emitting "
-                                       "repeated start condition\n");
-                               i2c_repstart(adap);
+                               if (msgs[i - 1].flags & I2C_M_STOP) {
+                                       bit_dbg(3, &i2c_adap->dev,
+                                               "emitting enforced stop/start condition\n");
+                                       i2c_stop(adap);
+                                       i2c_start(adap);
+                               } else {
+                                       bit_dbg(3, &i2c_adap->dev,
+                                               "emitting repeated start condition\n");
+                                       i2c_repstart(adap);
+                               }
                        }
                        ret = bit_doAddress(i2c_adap, pmsg);
                        if ((ret != 0) && !nak_ok) {