From patchwork Thu Feb 15 16:52:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Th=C3=A9o_Lebrun?= X-Patchwork-Id: 13558851 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 36B70C4829E for ; Thu, 15 Feb 2024 16:54:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vkKQYXFs+Ei7sLfo71azJ5hyOvy7K/WaFqbV1ncywII=; b=tYJdJgbNdLjM4u 6MPjg26+nYLYeRzOnHLcbuc4v9WcImrI9tU0XZ8/XGh/gameH89HfMv5R6NCrm9XWV93S/aZfeu4l ij8zjGeG26a/F4i/M3TdhWZC4FXqqnmv+eMk7Aa0j6p0iC4+7Iw4Siu+6XGE6euzaKHDhzm4dtn0B POs0PG9cQYgosl6RL0fdGLD7vDygn1VBxhLhREamowmq+cqNmv88IkA3D022TMTuDHh4lAVJRJaTu CiaTO2X3yspovCNgVywOEbmRSN+HlYMR9pONUQTIAeZ6ogVLxxWx2u0Vd6mf2WnfaJNqn6mlPBiYV fwVl27Foy2BuXMOhzkOQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1raf00-0000000H49p-0Sf2; Thu, 15 Feb 2024 16:54:12 +0000 Received: from relay4-d.mail.gandi.net ([2001:4b98:dc4:8::224]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1raeyX-0000000H3He-0asK for linux-arm-kernel@lists.infradead.org; Thu, 15 Feb 2024 16:52:47 +0000 Received: by mail.gandi.net (Postfix) with ESMTPSA id 15314E001C; Thu, 15 Feb 2024 16:52:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1708015959; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UI781RDrcik2RYtu08sBCE4vst1s92iXfDeWJ+Uj5KU=; b=X05Jz2dAVG/OH6mW1jIs5toXJymKoVNLKETT2ySNywm1E39ztnrDGFF0D8gM52fJK4ht8S GlsXS6EtRyAI8NqrY7PgfJyUBMVvBViA4JsdVZMN8W4ulmO2shWGGWJTXehc4x2dooC8NX RyILp5eN8NororpKPh7LTYt/9AsFMA78CfPfFEPhOA7YEiS4k1UBJrjJ2FYQJALUz5OCTO 106oqSyERyYZ3k+PHU2UTSe1t9JkdECSBZzOQtF/UYVaoB/j9Zsd90zu1q6phsU06un7z8 jWPCIyvX5HbtAgH44bQ3QaTbUckQBQRXspjG5PwyVBOkvn2LeXW5npVDH7SNYg== From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Thu, 15 Feb 2024 17:52:16 +0100 Subject: [PATCH 09/13] i2c: nomadik: fetch timeout-usecs property from devicetree MIME-Version: 1.0 Message-Id: <20240215-mbly-i2c-v1-9-19a336e91dca@bootlin.com> References: <20240215-mbly-i2c-v1-0-19a336e91dca@bootlin.com> In-Reply-To: <20240215-mbly-i2c-v1-0-19a336e91dca@bootlin.com> To: Linus Walleij , Andi Shyti , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Thomas Bogendoerfer Cc: linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, Gregory Clement , Vladimir Kondratiev , Thomas Petazzoni , Tawfik Bayouk , =?utf-8?q?Th=C3=A9o_Lebrun?= X-Mailer: b4 0.12.4 X-GND-Sasl: theo.lebrun@bootlin.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240215_085241_413774_61FF3E13 X-CRM114-Status: GOOD ( 11.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Allow overriding the default timeout value (200ms) from devicetree, using the timeout-usecs property. The i2c_adapter->timeout field is an unaccurate jiffies amount; i2c-nomadik uses hrtimers for timeouts below one jiffy. Signed-off-by: Théo Lebrun Reviewed-by: Linus Walleij --- drivers/i2c/busses/i2c-nomadik.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index afd54999bbbb..23e12c570457 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -964,6 +964,8 @@ static const struct i2c_algorithm nmk_i2c_algo = { static void nmk_i2c_of_probe(struct device_node *np, struct nmk_i2c_dev *priv) { + u32 timeout_usecs; + /* Default to 100 kHz if no frequency is given in the node */ if (of_property_read_u32(np, "clock-frequency", &priv->clk_freq)) priv->clk_freq = I2C_MAX_STANDARD_MODE_FREQ; @@ -975,7 +977,12 @@ static void nmk_i2c_of_probe(struct device_node *np, priv->sm = I2C_FREQ_MODE_FAST; priv->tft = 1; /* Tx FIFO threshold */ priv->rft = 8; /* Rx FIFO threshold */ - priv->timeout_usecs = 200 * USEC_PER_MSEC; /* Slave response timeout */ + + /* Slave response timeout */ + if (!of_property_read_u32(np, "timeout-usecs", &timeout_usecs)) + priv->timeout_usecs = timeout_usecs; + else + priv->timeout_usecs = 200 * USEC_PER_MSEC; } static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)