Received: by 10.223.185.116 with SMTP id b49csp4185402wrg; Mon, 26 Feb 2018 12:46:52 -0800 (PST) X-Google-Smtp-Source: AH8x227VbBqGrI0oCdCrf5iE19eJga39gujpYuIn6GXXaL2x9GozrOUkZOJC+XmabrXQHa7oX3cJ X-Received: by 2002:a17:902:1746:: with SMTP id i64-v6mr11735110pli.53.1519678012789; Mon, 26 Feb 2018 12:46:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519678012; cv=none; d=google.com; s=arc-20160816; b=TmJF/iXd7LFHH0MXZeE6RlJPROE8V25Di8HVr49zcJEXmGlpEoh2OQFydDhx65knQY 1qD9829z2BaoTg1nBsyJFSE3h8llqYdgc3kvpF0Q357fzSfCCJDhuT+Zarj8XiykDMdD IIQjDUsS0y9h6pBIzXWAzvC6Zy1gVjKfDQMbW1i+KlBsDoagkhw8V6YjEnT3EuxXHmai Yv83FzC01FTP7BokJdAh9GJmQUfttfTF38cT35xdmgJoJVc9yWqx1oxXEQeKKXU6Gsx6 +VyAcx4T81/9iRdCNFALdxy/ynIq/+KnoQo1JBMSjxacw8YsvHZ/tsnq09Ghwj7FUt2L UW6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=qn5kuQCaF+ddiEOoPNA6XMPSrbJnnH23hDj5LwqAijY=; b=bvA5P9ncY2BwxhZ3wNXCQ0sIYpjgtnp/47wLHlUdmhVYKBR/5fDudY7nLsP3KBtYq4 OoKSi04u+i2zd0pgm+EHzpkqHlGXYzd31gDe4A0oHzVslAc+vo8L3Am4HJGrgEpPhVcZ YFuLtTq6BRIU9XsZruIO4UKjmn1A67+YIoONkZuc+G/FFOAKsbJ2U1ruDvs0J7Jj854u EGPj8tnaxKN5+i3ZzpM29aigKrN8LFQ0kHv1CcTQJyGAKr1IQ7CfuHCB42QnlM3VRZ3H sdWFmnXasue5DSPwv5tcQ8UWEL1H1JwkmnU5eaTgNlbSmNm0+At69e0vIj1PlX8mogWs EliA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h14si3625271pfd.404.2018.02.26.12.46.36; Mon, 26 Feb 2018 12:46:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753329AbeBZU0J (ORCPT + 99 others); Mon, 26 Feb 2018 15:26:09 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:35650 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753323AbeBZU0H (ORCPT ); Mon, 26 Feb 2018 15:26:07 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 79FEDFFC; Mon, 26 Feb 2018 20:26:06 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Anholt , Boris Brezillon , Wolfram Sang , stable@kernel.org Subject: [PATCH 4.15 10/64] i2c: bcm2835: Set up the rising/falling edge delays Date: Mon, 26 Feb 2018 21:21:47 +0100 Message-Id: <20180226202153.868983238@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226202153.453363333@linuxfoundation.org> References: <20180226202153.453363333@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Anholt commit fe32a815f05c8568669a062587435e15f9345764 upstream. We were leaving them in the power on state (or the state the firmware had set up for some client, if we were taking over from them). The boot state was 30 core clocks, when we actually want to sample some time after (to make sure that the new input bit has actually arrived). Signed-off-by: Eric Anholt Signed-off-by: Boris Brezillon Signed-off-by: Wolfram Sang Cc: stable@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/busses/i2c-bcm2835.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) --- a/drivers/i2c/busses/i2c-bcm2835.c +++ b/drivers/i2c/busses/i2c-bcm2835.c @@ -50,6 +50,9 @@ #define BCM2835_I2C_S_CLKT BIT(9) #define BCM2835_I2C_S_LEN BIT(10) /* Fake bit for SW error reporting */ +#define BCM2835_I2C_FEDL_SHIFT 16 +#define BCM2835_I2C_REDL_SHIFT 0 + #define BCM2835_I2C_CDIV_MIN 0x0002 #define BCM2835_I2C_CDIV_MAX 0xFFFE @@ -81,7 +84,7 @@ static inline u32 bcm2835_i2c_readl(stru static int bcm2835_i2c_set_divider(struct bcm2835_i2c_dev *i2c_dev) { - u32 divider; + u32 divider, redl, fedl; divider = DIV_ROUND_UP(clk_get_rate(i2c_dev->clk), i2c_dev->bus_clk_rate); @@ -100,6 +103,22 @@ static int bcm2835_i2c_set_divider(struc bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_DIV, divider); + /* + * Number of core clocks to wait after falling edge before + * outputting the next data bit. Note that both FEDL and REDL + * can't be greater than CDIV/2. + */ + fedl = max(divider / 16, 1u); + + /* + * Number of core clocks to wait after rising edge before + * sampling the next incoming data bit. + */ + redl = max(divider / 4, 1u); + + bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_DEL, + (fedl << BCM2835_I2C_FEDL_SHIFT) | + (redl << BCM2835_I2C_REDL_SHIFT)); return 0; }