LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Chun-Jie Chen <chun-jie.chen@mediatek.com>
To: Matthias Brugger <matthias.bgg@gmail.com>,
	Stephen Boyd <sboyd@kernel.org>,
	Nicolas Boichat <drinkcat@chromium.org>,
	Rob Herring <robh+dt@kernel.org>
Cc: <linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>,
	<linux-mediatek@lists.infradead.org>, <linux-clk@vger.kernel.org>,
	<devicetree@vger.kernel.org>, <srv_heupstream@mediatek.com>,
	<Project_Global_Chrome_Upstream_Group@mediatek.com>,
	Weiyi Lu <weiyi.lu@mediatek.com>,
	Chun-Jie Chen <chun-jie.chen@mediatek.com>
Subject: [v14 06/21] clk: mediatek: Fix asymmetrical PLL enable and disable control
Date: Mon, 26 Jul 2021 18:57:04 +0800	[thread overview]
Message-ID: <20210726105719.15793-7-chun-jie.chen@mediatek.com> (raw)
In-Reply-To: <20210726105719.15793-1-chun-jie.chen@mediatek.com>

In fact, the en_mask is a combination of divider enable mask
and pll enable bit(bit0).
Before this patch, we enabled both divider mask and bit0 in prepare(),
but only cleared the bit0 in unprepare().
In the future, we hope en_mask will only be used as divider enable mask.
The enable register(CON0) will be set in 2 steps:
first is divider mask, and then bit0 during prepare(), and vice versa.
But considering backward compatibility, at this stage we allow en_mask
to be a combination or a pure divider enable mask.
And then we will make en_mask a pure divider enable mask in another
following patch series.

Reviewed-by: Ikjoon Jang <ikjn@chromium.org>
Signed-off-by: Weiyi Lu <weiyi.lu@mediatek.com>
Signed-off-by: Chun-Jie Chen <chun-jie.chen@mediatek.com>
---
 drivers/clk/mediatek/clk-pll.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c
index f440f2cd0b69..11ed5d1d1c36 100644
--- a/drivers/clk/mediatek/clk-pll.c
+++ b/drivers/clk/mediatek/clk-pll.c
@@ -238,6 +238,7 @@ static int mtk_pll_prepare(struct clk_hw *hw)
 {
 	struct mtk_clk_pll *pll = to_mtk_clk_pll(hw);
 	u32 r;
+	u32 div_en_mask;
 
 	r = readl(pll->pwr_addr) | CON0_PWR_ON;
 	writel(r, pll->pwr_addr);
@@ -247,10 +248,15 @@ static int mtk_pll_prepare(struct clk_hw *hw)
 	writel(r, pll->pwr_addr);
 	udelay(1);
 
-	r = readl(pll->base_addr + REG_CON0);
-	r |= pll->data->en_mask;
+	r = readl(pll->base_addr + REG_CON0) | CON0_BASE_EN;
 	writel(r, pll->base_addr + REG_CON0);
 
+	div_en_mask = pll->data->en_mask & ~CON0_BASE_EN;
+	if (div_en_mask) {
+		r = readl(pll->base_addr + REG_CON0) | div_en_mask;
+		writel(r, pll->base_addr + REG_CON0);
+	}
+
 	__mtk_pll_tuner_enable(pll);
 
 	udelay(20);
@@ -268,6 +274,7 @@ static void mtk_pll_unprepare(struct clk_hw *hw)
 {
 	struct mtk_clk_pll *pll = to_mtk_clk_pll(hw);
 	u32 r;
+	u32 div_en_mask;
 
 	if (pll->data->flags & HAVE_RST_BAR) {
 		r = readl(pll->base_addr + REG_CON0);
@@ -277,8 +284,13 @@ static void mtk_pll_unprepare(struct clk_hw *hw)
 
 	__mtk_pll_tuner_disable(pll);
 
-	r = readl(pll->base_addr + REG_CON0);
-	r &= ~CON0_BASE_EN;
+	div_en_mask = pll->data->en_mask & ~CON0_BASE_EN;
+	if (div_en_mask) {
+		r = readl(pll->base_addr + REG_CON0) & ~div_en_mask;
+		writel(r, pll->base_addr + REG_CON0);
+	}
+
+	r = readl(pll->base_addr + REG_CON0) & ~CON0_BASE_EN;
 	writel(r, pll->base_addr + REG_CON0);
 
 	r = readl(pll->pwr_addr) | CON0_ISO_EN;
-- 
2.18.0


  parent reply	other threads:[~2021-07-26 10:58 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-26 10:56 [v14 00/21] Mediatek MT8192 clock support Chun-Jie Chen
2021-07-26 10:56 ` [v14 01/21] dt-bindings: ARM: Mediatek: Add new document bindings of MT8192 clock Chun-Jie Chen
2021-07-27 17:53   ` Stephen Boyd
2021-07-26 10:57 ` [v14 02/21] dt-bindings: ARM: Mediatek: Add mmsys document binding for MT8192 Chun-Jie Chen
2021-07-27 17:53   ` Stephen Boyd
2021-07-28  8:47     ` Enric Balletbo Serra
2021-07-28 10:21       ` Chun-Jie Chen
2021-08-03 20:17       ` Stephen Boyd
2021-08-05 15:35     ` Matthias Brugger
2021-08-05 23:49       ` Stephen Boyd
2021-07-26 10:57 ` [v14 03/21] dt-bindings: ARM: Mediatek: Add audsys " Chun-Jie Chen
2021-07-27 17:54   ` Stephen Boyd
2021-07-26 10:57 ` [v14 04/21] clk: mediatek: Add dt-bindings of MT8192 clocks Chun-Jie Chen
2021-07-27 17:54   ` Stephen Boyd
2021-07-26 10:57 ` [v14 05/21] clk: mediatek: Get regmap without syscon compatible check Chun-Jie Chen
2021-07-27  4:37   ` Ikjoon Jang
2021-07-27 17:54   ` Stephen Boyd
2021-07-26 10:57 ` Chun-Jie Chen [this message]
2021-07-27 17:54   ` [v14 06/21] clk: mediatek: Fix asymmetrical PLL enable and disable control Stephen Boyd
2021-07-26 10:57 ` [v14 07/21] clk: mediatek: Add configurable enable control to mtk_pll_data Chun-Jie Chen
2021-07-27 17:55   ` Stephen Boyd
2021-07-26 10:57 ` [v14 08/21] clk: mediatek: Add mtk_clk_simple_probe() to simplify clock providers Chun-Jie Chen
2021-07-27  4:38   ` Ikjoon Jang
2021-07-27 17:55   ` Stephen Boyd
2021-07-26 10:57 ` [v14 09/21] clk: mediatek: Add MT8192 basic clocks support Chun-Jie Chen
2021-07-27  4:39   ` Ikjoon Jang
2021-07-27 17:55   ` Stephen Boyd
2021-07-26 10:57 ` [v14 10/21] clk: mediatek: Add MT8192 audio clock support Chun-Jie Chen
2021-07-27  4:40   ` Ikjoon Jang
2021-07-27 17:55   ` Stephen Boyd
2021-07-26 10:57 ` [v14 11/21] clk: mediatek: Add MT8192 camsys " Chun-Jie Chen
2021-07-27  4:41   ` Ikjoon Jang
2021-07-27 17:55   ` Stephen Boyd
2021-07-26 10:57 ` [v14 12/21] clk: mediatek: Add MT8192 imgsys " Chun-Jie Chen
2021-07-27  4:41   ` Ikjoon Jang
2021-07-27 17:56   ` Stephen Boyd
2021-07-26 10:57 ` [v14 13/21] clk: mediatek: Add MT8192 imp i2c wrapper " Chun-Jie Chen
2021-07-27  4:42   ` Ikjoon Jang
2021-07-27 17:56   ` Stephen Boyd
2021-07-26 10:57 ` [v14 14/21] clk: mediatek: Add MT8192 ipesys " Chun-Jie Chen
2021-07-27  4:43   ` Ikjoon Jang
2021-07-27 17:56   ` Stephen Boyd
2021-07-26 10:57 ` [v14 15/21] clk: mediatek: Add MT8192 mdpsys " Chun-Jie Chen
2021-07-27  4:43   ` Ikjoon Jang
2021-07-27 17:56   ` Stephen Boyd
2021-07-26 10:57 ` [v14 16/21] clk: mediatek: Add MT8192 mfgcfg " Chun-Jie Chen
2021-07-27  4:44   ` Ikjoon Jang
2021-07-27 17:56   ` Stephen Boyd
2021-07-26 10:57 ` [v14 17/21] clk: mediatek: Add MT8192 mmsys " Chun-Jie Chen
2021-07-27 17:57   ` Stephen Boyd
2021-07-26 10:57 ` [v14 18/21] clk: mediatek: Add MT8192 msdc " Chun-Jie Chen
2021-07-27  4:45   ` Ikjoon Jang
2021-07-27 17:57   ` Stephen Boyd
2021-07-26 10:57 ` [v14 19/21] clk: mediatek: Add MT8192 scp adsp " Chun-Jie Chen
2021-07-27  4:46   ` Ikjoon Jang
2021-07-27 17:57   ` Stephen Boyd
2021-07-26 10:57 ` [v14 20/21] clk: mediatek: Add MT8192 vdecsys " Chun-Jie Chen
2021-07-27  4:47   ` Ikjoon Jang
2021-07-27 17:57   ` Stephen Boyd
2021-07-26 10:57 ` [v14 21/21] clk: mediatek: Add MT8192 vencsys " Chun-Jie Chen
2021-07-27  4:47   ` Ikjoon Jang
2021-07-27 17:57   ` Stephen Boyd

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210726105719.15793-7-chun-jie.chen@mediatek.com \
    --to=chun-jie.chen@mediatek.com \
    --cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
    --cc=devicetree@vger.kernel.org \
    --cc=drinkcat@chromium.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=matthias.bgg@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=sboyd@kernel.org \
    --cc=srv_heupstream@mediatek.com \
    --cc=weiyi.lu@mediatek.com \
    --subject='Re: [v14 06/21] clk: mediatek: Fix asymmetrical PLL enable and disable control' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).