From patchwork Fri Mar 7 03:26:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guangjie Song X-Patchwork-Id: 14005793 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E6510C282D0 for ; Fri, 7 Mar 2025 03:42:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=tk0turHFIeC13cgasmUCQzEa1bXnerEPc4/fIrq5wQ0=; b=Cg8UQZdXu2lctrkOFDihiDs+db HOjml7DKkr4G67g+b8g1vQpouiVMWpG2k7IVaxlO4upL3+G3LNn3TzXzpJ9CRgmhRtE63E8K3Q5SC dYVC5+IzvH1MA0N43KlWNNxYkeXGKc1NMJrj9iaqdZei7tCoqoVPPAjM7jExfKVdxAxUlG9PgBv7Y 4Dc4Pc5uVLE85LgDyhFsayHXrSAnePs1aHWwN4K5LRhAahj4KuDRDidSBa2r0uO1L9FrM/ntPoVcF 20tFWsk3ob6LN4bpm6Q9Jy676ZvZKKRNRM0Z+SqxhLD5kITUctuOvyqLJRYkXjjNc9jc8ZVjKv+17 qmX5rpgQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tqObT-0000000D1fR-3Nto; Fri, 07 Mar 2025 03:42:27 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tqOS6-0000000CzOW-3Pzr; Fri, 07 Mar 2025 03:32:48 +0000 X-UUID: d179d89afb0411ef83f2a1c9db70dae0-20250306 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=tk0turHFIeC13cgasmUCQzEa1bXnerEPc4/fIrq5wQ0=; b=pWfwwFg/VknxF5bQcSD6bArZQDCx/0g5UvXyFwsJkdLOpY8Q8JVl1wQ1K84YVDv06enN7Glsma5/8U8FvmyK8e/L0AXqJ7U+VWgrrquHm5dJ5AJScZptbCmV6DaALcSjP5Lf1ncwkIw8x5eRl51xOh37ubzFS7fhvEXeXUB/8Ww=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.2.1,REQID:e6b917cb-b72b-4e6e-a331-272096ebf647,IP:0,UR L:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION:r elease,TS:0 X-CID-META: VersionHash:0ef645f,CLOUDID:f56321ce-23b9-4c94-add0-e827a7999e28,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:81|82|102,TC:nil,Content:0|50,EDM:-3 ,IP:nil,URL:0,File:nil,RT:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV :0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0,NGT X-CID-BAS: 0,NGT,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: d179d89afb0411ef83f2a1c9db70dae0-20250306 Received: from mtkmbs14n2.mediatek.inc [(172.21.101.76)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1349097408; Thu, 06 Mar 2025 20:32:38 -0700 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.28; Fri, 7 Mar 2025 11:32:35 +0800 Received: from mhfsdcap04.gcn.mediatek.inc (10.17.3.154) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1258.28 via Frontend Transport; Fri, 7 Mar 2025 11:32:34 +0800 From: Guangjie Song To: Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Richard Cochran CC: , , , , , , Guangjie Song , Subject: [PATCH 02/26] clk: mediatek: Support voting for pll Date: Fri, 7 Mar 2025 11:26:58 +0800 Message-ID: <20250307032942.10447-3-guangjie.song@mediatek.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20250307032942.10447-1-guangjie.song@mediatek.com> References: <20250307032942.10447-1-guangjie.song@mediatek.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250306_193246_859898_BD20DEA5 X-CRM114-Status: GOOD ( 16.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add data fields and ops to support voting for pll. Signed-off-by: Guangjie Song --- drivers/clk/mediatek/clk-pll.c | 51 +++++++++++++++++++++++++++++++++- drivers/clk/mediatek/clk-pll.h | 5 ++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c index ce453e1718e5..fdaa4ee74608 100644 --- a/drivers/clk/mediatek/clk-pll.c +++ b/drivers/clk/mediatek/clk-pll.c @@ -13,6 +13,7 @@ #include #include +#include "clk-mtk.h" #include "clk-pll.h" #define MHZ (1000 * 1000) @@ -37,6 +38,13 @@ int mtk_pll_is_prepared(struct clk_hw *hw) return (readl(pll->en_addr) & BIT(pll->data->pll_en_bit)) != 0; } +static int mtk_pll_fenc_is_prepared(struct clk_hw *hw) +{ + struct mtk_clk_pll *pll = to_mtk_clk_pll(hw); + + return (((readl(pll->fenc_addr) & pll->fenc_mask) != 0) || (pll->onoff_cnt != 0)); +} + static unsigned long __mtk_pll_recalc_rate(struct mtk_clk_pll *pll, u32 fin, u32 pcw, int postdiv) { @@ -274,6 +282,30 @@ void mtk_pll_unprepare(struct clk_hw *hw) writel(r, pll->pwr_addr); } +static int mtk_pll_fenc_prepare(struct clk_hw *hw) +{ + struct mtk_clk_pll *pll = to_mtk_clk_pll(hw); + + if (pll->onoff_cnt == 1) { + pr_err("%s: %s is already prepared\n", __func__, clk_hw_get_name(hw)); + return -EPERM; + } + + pll->onoff_cnt = 1; + + return 0; +} + +static void mtk_pll_fenc_unprepare(struct clk_hw *hw) +{ + struct mtk_clk_pll *pll = to_mtk_clk_pll(hw); + + if (pll->onoff_cnt == 0) + pr_err("%s: %s is not prepared\n", __func__, clk_hw_get_name(hw)); + else + pll->onoff_cnt = 0; +} + const struct clk_ops mtk_pll_ops = { .is_prepared = mtk_pll_is_prepared, .prepare = mtk_pll_prepare, @@ -283,6 +315,15 @@ const struct clk_ops mtk_pll_ops = { .set_rate = mtk_pll_set_rate, }; +static const struct clk_ops mtk_pll_fenc_ops = { + .is_prepared = mtk_pll_fenc_is_prepared, + .prepare = mtk_pll_fenc_prepare, + .unprepare = mtk_pll_fenc_unprepare, + .recalc_rate = mtk_pll_recalc_rate, + .round_rate = mtk_pll_round_rate, + .set_rate = mtk_pll_set_rate, +}; + struct clk_hw *mtk_clk_register_pll_ops(struct mtk_clk_pll *pll, const struct mtk_pll_data *data, void __iomem *base, @@ -313,6 +354,11 @@ struct clk_hw *mtk_clk_register_pll_ops(struct mtk_clk_pll *pll, init.name = data->name; init.flags = (data->flags & PLL_AO) ? CLK_IS_CRITICAL : 0; + if (data->flags & CLK_FENC_ENABLE) { + pll->fenc_addr = base + data->fenc_sta_ofs; + pll->fenc_mask = BIT(data->fenc_sta_bit); + } + init.ops = pll_ops; if (data->parent_name) init.parent_names = &data->parent_name; @@ -338,7 +384,10 @@ struct clk_hw *mtk_clk_register_pll(const struct mtk_pll_data *data, if (!pll) return ERR_PTR(-ENOMEM); - hw = mtk_clk_register_pll_ops(pll, data, base, &mtk_pll_ops); + if (data->flags & CLK_FENC_ENABLE) + hw = mtk_clk_register_pll_ops(pll, data, base, &mtk_pll_fenc_ops); + else + hw = mtk_clk_register_pll_ops(pll, data, base, &mtk_pll_ops); if (IS_ERR(hw)) kfree(pll); diff --git a/drivers/clk/mediatek/clk-pll.h b/drivers/clk/mediatek/clk-pll.h index 285c8db958b3..3a1e48006e34 100644 --- a/drivers/clk/mediatek/clk-pll.h +++ b/drivers/clk/mediatek/clk-pll.h @@ -29,6 +29,7 @@ struct mtk_pll_data { u32 reg; u32 pwr_reg; u32 en_mask; + u32 fenc_sta_ofs; u32 pd_reg; u32 tuner_reg; u32 tuner_en_reg; @@ -49,6 +50,7 @@ struct mtk_pll_data { u32 en_reg; u8 pll_en_bit; /* Assume 0, indicates BIT(0) by default */ u8 pcw_chg_bit; + u8 fenc_sta_bit; }; /* @@ -69,6 +71,9 @@ struct mtk_clk_pll { void __iomem *pcw_chg_addr; void __iomem *en_addr; const struct mtk_pll_data *data; + void __iomem *fenc_addr; + u32 fenc_mask; + u32 onoff_cnt; }; int mtk_clk_register_plls(struct device_node *node,