From patchwork Wed Apr 20 13:05:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?UmV4LUJDIENoZW4gKOmZs+afj+i+sCk=?= X-Patchwork-Id: 12820200 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2024BC433EF for ; Wed, 20 Apr 2022 13:06:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378783AbiDTNIz (ORCPT ); Wed, 20 Apr 2022 09:08:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378823AbiDTNIl (ORCPT ); Wed, 20 Apr 2022 09:08:41 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30E70427C4; Wed, 20 Apr 2022 06:05:46 -0700 (PDT) X-UUID: 9d03251d37334502ab98191096065420-20220420 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.4,REQID:03800ecb-71ba-4c86-ae42-8c63d2194638,OB:-327 68,LOB:0,IP:0,URL:8,TC:0,Content:-20,EDM:0,RT:0,SF:-32768,FILE:0,RULE:Rele ase_Ham,ACTION:release,TS:-12 X-CID-INFO: VERSION:1.1.4,REQID:03800ecb-71ba-4c86-ae42-8c63d2194638,OB:-32768 ,LOB:0,IP:0,URL:8,TC:0,Content:-20,EDM:0,RT:0,SF:-32768,FILE:0,RULE:Releas e_Ham,ACTION:release,TS:-12 X-CID-META: VersionHash:faefae9,CLOUDID:2be65cf0-da02-41b4-b6df-58f4ccd36682,C OID:nil,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,File:nil,QS:0,BEC:nil X-UUID: 9d03251d37334502ab98191096065420-20220420 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 200531248; Wed, 20 Apr 2022 21:05:31 +0800 Received: from mtkexhb01.mediatek.inc (172.21.101.102) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 20 Apr 2022 21:05:30 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkexhb01.mediatek.inc (172.21.101.102) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 20 Apr 2022 21:05:30 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 20 Apr 2022 21:05:30 +0800 From: Rex-BC Chen To: , CC: , , , , , , , , , , , , Rex-BC Chen Subject: [PATCH V2 09/12] clk: mediatek: reset: Add support for input offset and bit from DT Date: Wed, 20 Apr 2022 21:05:24 +0800 Message-ID: <20220420130527.23200-10-rex-bc.chen@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220420130527.23200-1-rex-bc.chen@mediatek.com> References: <20220420130527.23200-1-rex-bc.chen@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org To use the clock reset function easier, we implement the of_xlate. This function is only adopted in version MTK_SET_CLR because of the method of id calculation. There is no impact for original use. If the argument number is not larger than 1, it will return original id. With this implementation if we want to set offset 0x120 and bit 16, we can just write something like "resets = <&infra_rst 0x120 16>;". Signed-off-by: Rex-BC Chen --- drivers/clk/mediatek/reset.c | 24 ++++++++++++++++++++++++ drivers/clk/mediatek/reset.h | 1 + 2 files changed, 25 insertions(+) diff --git a/drivers/clk/mediatek/reset.c b/drivers/clk/mediatek/reset.c index 1173111af3ab..dbe812062bf5 100644 --- a/drivers/clk/mediatek/reset.c +++ b/drivers/clk/mediatek/reset.c @@ -59,6 +59,20 @@ static const struct reset_control_ops mtk_reset_ops_set_clr = { .reset = mtk_reset_set_clr, }; +static int reset_xlate(struct reset_controller_dev *rcdev, + const struct of_phandle_args *reset_spec) +{ + unsigned int offset, bit; + + if (reset_spec->args_count <= 1) + return reset_spec->args[0]; + + offset = reset_spec->args[0]; + bit = reset_spec->args[1]; + + return (offset >> 4) * 32 + bit; +} + static const struct reset_control_ops *rst_op[MTK_RST_MAX] = { [MTK_RST_SIMPLE] = &reset_simple_ops, [MTK_RST_SET_CLR] = &mtk_reset_ops_set_clr, @@ -98,6 +112,11 @@ int mtk_clk_register_rst_ctrl(struct device_node *np, data->rcdev.ops = rst_op[desc->version]; data->rcdev.of_node = np; + if (desc->version == MTK_RST_SET_CLR) { + data->rcdev.of_reset_n_cells = max(desc->reset_n_cells, 1); + data->rcdev.of_xlate = reset_xlate; + } + ret = reset_controller_register(&data->rcdev); if (ret) { pr_err("could not register reset controller: %d\n", ret); @@ -143,6 +162,11 @@ int mtk_clk_register_rst_ctrl_with_dev(struct device *dev, data->rcdev.of_node = np; data->rcdev.dev = dev; + if (desc->version == MTK_RST_SET_CLR) { + data->rcdev.of_reset_n_cells = max(desc->reset_n_cells, 1); + data->rcdev.of_xlate = reset_xlate; + } + ret = devm_reset_controller_register(dev, &data->rcdev); if (ret) dev_err(dev, "could not register reset controller: %d\n", ret); diff --git a/drivers/clk/mediatek/reset.h b/drivers/clk/mediatek/reset.h index 30559bf45f7e..4cfc281fc50d 100644 --- a/drivers/clk/mediatek/reset.h +++ b/drivers/clk/mediatek/reset.h @@ -19,6 +19,7 @@ struct mtk_clk_rst_desc { u8 version; u32 reg_num; u16 reg_ofs; + int reset_n_cells; }; struct mtk_clk_rst_data {