From patchwork Tue Oct 1 08:29:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Wu X-Patchwork-Id: 1991371 X-Patchwork-Delegate: andi.shyti@kernel.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kneron.us header.i=@kneron.us header.a=rsa-sha256 header.s=selector1 header.b=AsXKdEh4; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=147.75.80.249; helo=am.mirrors.kernel.org; envelope-from=linux-i2c+bounces-7127-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [147.75.80.249]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XHrlJ0Rhrz1xsq for ; Tue, 1 Oct 2024 18:31:56 +1000 (AEST) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 7E1331F21905 for ; Tue, 1 Oct 2024 08:31:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 50F1E19D8BF; Tue, 1 Oct 2024 08:30:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=kneron.us header.i=@kneron.us header.b="AsXKdEh4" X-Original-To: linux-i2c@vger.kernel.org Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2136.outbound.protection.outlook.com [40.107.223.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7416219D891; Tue, 1 Oct 2024 08:30:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.136 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727771446; cv=fail; b=r3L2Kq7M2S94mnp8aJL8MHztaLvvq/Xm+TU3MCojfWMx4QIiUTJVdDmZ2KzMHXykoWC2WzSYwVooXUZO8Rv52MsA+mJHHIAJJbBrrWRMSjDOOprysnDE1ZOU2C2u622xGwPgyqlM3/DD0NC2vF+Ko53HaOSPpGFZ7rm3DSl6TVM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727771446; c=relaxed/simple; bh=vzLautisdS5o2TtFwnS5eNutf3A8L5ep1YNaJMlxaU0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=CvVJPVWJ1l40mNxTFhyeh/f2FfALy9RjfeKBU8K/5C2kXVz9SZOWIn6G2di3TH1ArJrF2WxWXAn1VgXCpTv6pQPmHelxWCu7gu1wwCjhVQvQBFh8vT/MLvXZp0NBIQdxDdI2F+5Txsk2NERvwYD84+DxDBjLvuwoE2CKwWfyzoc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kneron.us; spf=pass smtp.mailfrom=kneron.us; dkim=pass (1024-bit key) header.d=kneron.us header.i=@kneron.us header.b=AsXKdEh4; arc=fail smtp.client-ip=40.107.223.136 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kneron.us Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kneron.us ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TU/wRCmH+6CZD8MCb/4sWdoIcAURB4rhsv9PnevgzW5aIkwu09reg+Ywc5UkaircTa8lklEd7/LJgsVjFXGPquZStc5D5EaxAT4pcmXsMYBi02pe6c88Rx3miHUu+7NPQlKiZSvwjGdevqDtqXkOGsSOU6IenbW+JIxsDlRcS6LVqSt7pha2x0Wewsif13KMf1Hz27nar2vNiKPe0Sx1M+7yr3QKSZFl/d6DLkOkMTgo3q0QHlLxVZ8UYF92YBPWFd3nDfifii1cCrG/YTiylcqxtgL5CTl/ap8vg0IMzqQM1Ve/NCRpqJYci6aj0amKD0dOMNu84AcLLNaf7Ud18w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/iW+ELaHXtEztQF3I5Dr9Gm66Pty8fqG2LdZg4t2ylo=; b=ITEpNt/HUhCkFvtIiT7ed00sMdw0YqKquEaA8HlOAJno8efPt6YkkL6h8S4e4Qv+Hsgx6avwwtyytfAb8ty4YM1v9Coi66u3aKzDs+9Lw0QRxsyu3wjrE7OH7JX+yE2STVjqRoQKzSuQHboopKDslOaKHjoDxkOpYn02RmOelDbwlSSL1bXImrlndIdOcaXik9UWvUHMmvbS1ZA7ECt5RAl8Tppmk9JEZ1CwS65FfXH+HqkGYmauEV/6LVBaK8BcDAdALCdM0b5ulI0sVlWLm3+oo8Ssgq9FtfU/NDmizxInMYILssLt93JhQ08sNLeS2GGUz3QX0eTjpI0KUbjlFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kneron.us; dmarc=pass action=none header.from=kneron.us; dkim=pass header.d=kneron.us; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kneron.us; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/iW+ELaHXtEztQF3I5Dr9Gm66Pty8fqG2LdZg4t2ylo=; b=AsXKdEh40kVTV/xEibP5r15EuBmhe4GDU3Bgp25NEPXAxM/xBFBU1jE39eg0DnWJ9s79FmEMhgLxqV7AppB73g5+QqWuNLOqk91LP6vh5CBgWunbJ6dj+cZ38FoYQ18vzzysK9ffshWCZshi2LlXNa7NDMA2Lm32UdV+eC1YYWI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kneron.us; Received: from IA1PR14MB6224.namprd14.prod.outlook.com (2603:10b6:208:42b::6) by SA3PR14MB6462.namprd14.prod.outlook.com (2603:10b6:806:317::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.26; Tue, 1 Oct 2024 08:30:42 +0000 Received: from IA1PR14MB6224.namprd14.prod.outlook.com ([fe80::c527:653c:698d:3d94]) by IA1PR14MB6224.namprd14.prod.outlook.com ([fe80::c527:653c:698d:3d94%3]) with mapi id 15.20.8005.024; Tue, 1 Oct 2024 08:30:42 +0000 From: Michael Wu To: Andi Shyti , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jarkko Nikula , Andy Shevchenko , Mika Westerberg , Jan Dabros , linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Morgan Chang , mvp.kutali@gmail.com, Michael Wu Subject: [PATCH v3 2/2] i2c: dwsignware: determine HS tHIGH and tLOW based on HW parameters Date: Tue, 1 Oct 2024 16:29:34 +0800 Message-ID: <20241001082937.680372-3-michael.wu@kneron.us> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241001082937.680372-1-michael.wu@kneron.us> References: <20241001082937.680372-1-michael.wu@kneron.us> X-ClientProxiedBy: TPYP295CA0022.TWNP295.PROD.OUTLOOK.COM (2603:1096:7d0:a::18) To IA1PR14MB6224.namprd14.prod.outlook.com (2603:10b6:208:42b::6) Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: IA1PR14MB6224:EE_|SA3PR14MB6462:EE_ X-MS-Office365-Filtering-Correlation-Id: e3651cc5-f981-4ba3-e82f-08dce1f35671 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|7416014|376014|1800799024|80162021|921020|38350700014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?Z6MZ8LdSYWo56/R1jVT+9teOIc6lDJR?= =?utf-8?q?0DaZxZl0OwXbCUr8ni2IpeUw8OasXciuVLtzhNDu4jFe1xKMbaFGssVOpKyWGlgmZ?= =?utf-8?q?Rnl0dwnLS0J2loDMB/y0wAEBtoPrWHMQfaGX3sXeG9rhIo9D48aMxp+xoCByrDor4?= =?utf-8?q?WgKZQoAg20Qt3e2971SBQtf5IsEkGW9vnl6qjKv5J9gs+43tG6yTF2PLWiC6Qzz+6?= =?utf-8?q?VioxdPd1a8F0jqxGzMTDuX+Y7pQQHtrHS0MkH0Ni6FO7euHJko+BaJI6YwqBaVqwQ?= =?utf-8?q?ugKQPw0n+LhbEq5C7y7dDCYxUZntNvvOkrNZa93XqnvfvEEA/ibdB5HwJD9oe5Uwg?= =?utf-8?q?WEv792KSVCRS1v/47xlHUbwscscBbzf0e9vvmlSY7UImOlu1+5sap751yqnftc0Y/?= =?utf-8?q?cGP0Da+7cS1n8Gd0x6OBDVDTgTlWHIe90xNPwuOqk/zIVRZyaM3iEFU0KfSS9y3fK?= =?utf-8?q?OEq2zFCSlF2i2cl2tNqGo/UDOwiYo9Go4lFDboJI/tZOJonfyl8qJuKhJZG6VkEiZ?= =?utf-8?q?v3FoGicZNYeAXDV8Id8NHDbrovK1d8w7ZNyVLeBXcYb6v199W17jxhEDgQUKw0+Xd?= =?utf-8?q?F5TQqq0+ZmcPaJa8NpnELFsG4i195DCbIarlLZiaR8vCX6IUmDsLBmRUGQCnXyON0?= =?utf-8?q?W/CUNudegegcaEW70FzzrLFwSaR6zyOisHhmSA3d+ouILCVD2oLyNBxEYqwICD806?= =?utf-8?q?V//kWWJa9wBu1SeHAwHKX0Jdf7Ow/BWfIWRYtopla6m1oRhDANftkvRiIZ9uujOcP?= =?utf-8?q?OKPrFsjCe69w9BzoTcRIZ53jOdM/dRnmtuBrBfToIkPR2vptWk/QMor4fh0kNzMXp?= =?utf-8?q?VEXjEL3FB3n6w4/ng+y5Z2OFCZ8p0uSgRqvSTNv3UDIduVTPQa/n1auYfd/NoZPhX?= =?utf-8?q?YpsJRK2ijeX6EEGnrJfQQgTEC0uic6n2n+w20Gp763JJnDd5ASleCDcFNBvqGy80s?= =?utf-8?q?03H3aErp7xBiBWL1V34R1qo251IK6yux5LVT/XjK0f3XMr4pIV5RKI9puaUorZFXK?= =?utf-8?q?s0vPIMWaTykr7wFLN6XdSmcaa69jRG223grvwyk1KgfJNVRwfCmfMXjoC1zkwWYAX?= =?utf-8?q?vj+yHEot4ZyG6gVCsv18MX5f5/mVzsapHWKDfXtjJHYb9Wn22Y7MLvWchD9a+KUTU?= =?utf-8?q?Ffl6av6pkvFBOe87uHHtRLgfp6RQYE/0KgPVrNrcJvakAkatqv7N3vBh1hsK0qcNs?= =?utf-8?q?i2cGeAj7c01ltRJLASjO8oBfOQJPfJmtmKv50UDwJs3+g3aBbeMLfQ8DXE/rcPGrr?= =?utf-8?q?gfS76knQfS7UXeQDbiFp6UqYpzIEsjYPlkC1ZxJEcgqrAh0Tra7ciiLLwUfSOa487?= =?utf-8?q?AYG4qhl4kWM8fyXvOny30iBU76GlCCNWMKwRHX5Ot34+KnSn/yPv0JYtUKrDVLypN?= =?utf-8?q?oVXRQpuwQqQ?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:IA1PR14MB6224.namprd14.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(52116014)(7416014)(376014)(1800799024)(80162021)(921020)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?MzJP6sHKGXUzNVgNhAVn12jLOq+S?= =?utf-8?q?uPQXBtKQuv1OpEbSmZKgiDlc2v61QCea5hrx3vkWPTX2sprXdd3htmqh1WxnG0XB3?= =?utf-8?q?6wpt8Qf6fp9rk1WczWAbLykiUNCYoeZ9i60r6ckt0zJ5/IBEML1g2VLPgGlxgQw/o?= =?utf-8?q?yMKMYGKgjbBQBZ6Z256zGf9MH7fA/sabHPP1DjbGIJQl2Ug4Y1M0WmwTxXlo8jvga?= =?utf-8?q?viwqXB6EP0DKAHmNf7jloAY3DijXFaxRyYh3RWFQGWsGMFk7hn+h9K/ITREkxO5Vh?= =?utf-8?q?iw7g1bIj1JYbAvTxz90mno5ya5BWM7SmssCcgwtNHh9F0v+YQ+AuPHm3Q2s822HVD?= =?utf-8?q?+GhLkTYIOozHqMhlUXTYUTJyjS9BLfMA6wnAw40xeAlmXhQbahHYF84bN9VhfyF+E?= =?utf-8?q?rO7JBMwvzVEqp9x7yg7dRtAW1JpB1AEtJ5JqIng2ktouu9jGj6v+ytAiXOVdvbrqU?= =?utf-8?q?lwqchs85ASVyGQcEfCzaIbj4Vs+ng1xv4j1gPcM2KDf2r9WBAByrTcPdurBjpcgoI?= =?utf-8?q?8MLKlJ6EJWRkQ7jsLyRhf1y1RaPXoPZYPd2BCcjAgGi+veXJUryyWW/lRvceTYWIn?= =?utf-8?q?jW8REVZmFB78zrON/2FNljCOBbOR4dty/Z/hMo1rhk7jDQQ+q1QQ2mM4tgf7u/bsl?= =?utf-8?q?9aG2BlMTnnAzk+e/NUue3B2W+Cfp3ccth6f37wLqwykGRLlW9XMeZ4FlZRxMJJQAT?= =?utf-8?q?4Q+UAGG7tb980PCRG9CbItsSHzrUmpG+xKLH4yBI48lEFSwEcKjGDaxH56Y7dJc5Q?= =?utf-8?q?g9UFnkKMAD02JaVB+0yqTDYgIYKoHG9jXD3pnr+OBwtrELLoy3EQqszmZ+Ph8O3D6?= =?utf-8?q?ZybKPelCbouhswOyPzUcUXYqnszbMoe8ayFHsX2pRYm7gbC1CoSXU7kYFFBEhp2lJ?= =?utf-8?q?JLzjmKGMCCY68px3FcyP4u6M1NgQXicwKu9RemlKOUj2ujZlt6diB5VHKwNWKjnIh?= =?utf-8?q?kLLI+2c2dXhMWHLgMFRjd7pKEC6YYyKz1KbfxBCZRQJ+Ho5y9hFOiYnRy5Yd/xGv2?= =?utf-8?q?IwBXS46yAOH9smnbUEJr+jF3R5csktBRh/JNn58ZeDMz1YVTwHB4Ciwn0tgddXsWh?= =?utf-8?q?PNook2lNVpcquLSSFHZZMC4mv4HUF+gR0MRk0b18VrL3fDHSLxkwbEAnqRplLbYlS?= =?utf-8?q?a69kUrtOn6xKVUjp1JtYwPPAS7Og95L+vaawH6kHIroYDY1LsnviKyOK7gBDCYtbt?= =?utf-8?q?5kvjcdLZrgiKqjxl4P4SasUXUg/FJeTSvkiMZnbX/dmFrECoDjNev9E145iovc7Ik?= =?utf-8?q?WL+xrxAnO25iILLSAXkQgUPiR8ve+QHwYeLW+9bcINj+/o2yz1OrstzM0xEjPQipX?= =?utf-8?q?64oWyIzi7f2+D4lxO7El17RSIn1fYQQcF6MZOOM2YZa+WZ76uDWoVy3RmMdtVieBY?= =?utf-8?q?a5h92+3wgFbzMLoTeg7PkSmOvsu3NvyRAdkn8JzsIecxrt2GBQr2I/ABk0xZJASDx?= =?utf-8?q?pSsho8DnFL21hKL/hN81xDz4A4CXLGUEIqOwhnGpXgofIk4i5hsPNqxH/fNnvByZy?= =?utf-8?q?D8w5gg/Q9R17?= X-OriginatorOrg: kneron.us X-MS-Exchange-CrossTenant-Network-Message-Id: e3651cc5-f981-4ba3-e82f-08dce1f35671 X-MS-Exchange-CrossTenant-AuthSource: IA1PR14MB6224.namprd14.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 08:30:42.5969 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f92b0f4b-650a-4d8a-bae3-0e64697d65f2 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Ns7wg3OVzMJLUdnykfTlwfCbf/o1g7FParkyAoZhfhwrvbXlHqB+24S2SpEp/elGhoE+cSMAFtTKFBuyJ+XMEA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR14MB6462 In commit 35eba185fd1a ("i2c: designware: Calculate SCL timing parameter for High Speed Mode") hs_hcnt and hs_lcnt are calculated based on fixed tHIGH = 160 and tLOW = 120. However, the set of these fixed values only applies to the combination of hardware parameters IC_CAP_LOADING = 400pF and IC_CLK_FREQ_OPTIMIZATION = 1. Outside of this combination, if these fixed tHIGH = 160 and tLOW = 120 are still used, the calculated hs_hcnt and hs_lcnt may not be small enough, making it impossible for the SCL frequency to reach 3.4 MHz. Section 3.15.4.5 in DesignWare DW_apb_i2b Databook v2.03 says that when IC_CLK_FREQ_OPTIMIZATION = 0, MIN_SCL_HIGHtime = 60 ns for 3.4 Mbps, bus loading = 100pF = 120 ns for 3.4 Mbps, bus loading = 400pF MIN_SCL_LOWtime = 160 ns for 3.4 Mbps, bus loading = 100pF = 320 ns for 3.4 Mbps, bus loading = 400pF and section 3.15.4.6 says that when IC_CLK_FREQ_OPTIMIZATION = 1, MIN_SCL_HIGHtime = 60 ns for 3.4 Mbps, bus loading = 100pF = 160 ns for 3.4 Mbps, bus loading = 400pF MIN_SCL_LOWtime = 120 ns for 3.4 Mbps, bus loading = 100pF = 320 ns for 3.4 Mbps, bus loading = 400pF In order to calculate more accurate hs_hcnt amd hs_lcnt, two hardware parameters IC_CAP_LOADING and IC_CLK_FREQ_OPTIMIZATION must be considered together. Signed-off-by: Michael Wu --- drivers/i2c/busses/i2c-designware-common.c | 5 +++++ drivers/i2c/busses/i2c-designware-core.h | 5 +++++ drivers/i2c/busses/i2c-designware-master.c | 23 ++++++++++++++++++++-- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c index 080204182bb5..9599be1de775 100644 --- a/drivers/i2c/busses/i2c-designware-common.c +++ b/drivers/i2c/busses/i2c-designware-common.c @@ -380,6 +380,11 @@ int i2c_dw_fw_parse_and_configure(struct dw_i2c_dev *dev) i2c_parse_fw_timings(device, t, false); + if (device_property_read_u32(device, "snps,bus-capacitance-pf", &dev->bus_capacitance_pf)) + dev->bus_capacitance_pf = 100; + + dev->clk_freq_optimized = device_property_read_bool(device, "snps,clk-freq-optimized"); + i2c_dw_adjust_bus_speed(dev); if (is_of_node(fwnode)) diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h index 1ac2afd03a0a..44c97bf15843 100644 --- a/drivers/i2c/busses/i2c-designware-core.h +++ b/drivers/i2c/busses/i2c-designware-core.h @@ -240,6 +240,9 @@ struct reset_control; * @set_sda_hold_time: callback to retrieve IP specific SDA hold timing * @mode: operation mode - DW_IC_MASTER or DW_IC_SLAVE * @rinfo: I²C GPIO recovery information + * @bus_capacitance_pf: bus capacitance in picofarads + * @clk_freq_optimized: indicate whether hardware input clock frequency is + * reduced by reducing the internal latency * * HCNT and LCNT parameters can be used if the platform knows more accurate * values than the one computed based only on the input clock frequency. @@ -297,6 +300,8 @@ struct dw_i2c_dev { int (*set_sda_hold_time)(struct dw_i2c_dev *dev); int mode; struct i2c_bus_recovery_info rinfo; + u32 bus_capacitance_pf; + bool clk_freq_optimized; }; #define ACCESS_INTR_MASK BIT(0) diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c index e46f1b22c360..3dbc94db94a4 100644 --- a/drivers/i2c/busses/i2c-designware-master.c +++ b/drivers/i2c/busses/i2c-designware-master.c @@ -154,12 +154,31 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev) dev->hs_hcnt = 0; dev->hs_lcnt = 0; } else if (!dev->hs_hcnt || !dev->hs_lcnt) { + u32 t_high, t_low; + + /* + * The legal values stated in the databook for bus + * capacitance are only 100pF and 400pF. + * If dev->bus_capacitance_pf is greater than or equals + * to 400, t_high and t_low are assumed to be + * appropriate values for 400pF, otherwise 100pF. + */ + if (dev->bus_capacitance_pf >= 400) { + /* assume bus capacitance is 400pF */ + t_high = dev->clk_freq_optimized ? 160 : 120; + t_low = 320; + } else { + /* assume bus capacitance is 100pF */ + t_high = 60; + t_low = dev->clk_freq_optimized ? 120 : 160; + } + ic_clk = i2c_dw_clk_rate(dev); dev->hs_hcnt = i2c_dw_scl_hcnt(dev, DW_IC_HS_SCL_HCNT, ic_clk, - 160, /* tHIGH = 160 ns */ + t_high, sda_falling_time, 0, /* DW default */ 0); /* No offset */ @@ -167,7 +186,7 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev) i2c_dw_scl_lcnt(dev, DW_IC_HS_SCL_LCNT, ic_clk, - 320, /* tLOW = 320 ns */ + t_low, scl_falling_time, 0); /* No offset */ }