[linux-yocto] [PATCH 07/19] i2c: core: only use set_scl for bus recovery after calling prepare_recovery

Saul Wold sgw at linux.intel.com
Mon Feb 8 14:10:16 PST 2016

From: Jan Luebbe <jlu at pengutronix.de>

commit 49c46cd7bf99f5a5af5df9a92b73db54b94f46f0 upstream.

Using set_scl may be ineffective before calling the driver specific
prepare_recovery callback, which might change into a test mode. So
instead of setting SCL in i2c_generic_scl_recovery, move it to
i2c_generic_recovery (after the optional prepare_recovery).

Signed-off-by: Jan Luebbe <jlu at pengutronix.de>
Acked-by: Alexander Sverdlin <alexander.sverdlin at nokia.com>
Tested-by: Alexander Sverdlin <alexander.sverdlin at gmail.com>
Signed-off-by: Wolfram Sang <wsa at the-dreams.de>
(cherry picked from commit 8b06260836ab47abbb5ea49d889660a0ed8adf90)
 drivers/i2c/i2c-core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 069a41f..be992b3 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -567,6 +567,9 @@ static int i2c_generic_recovery(struct i2c_adapter *adap)
 	if (bri->prepare_recovery)
+	bri->set_scl(adap, val);
 	 * By this time SCL is high, as we need to give 9 falling-rising edges
@@ -597,7 +600,6 @@ static int i2c_generic_recovery(struct i2c_adapter *adap)
 int i2c_generic_scl_recovery(struct i2c_adapter *adap)
-	adap->bus_recovery_info->set_scl(adap, 1);
 	return i2c_generic_recovery(adap);

More information about the linux-yocto mailing list