From patchwork Thu Jun 14 01:27:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 929185 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 415mFp5sXsz9s01 for ; Thu, 14 Jun 2018 11:27:42 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935695AbeFNB1l (ORCPT ); Wed, 13 Jun 2018 21:27:41 -0400 Received: from sauhun.de ([88.99.104.3]:48106 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935532AbeFNB1k (ORCPT ); Wed, 13 Jun 2018 21:27:40 -0400 Received: from localhost (softbank126012118084.bbtec.net [126.12.118.84]) by pokefinder.org (Postfix) with ESMTPSA id A1DBD54006A; Thu, 14 Jun 2018 03:27:37 +0200 (CEST) From: Wolfram Sang To: linux-i2c@vger.kernel.org, cerg2010cerg2010@mail.ru Cc: linux-renesas-soc@vger.kernel.org, drivers_video-dri@kernel-bugs.osdl.org, Wolfram Sang Subject: [RFT 1/2] i2c: algos: bit: apply generic delays on initial STOP Date: Thu, 14 Jun 2018 10:27:13 +0900 Message-Id: <20180614012714.5937-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180614012714.5937-1-wsa+renesas@sang-engineering.com> References: <20180614012714.5937-1-wsa+renesas@sang-engineering.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org When using the generic functions for setting SCL/SDA high, we make sure necessary delays are met. Signed-off-by: Wolfram Sang --- drivers/i2c/algos/i2c-algo-bit.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index 3df0efd69ae3..c76cf51975d0 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c @@ -650,9 +650,8 @@ static int __i2c_bit_add_bus(struct i2c_adapter *adap, adap->quirks = &i2c_bit_quirk_no_clk_stretch; /* Bring bus to a known state. Looks like STOP if bus is not free yet */ - setscl(bit_adap, 1); - udelay(bit_adap->udelay); - setsda(bit_adap, 1); + sclhi(bit_adap); + sdahi(bit_adap); ret = add_adapter(adap); if (ret < 0) From patchwork Thu Jun 14 01:27:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 929186 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sang-engineering.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 415mFt1rDlz9s01 for ; Thu, 14 Jun 2018 11:27:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935532AbeFNB1p (ORCPT ); Wed, 13 Jun 2018 21:27:45 -0400 Received: from sauhun.de ([88.99.104.3]:48120 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935530AbeFNB1p (ORCPT ); Wed, 13 Jun 2018 21:27:45 -0400 Received: from localhost (softbank126012118084.bbtec.net [126.12.118.84]) by pokefinder.org (Postfix) with ESMTPSA id B9178540104; Thu, 14 Jun 2018 03:27:41 +0200 (CEST) From: Wolfram Sang To: linux-i2c@vger.kernel.org, cerg2010cerg2010@mail.ru Cc: linux-renesas-soc@vger.kernel.org, drivers_video-dri@kernel-bugs.osdl.org, Wolfram Sang Subject: [RFT 2/2] i2c: algos: bit: make sure to send STOP Date: Thu, 14 Jun 2018 10:27:14 +0900 Message-Id: <20180614012714.5937-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180614012714.5937-1-wsa+renesas@sang-engineering.com> References: <20180614012714.5937-1-wsa+renesas@sang-engineering.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org If SCL was low but SDA high, we would simply raise SCL but not send a STOP. To make sure we always send STOP initially, lower both lines first. Signed-off-by: Wolfram Sang --- drivers/i2c/algos/i2c-algo-bit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index c76cf51975d0..344649847885 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c @@ -650,6 +650,8 @@ static int __i2c_bit_add_bus(struct i2c_adapter *adap, adap->quirks = &i2c_bit_quirk_no_clk_stretch; /* Bring bus to a known state. Looks like STOP if bus is not free yet */ + scllo(bit_adap); + sdalo(bit_adap); sclhi(bit_adap); sdahi(bit_adap);