From patchwork Fri Mar 17 23:33:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Shyti X-Patchwork-Id: 71535 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp44746wrt; Fri, 17 Mar 2023 16:50:20 -0700 (PDT) X-Google-Smtp-Source: AK7set+req6b/54zvWMiG8oGqKTKFCKexj/KOom02hr9yvBayQ2J5jxWk9iuLTmwXKUCvQleKJLe X-Received: by 2002:a05:6a20:441f:b0:d4:faa7:be92 with SMTP id ce31-20020a056a20441f00b000d4faa7be92mr14643280pzb.6.1679097019827; Fri, 17 Mar 2023 16:50:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679097019; cv=none; d=google.com; s=arc-20160816; b=vn1VIGLFbvfOqLhiEvMeAmllASzAeU3YTTvpaLje/iD17S1R4ohZk5FKESpoGG0k5F XxbHGC3MMkHGimfxXALFQjf12OYmFi5JQcCyyb/Qb0Vrme2OJRm8r+Z6Tl/26RXAJAy9 UFj5tw4nh6OubG9teo0bVXMQgkp5UuQ+CS624i1OGmJ4Z6MT2oCvo0rc4yeyYfJuvCO3 klSVOpV4KVh/mElu7KUfTV8GQPXAUpXl6e8h+ORLQqs6Fyn/lvShUNrrV39vis8lLkrr m8P9yFhgbN1x6EwxKRdjmLbkx1d27/r5RlCcBcayWREkCpQ6jsuj34oJ9e7xoZ2Wwd3V hG2g== 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=M8wuDr6aq/CgMopzbVIhfS85pUoGZsWTso21Ne5TeBs=; b=wrePHvEIXgFO4ugSSRjxp81RMkNurY8sKyDLv907bS1qJjDhRVCEbHRFvDfhjOazA/ o9USJDDO3PJv0Xee2dDhgae+D5GfWeqKW5QSVoWDJ74YriRCSHHPh+QmAo/XnIc/N1EN 9AW7aaJbZ9Kk4zm9ubpHQBIRnr1CUW/u0dHWKhrShGPW+j1hzxn3mqU2hkU8gjtwq91V Dz+3YbBZUzsLel8HzBEVsld607WgOMvKMleS38re1GCqan+oVVJK92EM+EvEm0XGiMvD E3iq8CKP4K0+IAXM55rzO70UGGNutwRwVN8jDm9keTKFoSWrgrWA+kd9j1bs+ixCU8xO UXQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="ZVHl2rB/"; 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 kk1-20020a17090b4a0100b00233e876740esi3669805pjb.154.2023.03.17.16.50.06; Fri, 17 Mar 2023 16:50:19 -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="ZVHl2rB/"; 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 S230259AbjCQXeD (ORCPT + 99 others); Fri, 17 Mar 2023 19:34:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230162AbjCQXeA (ORCPT ); Fri, 17 Mar 2023 19:34:00 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A50371689F; Fri, 17 Mar 2023 16:33:59 -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 ams.source.kernel.org (Postfix) with ESMTPS id 67EC1B826E4; Fri, 17 Mar 2023 23:33:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEB59C433D2; Fri, 17 Mar 2023 23:33:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679096037; bh=aY0ALgTJbwlEVEL6SFHiKj3ExiEgeV4xhWNyVCp61gA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZVHl2rB/y2sifflrf3iNaORordYxXWFgXSHLcPkDut69XFa1deQyQQCYEkc+3XNXx Ut50rSDCn0RAqv+oxnJyde8HgAppUPmsRcJ4C5OtowaJbCEL8VQgNABys30mVYwWaR Haec9hKYB2I8jSMPWus2ngl6KNPX4Yq7sjr7bAPmGdHA0Hu7LH08y7XLsCG1WOJw5c w5a7kR2v4KPz7T12MPsDFjofnqh9zr+n9UFFOiDzVGdlFbGOXBHJeYkUwX+rCS6kHT 6TkVPBIA6BoZ/JzLQa/xvGnIOKm7k9mQpRc4dk6dqvuk/c65pZsM6a3ku/jvgWkGmi AUg0FNxVCVjvA== From: Andi Shyti To: linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Wolfram Sang , Rob Herring , Krzysztof Kozlowski , Chris Packham , Ryan Chen , Andi Shyti Subject: [PATCH v5 1/3] dt-bindings: i2c: mpc: Mark "fsl,timeout" as deprecated Date: Sat, 18 Mar 2023 00:33:36 +0100 Message-Id: <20230317233338.424864-2-andi.shyti@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230317233338.424864-1-andi.shyti@kernel.org> References: <20230317233338.424864-1-andi.shyti@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760660836236606710?= X-GMAIL-MSGID: =?utf-8?q?1760660836236606710?= Now we have the i2c-scl-clk-low-timeout-us property defined in the i2c schema. Mark "fsl,timeout" as deprecated and update the example. Signed-off-by: Andi Shyti Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/i2c/i2c-mpc.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/i2c/i2c-mpc.yaml b/Documentation/devicetree/bindings/i2c/i2c-mpc.yaml index 018e1b9444248..70fb69b923c46 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mpc.yaml +++ b/Documentation/devicetree/bindings/i2c/i2c-mpc.yaml @@ -43,6 +43,7 @@ properties: fsl,timeout: $ref: /schemas/types.yaml#/definitions/uint32 + deprecated: true description: | I2C bus timeout in microseconds @@ -95,6 +96,6 @@ examples: interrupts = <43 2>; interrupt-parent = <&mpic>; clock-frequency = <400000>; - fsl,timeout = <10000>; + i2c-scl-clk-low-timeout-us = <10000>; }; ... From patchwork Fri Mar 17 23:33:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Shyti X-Patchwork-Id: 71536 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp44809wrt; Fri, 17 Mar 2023 16:50:32 -0700 (PDT) X-Google-Smtp-Source: AK7set/v0KRk/8SANo5BoEBlHrY2OxQZWSApPlsHgb4x4BHVrEF34bxvqxqH9mEI3GfehvLpJm5z X-Received: by 2002:a17:90a:2a0f:b0:233:b57f:23c5 with SMTP id i15-20020a17090a2a0f00b00233b57f23c5mr7872630pjd.2.1679097032055; Fri, 17 Mar 2023 16:50:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679097032; cv=none; d=google.com; s=arc-20160816; b=gtClkZ1KMJ5V4WE3FI9x2CbuBBVi6gEKrPTiGDIpp9rwHLcXUCXEhK6pNgX4GAMEoc fJU6cwNVC/A/WYJGzb5O9yjSOTYeUaDUH685lA8qJsFY+8jebNY9w8Xck+yRtHJSOf2C T4ozLk3wk2cIOhzCmQfZI1SnLLs8j818qfeQTmeo1naSJBk++jeudT9tRIVJ8VyFDQRI 4wBJPAvIzAn8LtM5vfM5JLcUd/cmBZqpZJf4LGT2Jm0Ny0a+xco01rJtv6EmNqGlpWop 8rs4HJkv8WD9ynlYlztO2gFWcDwHIRE8VkZjFFdLcnOPEdUobmklu+xF+/GFWZ/8/vjx NKwg== 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=A9XeM/OcqTEG5WSk5Ou0L94aRUZSIcPMTD36ovOXR/M=; b=QUtVFgOrLxsA3H0GJ5VQEe/8mKt0h+Qg7Wip+uPoHHiWPLzfeWdaZbCCvTKBb6IKd6 wWzzXF4IcLcWu3tFsuHjD9dbenosWr/9yuyUTB6kJesrHSrC6TWVmo/OWYx/wcOt2yBo bFtlBn6fbBdTnzVMlHWDRy36NKj2fPXepJpe/eURoa/dkVT53etqQfci1hWfxyjBL5L7 A3ZIGsFF/fsHyDGXyyb8SkndedNcqbrLvRacdHZOZ2dSp5lKZP92oJceEO9/jyHhp+aV ue2nkG6C/2MJVSfzhw5Ed35hY47qAJBtC4wV4bq4thV69nVzE/KC+QYo86hVX6KScxSU xcEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=IKtKXy4D; 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 co6-20020a17090afe8600b002309f0bd759si8967203pjb.92.2023.03.17.16.50.16; Fri, 17 Mar 2023 16:50:32 -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=IKtKXy4D; 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 S230374AbjCQXeL (ORCPT + 99 others); Fri, 17 Mar 2023 19:34:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230058AbjCQXeE (ORCPT ); Fri, 17 Mar 2023 19:34:04 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CC615D46F; Fri, 17 Mar 2023 16:34:02 -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 ams.source.kernel.org (Postfix) with ESMTPS id 20C0CB82719; Fri, 17 Mar 2023 23:34:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 85939C433D2; Fri, 17 Mar 2023 23:33:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679096039; bh=Fj8yGHpRJ2cwMKQjkBoqZUo4pt/4tchEUAmqGrvtDes=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IKtKXy4DQDYc6bjrSgml+CRcROvj8c7RIxr9CuAFkOSMajnqLxK530LIGnbHzkVt/ G220axmeyAY+3B9dkjRI7008Dk9+jYR1KCPewho6+NnJJi+0CGzsE5iTlTZV8JyVFd NnKKDA+BBECV7WsvOEdrv1t74H92Kgo6x8Cfcy+yhoSXBnnDh7KSqq/CqxC06f6+mx dNZzGULOzq/WadvA+idopHknEOGYqBL5e1MPTp98Olp//sEbrbpW1cWJa32+9wxcoX aUwIqgh50dMVSvyop9oAQCrxiAH10mfersRiTYLrQOXZCsD4J6ZVyMGEHX1AeKinE+ t72JtnJOOUzSg== From: Andi Shyti To: linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Wolfram Sang , Rob Herring , Krzysztof Kozlowski , Chris Packham , Ryan Chen , Andi Shyti Subject: [PATCH v5 2/3] i2c: mpc: Use of_property_read_u32 instead of of_get_property Date: Sat, 18 Mar 2023 00:33:37 +0100 Message-Id: <20230317233338.424864-3-andi.shyti@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230317233338.424864-1-andi.shyti@kernel.org> References: <20230317233338.424864-1-andi.shyti@kernel.org> MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760660849282414710?= X-GMAIL-MSGID: =?utf-8?q?1760660849282414710?= "of_property_read_u32()" is preferred to "of_get_property()" for retreiving u32 from the device tree. Replace it. Suggested-by: Chris Packham Signed-off-by: Andi Shyti Tested-by: Chris Packham Reviewed-by: Chris Packham --- drivers/i2c/busses/i2c-mpc.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index bec0c5dc20d16..02baba2284e27 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c @@ -770,7 +770,6 @@ static const struct i2c_algorithm mpc_algo = { static struct i2c_adapter mpc_ops = { .owner = THIS_MODULE, .algo = &mpc_algo, - .timeout = HZ, }; static struct i2c_bus_recovery_info fsl_i2c_recovery_info = { @@ -781,11 +780,9 @@ static int fsl_i2c_probe(struct platform_device *op) { const struct mpc_i2c_data *data; struct mpc_i2c *i2c; - const u32 *prop; - u32 clock = MPC_I2C_CLOCK_LEGACY; - int result = 0; - int plen; struct clk *clk; + int result; + u32 clock; int err; i2c = devm_kzalloc(&op->dev, sizeof(*i2c), GFP_KERNEL); @@ -831,10 +828,10 @@ static int fsl_i2c_probe(struct platform_device *op) if (of_property_read_bool(op->dev.of_node, "fsl,preserve-clocking")) { clock = MPC_I2C_CLOCK_PRESERVE; } else { - prop = of_get_property(op->dev.of_node, "clock-frequency", - &plen); - if (prop && plen == sizeof(u32)) - clock = *prop; + result = of_property_read_u32(op->dev.of_node, + "clock-frequency", &clock); + if (result) + clock = MPC_I2C_CLOCK_LEGACY; } data = device_get_match_data(&op->dev); @@ -846,12 +843,16 @@ static int fsl_i2c_probe(struct platform_device *op) mpc_i2c_setup_8xxx(op->dev.of_node, i2c, clock); } - prop = of_get_property(op->dev.of_node, "fsl,timeout", &plen); - if (prop && plen == sizeof(u32)) { - mpc_ops.timeout = *prop * HZ / 1000000; + 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) mpc_ops.timeout = 5; + } else { + mpc_ops.timeout = HZ; } + dev_info(i2c->dev, "timeout %u us\n", mpc_ops.timeout * 1000000 / HZ); if (of_property_read_bool(op->dev.of_node, "fsl,i2c-erratum-a004447")) From patchwork Fri Mar 17 23:33:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andi Shyti X-Patchwork-Id: 71526 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp41213wrt; Fri, 17 Mar 2023 16:37:18 -0700 (PDT) X-Google-Smtp-Source: AK7set+wfG4Jgy05uDRm1yyw2oa+RuDEnL+LqvM/A7EC1MsXxTwSl9FMbqaoOg6UyWAPT5p12Gy9 X-Received: by 2002:a17:90b:3548:b0:23b:4bce:97de with SMTP id lt8-20020a17090b354800b0023b4bce97demr7837427pjb.4.1679096238429; Fri, 17 Mar 2023 16:37:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679096238; cv=none; d=google.com; s=arc-20160816; b=UO+a02j3C1F6pgdDD3EHXz7au1/x/nf9ez7ivF4TLKE8ZGfEQTjZbcm7BqVLe+nqI3 yFN1D+lkpK8W8KXSWJjcBQihFVJH9K9pClfr6DV46VeaOpuUVGzCe3aM+1r8CPwtaU8B 7zYhRs1OBvVVgyjhe6J5Af/mB9KV0XWIO1G3kzU0O7tIawXrO2sWSzce9l+rVmR9JW5e t/YQKMt0CzMCN080B796uawIqaAChC/vqj/F6QQ9WPmxz+w8r+cy4ydBDPNDYblqVbjm zme13H2qAx6lO0s8/AigJBdeeWucHTcFzSWEjHTfCB92jsJuUAkWYV2lBl8/EjYZ6T/o lVWg== 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=ab/5Hd5rl9QA+xXNvZYAyG8oi+T6FIo+511hEWMVwxE=; b=Rdj0bZH/xesz0EFYXYGMUJKISwgaYIfl7JOGjRMWZ2FkmrCDW6/L+VL26pu7bgypm0 8C4GWubwWjZcO1XMACNfO2ZnqGE6X2AXove6kepYWPjBk7XXQAh25VfuR3peOXiTDDCJ 7awEOntbcFzVQ/HZGZ8nz/VMsV2uKzHwKYIwxS68SNHvKuzaqW3d4jSnEm+4D0swm467 qa75JvE5neLQuj7IZg24inP6ANTSNoId5zbFxHMQb7p4WY98gKez1OgJhx31YJx1jbPN dAaSEZKlZF2biS/Jg418IHzjBcuTCRf173y7zNDf97Qc8r/8wJY/QbVcM2JE4/LGeJd4 pH3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hsRIucMc; 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 ng17-20020a17090b1a9100b0023f0ea50269si8438443pjb.42.2023.03.17.16.37.05; Fri, 17 Mar 2023 16:37:18 -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=hsRIucMc; 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 S230329AbjCQXeO (ORCPT + 99 others); Fri, 17 Mar 2023 19:34:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230247AbjCQXeF (ORCPT ); Fri, 17 Mar 2023 19:34:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF9D05D882; Fri, 17 Mar 2023 16:34:03 -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 2532D60CD4; Fri, 17 Mar 2023 23:34:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34C2AC433D2; Fri, 17 Mar 2023 23:34:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679096042; bh=MMgl7BH2vYNW64S6J+FPvpa5ZVx8951MJKLTeJvEY9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hsRIucMcR17ozhb79cSGP8g6KI3zAA6XTphrCEwSwbyUS2QI1mbTkkCoo88ejyjpz We7W+oyltMWv3HgymN+ocAQuUtLyNHfyWHpwkGkKGDnaVDxkhSVJ2W+waeDUiiXrTL qQE7RJ3I+H1kfsg3Z3KuVX0/PZM2FsDSimVamCHsL0LiIItM7wSuLndc2cTAKOYgRd /DkXc4QsmTOJYNsiEPrQIQfY3e2vvTsLINV+nYrDH725ZXHJ/3SGSXAF1M2u5f82ZY AWXIKfTcqxF/tN2xFdbIzc+RZz2TCYOoUXzefJZfJ0HXUgPdHVkNm/pMz1FC3UE0Uh FUe21nobSeAlg== From: Andi Shyti To: linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Wolfram Sang , Rob Herring , Krzysztof Kozlowski , Chris Packham , Ryan Chen , Andi Shyti Subject: [PATCH v5 3/3] i2c: mpc: Use i2c-scl-clk-low-timeout-us i2c property Date: Sat, 18 Mar 2023 00:33:38 +0100 Message-Id: <20230317233338.424864-4-andi.shyti@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230317233338.424864-1-andi.shyti@kernel.org> References: <20230317233338.424864-1-andi.shyti@kernel.org> MIME-Version: 1.0 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760660017391048215?= X-GMAIL-MSGID: =?utf-8?q?1760660017391048215?= "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 Reviewed-by: Chris Packham Tested-by: Chris Packham Reviewed-by: Krzysztof Kozlowski --- 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 02baba2284e27..cfd074ee6d547 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-us" 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)