Message ID | 20230314215612.23741-4-andi.shyti@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2005716wrd; Tue, 14 Mar 2023 15:04:34 -0700 (PDT) X-Google-Smtp-Source: AK7set96woGM4O+0PO+XaFQ/ycYCC70e8CitDMWvzKEDwvP/0iQcd0cHiPNS7Vdy9c2YDiGTBTz2 X-Received: by 2002:aa7:9f5a:0:b0:624:7c9a:c832 with SMTP id h26-20020aa79f5a000000b006247c9ac832mr6315308pfr.8.1678831474023; Tue, 14 Mar 2023 15:04:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678831474; cv=none; d=google.com; s=arc-20160816; b=SFB+Ru/fsutkEezYXWCMHDJyEOLOfqnuXj2R7grkW6pqTr+zC/8RWO/IbNaB+6BWH+ AxV4V9dxL851n8GJ8Jzl0VZ56ASu3GVxUNy/4dbtoX288K/fT4Yegn89R3X2B92a7ycN ZeDn8KzeJqJC5Z1jUQr7zo780IjTXkXoiXkEtwUvgzNDDQPEaP1bhY8pD1xzW+Regpmj 6nH3+aJI60LIiPshXU8IWBTx1c1RKGgma94Pw7yNUKILlJypa/iU+CZbesVdNadI8Uq3 S8k2AdhVoJjv+DCvCliVip4atbBl2NfZcrHvV409/5bXfvpv0icSxxp7iebLf+HSRnV/ zcQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8wRplDfCR/EsPTuIxrqe7RPgnGsqHeEzIQt/HiT+GJM=; b=Kar4rbW2/Rv7P0tVHRKOqT7wzKzLRFIhCeNLBfDwadg6zOGoj51dGbbDT5z4Yboo4m AmL8QB/jJRpJXMsxc82qy/ElxHqrV+yeMvbDepu+4Ntw5Gni1UiJ/F2+Fiyk3BtuTe9f yNYSL67ru7PrVRrkGqC1DS+btuqISvvl93AUpYjqptexGBylN8LJFznCiAsIPRnZohOn MmNVHDQbr1aJRyptgkmEtjAlJNl18dqt9Ri9F7KO+P4Z/P/vjHY4ji6VHUAyGHY6raLf AWWuL1sJpRmi2Lv3XMQIh94lH3GvAco1ova+HlSbrMdpKE7bKa9Bkhr6k1jR1vTzucpQ Rktg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OECqL0OZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v187-20020a632fc4000000b0049b37046fbcsi3170834pgv.391.2023.03.14.15.04.17; Tue, 14 Mar 2023 15:04:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OECqL0OZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231152AbjCNV6V (ORCPT <rfc822;realc9580@gmail.com> + 99 others); Tue, 14 Mar 2023 17:58:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230515AbjCNV6N (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 14 Mar 2023 17:58:13 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9F5924BD2; Tue, 14 Mar 2023 14:58:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5421861A0D; Tue, 14 Mar 2023 21:58:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2288DC43444; Tue, 14 Mar 2023 21:58:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678831089; bh=rzP1OfS87vsi0Hjf6WC+JjuWr6HX7jni765Ubv/Snwo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OECqL0OZS07uL3BzVRDTosxxVUJFVMcoNQdawBbYgTjyUz3PZt5zKoh041xF5/mco Fvh9F3Q7Yxnn1ttLQEqkgA+/T7WnzNlyFNhufKlQgw5P7AJ/XerITj2epTSu1IS14d 7JRoyyPFPHWYMl63UQ6W5/CjiItGejF4dygaGmtdbjAChrS0pzmAs6HC25LcbZWVeo E4O89HvSyxUQoDOc+cQ9B03kO9Cm5eNg/04KnvxVTKfZBt4zlhXYhHxoq0REshG9Mh wt8NbpAmBoVqoWFw6PRBcVIn4kx5byLGdxFtLXYX6X5YucClIwd1ydf6FtTI+RqZDd +PTIdq3UKCWtw== From: Andi Shyti <andi.shyti@kernel.org> To: linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Wolfram Sang <wsa@kernel.org>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Chris Packham <chris.packham@alliedtelesis.co.nz>, Ryan Chen <ryan_chen@aspeedtech.com>, Andi Shyti <andi.shyti@kernel.org> Subject: [PATCH v4 3/3] i2c: mpc: Use i2c-scl-clk-low-timeout-ms i2c property Date: Tue, 14 Mar 2023 22:56:12 +0100 Message-Id: <20230314215612.23741-4-andi.shyti@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314215612.23741-1-andi.shyti@kernel.org> References: <20230314215612.23741-1-andi.shyti@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760382391434115546?= X-GMAIL-MSGID: =?utf-8?q?1760382391434115546?= |
Series |
Add the clock stretching i2c property
|
|
Commit Message
Andi Shyti
March 14, 2023, 9:56 p.m. UTC
"fsl,timeout" is marked as deprecated and replaced by the "i2c-scl-clk-low-timeout-us" i2c property. Use this latter and, in case it is missing, for back compatibility, check whether we still have "fsl,timeout" defined. Signed-off-by: Andi Shyti <andi.shyti@kernel.org> Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz> Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz> --- drivers/i2c/busses/i2c-mpc.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
Comments
Just to be a pain the subject line still says "ms" On 15/03/23 10:56, Andi Shyti wrote: > "fsl,timeout" is marked as deprecated and replaced by the > "i2c-scl-clk-low-timeout-us" i2c property. > > Use this latter and, in case it is missing, for back > compatibility, check whether we still have "fsl,timeout" defined. > > Signed-off-by: Andi Shyti <andi.shyti@kernel.org> > Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > --- > drivers/i2c/busses/i2c-mpc.c | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c > index 87e5c1725750f..e8798f9c23fcc 100644 > --- a/drivers/i2c/busses/i2c-mpc.c > +++ b/drivers/i2c/busses/i2c-mpc.c > @@ -843,8 +843,18 @@ static int fsl_i2c_probe(struct platform_device *op) > mpc_i2c_setup_8xxx(op->dev.of_node, i2c, clock); > } > > + /* > + * "fsl,timeout" has been marked as deprecated and, to maintain > + * backward compatibility, we will only look for it if > + * "i2c-scl-clk-low-timeout-ms" is not present. > + */ > result = of_property_read_u32(op->dev.of_node, > - "fsl,timeout", &mpc_ops.timeout); > + "i2c-scl-clk-low-timeout-us", > + &mpc_ops.timeout); > + if (result == -EINVAL) > + result = of_property_read_u32(op->dev.of_node, > + "fsl,timeout", &mpc_ops.timeout); > + > if (!result) { > mpc_ops.timeout *= HZ / 1000000; > if (mpc_ops.timeout < 5)
> Just to be a pain the subject line still says "ms" I have changed hundreds of /ms/us/ in this last half an hour... of course I forgot some :) There is also one in the comment. Thanks for spotting it, Chris! Andi > On 15/03/23 10:56, Andi Shyti wrote: > > "fsl,timeout" is marked as deprecated and replaced by the > > "i2c-scl-clk-low-timeout-us" i2c property. > > > > Use this latter and, in case it is missing, for back > > compatibility, check whether we still have "fsl,timeout" defined. > > > > Signed-off-by: Andi Shyti <andi.shyti@kernel.org> > > Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > > Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > > --- > > drivers/i2c/busses/i2c-mpc.c | 12 +++++++++++- > > 1 file changed, 11 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c > > index 87e5c1725750f..e8798f9c23fcc 100644 > > --- a/drivers/i2c/busses/i2c-mpc.c > > +++ b/drivers/i2c/busses/i2c-mpc.c > > @@ -843,8 +843,18 @@ static int fsl_i2c_probe(struct platform_device *op) > > mpc_i2c_setup_8xxx(op->dev.of_node, i2c, clock); > > } > > > > + /* > > + * "fsl,timeout" has been marked as deprecated and, to maintain > > + * backward compatibility, we will only look for it if > > + * "i2c-scl-clk-low-timeout-ms" is not present. > > + */ > > result = of_property_read_u32(op->dev.of_node, > > - "fsl,timeout", &mpc_ops.timeout); > > + "i2c-scl-clk-low-timeout-us", > > + &mpc_ops.timeout); > > + if (result == -EINVAL) > > + result = of_property_read_u32(op->dev.of_node, > > + "fsl,timeout", &mpc_ops.timeout); > > + > > if (!result) { > > mpc_ops.timeout *= HZ / 1000000; > > if (mpc_ops.timeout < 5)
On 14/03/2023 22:56, Andi Shyti wrote: > "fsl,timeout" is marked as deprecated and replaced by the > "i2c-scl-clk-low-timeout-us" i2c property. > > Use this latter and, in case it is missing, for back > compatibility, check whether we still have "fsl,timeout" defined. > > Signed-off-by: Andi Shyti <andi.shyti@kernel.org> > Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz> > --- Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 87e5c1725750f..e8798f9c23fcc 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c @@ -843,8 +843,18 @@ static int fsl_i2c_probe(struct platform_device *op) mpc_i2c_setup_8xxx(op->dev.of_node, i2c, clock); } + /* + * "fsl,timeout" has been marked as deprecated and, to maintain + * backward compatibility, we will only look for it if + * "i2c-scl-clk-low-timeout-ms" is not present. + */ result = of_property_read_u32(op->dev.of_node, - "fsl,timeout", &mpc_ops.timeout); + "i2c-scl-clk-low-timeout-us", + &mpc_ops.timeout); + if (result == -EINVAL) + result = of_property_read_u32(op->dev.of_node, + "fsl,timeout", &mpc_ops.timeout); + if (!result) { mpc_ops.timeout *= HZ / 1000000; if (mpc_ops.timeout < 5)