From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Sverdlin Subject: Re: [PATCH] i2c: core: only use set_scl for bus recovery after calling prepare_recovery Date: Sun, 12 Jul 2015 17:31:42 +0200 Message-ID: <55A2885E.3000002@gmail.com> References: <1436366106-11779-1-git-send-email-jlu@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1436366106-11779-1-git-send-email-jlu-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Jan Luebbe Cc: Wolfram Sang , Tony Lindgren , Felipe Balbi , kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org, linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: linux-i2c@vger.kernel.org On 08/07/15 16:35, Jan Luebbe wrote: > 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 I've tested it with oscilloscope on Beagle Bone Black, makes sense with your next patch, so: Tested-by: Alexander Sverdlin > --- > 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 069a41f116dd..be992b3e0be8 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->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); >