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)