Commit 8b062608 authored Jul 08, 2015 by Jan Luebbe Committed by Wolfram Sang Jul 31, 2015

i2c: core: only use set_scl for bus recovery after calling prepare_recovery



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@pengutronix.de>
Acked-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Tested-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

parent d12c0aaf

drivers/i2c/i2c-core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -567,6 +567,9 @@ static int i2c_generic_recovery(struct i2c_adapter *adap)
		if (bri->prepare_recovery)
		bri->prepare_recovery(adap);

		bri->set_scl(adap, val);
		ndelay(RECOVERY_NDELAY);

		/*
		* 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);
		}
		EXPORT_SYMBOL_GPL(i2c_generic_scl_recovery);