From patchwork Tue Nov 8 01:58:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenweilong X-Patchwork-Id: 16800 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2426829wru; Mon, 7 Nov 2022 18:06:53 -0800 (PST) X-Google-Smtp-Source: AMsMyM6Ci/4+LeCv/+VMBfcCVA5q1et890IbIk02eK08M81/eFQjuNw8OShKVDiwterh2ZKgi6Q9 X-Received: by 2002:a17:907:2bc1:b0:7ad:d3a4:9df6 with SMTP id gv1-20020a1709072bc100b007add3a49df6mr43454200ejc.188.1667873213257; Mon, 07 Nov 2022 18:06:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667873213; cv=none; d=google.com; s=arc-20160816; b=0d3kCnUip+/mRcPS4DeRjcJyeCbpxPWRYvXZVnOWFRMweFxTZKMhp4V6WXHknGld5R SNzTepebndlkfYZ+fhyi97SckKyDgnXJVckit1oLnp0Kby15QlpGpr5qVifAIsQy5Gzy NCH7OjfKjZoMan4mMgD83QTVvyhBSMnkVGqB+ODPqctktrOnyiXK2l+zYAaFXregmP6R tNk56LTof/td6fkmDTftBLRCVWXfT1c/s3ZysmF7QPJoGGeq+NeHv0JnE0uyZrwtKNWS 2AMvwiT9PSSXAIYWPEhmnvy2r+/cLBdeHIcJ1l/IFAvLi5t7LwGPAU1ZCTa5CL84WZzv SLZA== 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 :message-id:date:subject:cc:to:from; bh=dEmSsZM0pVnFOlBTqWH+EShq10qyIhy4LZqKu5tcaZM=; b=HaR9mhSbJ4dymhrVT4LkH0XHI5cpc0ERGMjISMIGzHEIKtpjapFBYtv7qzVRNcyWzq qzMkTtaQW3ooBp1XUHa+Ce7gSoLf24MCCNUIxNs45Ahw86ZhrATIzcci+IdOKBIyn3L8 eX99u4geyiB5STEvqdzrQNmu6djOMr2EWT6IPFYiJDnWS8MB/uWwFNyad0w8aYmXvxdu UIB493OqeuYW0POBdx9zK5vKn2RCAn1iqCiYRTHtSNrCE6meYRxskBKxoPK+jVIOnjzt zq6w5zMc3Ex2sYtl1zxz4ZAwcwWIxdQ6y349RlxWSwBrk+B8F7rARecFthHkMpx+VPzE zDRg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dz10-20020a0564021d4a00b004621e2c473dsi13126920edb.354.2022.11.07.18.06.29; Mon, 07 Nov 2022 18:06:53 -0800 (PST) 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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233072AbiKHBvJ (ORCPT + 99 others); Mon, 7 Nov 2022 20:51:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229485AbiKHBvH (ORCPT ); Mon, 7 Nov 2022 20:51:07 -0500 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF3331DF18; Mon, 7 Nov 2022 17:51:06 -0800 (PST) Received: from canpemm500004.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4N5rZP4hKZzpW4R; Tue, 8 Nov 2022 09:47:25 +0800 (CST) Received: from localhost (10.175.101.6) by canpemm500004.china.huawei.com (7.192.104.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 8 Nov 2022 09:51:04 +0800 From: Weilong Chen To: , , CC: , Subject: [PATCH v5] i2c: hisi: Add support to get clock frequency from clock property Date: Tue, 8 Nov 2022 09:58:11 +0800 Message-ID: <20221108015811.275384-1-chenweilong@huawei.com> X-Mailer: git-send-email 2.31.GIT MIME-Version: 1.0 X-Originating-IP: [10.175.101.6] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To canpemm500004.china.huawei.com (7.192.104.92) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,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?1748891822476016618?= X-GMAIL-MSGID: =?utf-8?q?1748891822476016618?= The clk_rate attribute is not generic device tree bindings for I2C busses described in Documentation/devicetree/bindings/i2c/i2c.txt. It can be managed by clock binding. Support the driver to obtain clock information by clk_rate or clock property. Find clock first, if not, fall back to clk_rate. Signed-off-by: Weilong Chen Acked-by: Yicong Yang --- Change since v4: - No change, just resend. As its the dependency "i2c: hisi: Add initial device tree support" is applied. Link: https://lore.kernel.org/lkml/Yz3XLfHGzrPcOEpn@shikoro/T/ Change since v3: - Commit message update. Link: https://lore.kernel.org/lkml/20220926091503.199474-1-chenweilong@huawei.com/T/ Change since v2: - Remove redundant blank line. Link: https://lore.kernel.org/all/20220923011417.78994-1-chenweilong@huawei.com/ Change since v1: - Ordered struct field to inverted triangle. - Use devm_clk_get_optional_enabled(). - Use IS_ERR_OR_NULL. Link: https://lore.kernel.org/lkml/20220921101540.352553-1-chenweilong@huawei.com/ drivers/i2c/busses/i2c-hisi.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-hisi.c b/drivers/i2c/busses/i2c-hisi.c index bcc97e4fcb65..8c6c7075c765 100644 --- a/drivers/i2c/busses/i2c-hisi.c +++ b/drivers/i2c/busses/i2c-hisi.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include @@ -88,6 +89,7 @@ struct hisi_i2c_controller { struct i2c_adapter adapter; void __iomem *iobase; struct device *dev; + struct clk *clk; int irq; /* Intermediates for recording the transfer process */ @@ -454,10 +456,15 @@ static int hisi_i2c_probe(struct platform_device *pdev) return ret; } - ret = device_property_read_u64(dev, "clk_rate", &clk_rate_hz); - if (ret) { - dev_err(dev, "failed to get clock frequency, ret = %d\n", ret); - return ret; + ctlr->clk = devm_clk_get_optional_enabled(&pdev->dev, NULL); + if (IS_ERR_OR_NULL(ctlr->clk)) { + ret = device_property_read_u64(dev, "clk_rate", &clk_rate_hz); + if (ret) { + dev_err(dev, "failed to get clock frequency, ret = %d\n", ret); + return ret; + } + } else { + clk_rate_hz = clk_get_rate(ctlr->clk); } ctlr->clk_rate_khz = DIV_ROUND_UP_ULL(clk_rate_hz, HZ_PER_KHZ);