All of lore.kernel.org
 help / color / mirror / Atom feed
From: Weiyi Lu <weiyi.lu@mediatek.com>
To: Nicolas Boichat <drinkcat@chromium.org>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Stephen Boyd <sboyd@codeaurora.org>,
	Rob Herring <robh@kernel.org>
Cc: James Liao <jamesjj.liao@mediatek.com>,
	Fan Chen <fan.chen@mediatek.com>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>,
	<linux-mediatek@lists.infradead.org>, <linux-clk@vger.kernel.org>,
	<srv_heupstream@mediatek.com>, <stable@vger.kernel.org>,
	Weiyi Lu <weiyi.lu@mediatek.com>
Subject: [PATCH v5 9/9] clk: mediatek: Allow changing PLL rate when it is off
Date: Tue, 5 Mar 2019 13:05:46 +0800	[thread overview]
Message-ID: <20190305050546.23431-11-weiyi.lu@mediatek.com> (raw)
In-Reply-To: <20190305050546.23431-1-weiyi.lu@mediatek.com>

From: James Liao <jamesjj.liao@mediatek.com>

Some modules may need to change its clock rate before turn on it.
So changing PLL's rate when it is off should be allowed.
This patch removes PLL enabled check before set rate, so that
PLLs can set new frequency even if they are off.

On MT8173 for example, ARMPLL's enable bit can be controlled by
other HW. That means ARMPLL may be turned on even if we (CPU / SW)
set ARMPLL's enable bit as 0. In this case, SW may want and can
still change ARMPLL's rate by changing its pcw and postdiv settings.
But without this patch, new pcw setting will not be applied because
its enable bit is 0.

Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
Acked-by: Michael Turquette <mturuqette@baylibre.com>
Signed-off-by: Weiyi Lu <weiyi.lu@mediatek.com>
---
 drivers/clk/mediatek/clk-pll.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c
index 65cee1d6c400..8d556fc99fed 100644
--- a/drivers/clk/mediatek/clk-pll.c
+++ b/drivers/clk/mediatek/clk-pll.c
@@ -124,9 +124,6 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,
 		int postdiv)
 {
 	u32 chg, val;
-	int pll_en;
-
-	pll_en = readl(pll->base_addr + REG_CON0) & CON0_BASE_EN;
 
 	/* disable tuner */
 	__mtk_pll_tuner_disable(pll);
@@ -147,12 +144,7 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,
 			pll->data->pcw_shift);
 	val |= pcw << pll->data->pcw_shift;
 	writel(val, pll->pcw_addr);
-
-	chg = readl(pll->pcw_chg_addr);
-
-	if (pll_en)
-		chg |= PCW_CHG_MASK;
-
+	chg = readl(pll->pcw_chg_addr) | PCW_CHG_MASK;
 	writel(chg, pll->pcw_chg_addr);
 	if (pll->tuner_addr)
 		writel(val + 1, pll->tuner_addr);
@@ -160,8 +152,7 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,
 	/* restore tuner_en */
 	__mtk_pll_tuner_enable(pll);
 
-	if (pll_en)
-		udelay(20);
+	udelay(20);
 }
 
 /*
-- 
2.18.0


WARNING: multiple messages have this Message-ID (diff)
From: Weiyi Lu <weiyi.lu@mediatek.com>
To: Nicolas Boichat <drinkcat@chromium.org>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Stephen Boyd <sboyd@codeaurora.org>,
	Rob Herring <robh@kernel.org>
Cc: James Liao <jamesjj.liao@mediatek.com>,
	Weiyi Lu <weiyi.lu@mediatek.com>,
	srv_heupstream@mediatek.com, linux-kernel@vger.kernel.org,
	stable@vger.kernel.org, Fan Chen <fan.chen@mediatek.com>,
	linux-mediatek@lists.infradead.org, linux-clk@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 9/9] clk: mediatek: Allow changing PLL rate when it is off
Date: Tue, 5 Mar 2019 13:05:46 +0800	[thread overview]
Message-ID: <20190305050546.23431-11-weiyi.lu@mediatek.com> (raw)
In-Reply-To: <20190305050546.23431-1-weiyi.lu@mediatek.com>

From: James Liao <jamesjj.liao@mediatek.com>

Some modules may need to change its clock rate before turn on it.
So changing PLL's rate when it is off should be allowed.
This patch removes PLL enabled check before set rate, so that
PLLs can set new frequency even if they are off.

On MT8173 for example, ARMPLL's enable bit can be controlled by
other HW. That means ARMPLL may be turned on even if we (CPU / SW)
set ARMPLL's enable bit as 0. In this case, SW may want and can
still change ARMPLL's rate by changing its pcw and postdiv settings.
But without this patch, new pcw setting will not be applied because
its enable bit is 0.

Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
Acked-by: Michael Turquette <mturuqette@baylibre.com>
Signed-off-by: Weiyi Lu <weiyi.lu@mediatek.com>
---
 drivers/clk/mediatek/clk-pll.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c
index 65cee1d6c400..8d556fc99fed 100644
--- a/drivers/clk/mediatek/clk-pll.c
+++ b/drivers/clk/mediatek/clk-pll.c
@@ -124,9 +124,6 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,
 		int postdiv)
 {
 	u32 chg, val;
-	int pll_en;
-
-	pll_en = readl(pll->base_addr + REG_CON0) & CON0_BASE_EN;
 
 	/* disable tuner */
 	__mtk_pll_tuner_disable(pll);
@@ -147,12 +144,7 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,
 			pll->data->pcw_shift);
 	val |= pcw << pll->data->pcw_shift;
 	writel(val, pll->pcw_addr);
-
-	chg = readl(pll->pcw_chg_addr);
-
-	if (pll_en)
-		chg |= PCW_CHG_MASK;
-
+	chg = readl(pll->pcw_chg_addr) | PCW_CHG_MASK;
 	writel(chg, pll->pcw_chg_addr);
 	if (pll->tuner_addr)
 		writel(val + 1, pll->tuner_addr);
@@ -160,8 +152,7 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,
 	/* restore tuner_en */
 	__mtk_pll_tuner_enable(pll);
 
-	if (pll_en)
-		udelay(20);
+	udelay(20);
 }
 
 /*
-- 
2.18.0

WARNING: multiple messages have this Message-ID (diff)
From: Weiyi Lu <weiyi.lu@mediatek.com>
To: Nicolas Boichat <drinkcat@chromium.org>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Stephen Boyd <sboyd@codeaurora.org>,
	Rob Herring <robh@kernel.org>
Cc: James Liao <jamesjj.liao@mediatek.com>,
	Weiyi Lu <weiyi.lu@mediatek.com>,
	srv_heupstream@mediatek.com, linux-kernel@vger.kernel.org,
	stable@vger.kernel.org, Fan Chen <fan.chen@mediatek.com>,
	linux-mediatek@lists.infradead.org, linux-clk@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 9/9] clk: mediatek: Allow changing PLL rate when it is off
Date: Tue, 5 Mar 2019 13:05:46 +0800	[thread overview]
Message-ID: <20190305050546.23431-11-weiyi.lu@mediatek.com> (raw)
In-Reply-To: <20190305050546.23431-1-weiyi.lu@mediatek.com>

From: James Liao <jamesjj.liao@mediatek.com>

Some modules may need to change its clock rate before turn on it.
So changing PLL's rate when it is off should be allowed.
This patch removes PLL enabled check before set rate, so that
PLLs can set new frequency even if they are off.

On MT8173 for example, ARMPLL's enable bit can be controlled by
other HW. That means ARMPLL may be turned on even if we (CPU / SW)
set ARMPLL's enable bit as 0. In this case, SW may want and can
still change ARMPLL's rate by changing its pcw and postdiv settings.
But without this patch, new pcw setting will not be applied because
its enable bit is 0.

Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
Acked-by: Michael Turquette <mturuqette@baylibre.com>
Signed-off-by: Weiyi Lu <weiyi.lu@mediatek.com>
---
 drivers/clk/mediatek/clk-pll.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c
index 65cee1d6c400..8d556fc99fed 100644
--- a/drivers/clk/mediatek/clk-pll.c
+++ b/drivers/clk/mediatek/clk-pll.c
@@ -124,9 +124,6 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,
 		int postdiv)
 {
 	u32 chg, val;
-	int pll_en;
-
-	pll_en = readl(pll->base_addr + REG_CON0) & CON0_BASE_EN;
 
 	/* disable tuner */
 	__mtk_pll_tuner_disable(pll);
@@ -147,12 +144,7 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,
 			pll->data->pcw_shift);
 	val |= pcw << pll->data->pcw_shift;
 	writel(val, pll->pcw_addr);
-
-	chg = readl(pll->pcw_chg_addr);
-
-	if (pll_en)
-		chg |= PCW_CHG_MASK;
-
+	chg = readl(pll->pcw_chg_addr) | PCW_CHG_MASK;
 	writel(chg, pll->pcw_chg_addr);
 	if (pll->tuner_addr)
 		writel(val + 1, pll->tuner_addr);
@@ -160,8 +152,7 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,
 	/* restore tuner_en */
 	__mtk_pll_tuner_enable(pll);
 
-	if (pll_en)
-		udelay(20);
+	udelay(20);
 }
 
 /*
-- 
2.18.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-03-05  5:06 UTC|newest]

Thread overview: 116+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-05  5:05 [PATCH v5 0/9] Mediatek MT8183 clock support Weiyi Lu
2019-03-05  5:05 ` Weiyi Lu
2019-03-05  5:05 ` Weiyi Lu
2019-03-05  5:05 ` Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05 18:41   ` Stephen Boyd
2019-03-05 18:41     ` Stephen Boyd
2019-03-05 18:41     ` Stephen Boyd
2019-03-05  5:05 ` [PATCH v5 1/9] clk: mediatek: Disable tuner_en before change PLL rate Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  6:42   ` James Liao
2019-03-05  6:42     ` James Liao
2019-03-05  6:42     ` James Liao
2019-03-07 16:09   ` Matthias Brugger
2019-03-07 16:09     ` Matthias Brugger
2019-04-11 20:16   ` Stephen Boyd
2019-04-11 20:16     ` Stephen Boyd
2019-04-11 20:16     ` Stephen Boyd
2019-03-05  5:05 ` [PATCH v5 2/9] clk: mediatek: Add new clkmux register API Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  6:43   ` James Liao
2019-03-05  6:43     ` James Liao
2019-03-05  6:43     ` James Liao
2019-03-08  6:17   ` Nicolas Boichat
2019-03-08  6:17     ` Nicolas Boichat
2019-03-08  6:17     ` Nicolas Boichat
2019-03-14 23:21   ` Nicolas Boichat
2019-03-14 23:21     ` Nicolas Boichat
2019-03-14 23:21     ` Nicolas Boichat
2019-04-11 20:12     ` Stephen Boyd
2019-04-11 20:12       ` Stephen Boyd
2019-04-11 20:12       ` Stephen Boyd
2019-04-11 20:16   ` Stephen Boyd
2019-04-11 20:16     ` Stephen Boyd
2019-04-11 20:16     ` Stephen Boyd
2019-03-05  5:05 ` [PATCH v5 3/9] clk: mediatek: Add configurable pcwibits and fmin to mtk_pll_data Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  6:46   ` James Liao
2019-03-05  6:46     ` James Liao
2019-03-05  6:46     ` James Liao
2019-03-08  6:20   ` Nicolas Boichat
2019-03-08  6:20     ` Nicolas Boichat
2019-03-08  6:20     ` Nicolas Boichat
2019-04-11 20:14     ` Stephen Boyd
2019-04-11 20:14       ` Stephen Boyd
2019-04-11 20:14       ` Stephen Boyd
2019-04-11 20:16   ` Stephen Boyd
2019-04-11 20:16     ` Stephen Boyd
2019-04-11 20:16     ` Stephen Boyd
2019-03-05  5:05 ` [PATCH v5 4/9] dt-bindings: ARM: Mediatek: Document bindings for MT8183 Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  5:05 ` [PATCH v5 5/9] clk: mediatek: Add dt-bindings for MT8183 clocks Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-04-11 20:16   ` Stephen Boyd
2019-04-11 20:16     ` Stephen Boyd
2019-04-11 20:16     ` Stephen Boyd
2019-03-05  5:05 ` [PATCH v5 6/9] clk: mediatek: Add flags support for mtk_gate data Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  6:47   ` James Liao
2019-03-05  6:47     ` James Liao
2019-03-05  6:47     ` James Liao
2019-03-08  6:20   ` Nicolas Boichat
2019-03-08  6:20     ` Nicolas Boichat
2019-03-08  6:20     ` Nicolas Boichat
2019-04-11 20:19   ` Stephen Boyd
2019-04-11 20:19     ` Stephen Boyd
2019-04-11 20:19     ` Stephen Boyd
2019-04-12  2:42     ` Weiyi Lu
2019-04-12  2:42       ` Weiyi Lu
2019-04-12  2:42       ` Weiyi Lu
2019-03-05  5:05 ` [PATCH v5 7/9] clk: mediatek: Add configurable pcw_chg_reg to mtk_pll_data Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  6:47   ` James Liao
2019-03-05  6:47     ` James Liao
2019-03-05  6:47     ` James Liao
2019-03-08  6:23   ` Nicolas Boichat
2019-03-08  6:23     ` Nicolas Boichat
2019-03-08  6:23     ` Nicolas Boichat
2019-04-11 20:21   ` Stephen Boyd
2019-04-11 20:21     ` Stephen Boyd
2019-04-11 20:21     ` Stephen Boyd
2019-03-05  5:05 ` [PATCH v5 8/9] clk: mediatek: Add MT8183 clock support Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-08  6:42   ` Nicolas Boichat
2019-03-08  6:42     ` Nicolas Boichat
2019-03-08  6:42     ` Nicolas Boichat
2019-03-08 14:46     ` Nicolas Boichat
2019-03-08 14:46       ` Nicolas Boichat
2019-03-08 14:46       ` Nicolas Boichat
2019-04-11 20:24       ` Stephen Boyd
2019-04-11 20:24         ` Stephen Boyd
2019-04-11 20:24         ` Stephen Boyd
2019-04-11 20:24   ` Stephen Boyd
2019-04-11 20:24     ` Stephen Boyd
2019-04-11 20:24     ` Stephen Boyd
2019-03-05  5:05 ` Weiyi Lu [this message]
2019-03-05  5:05   ` [PATCH v5 9/9] clk: mediatek: Allow changing PLL rate when it is off Weiyi Lu
2019-03-05  5:05   ` Weiyi Lu
2019-03-05  6:48   ` James Liao
2019-03-05  6:48     ` James Liao
2019-03-05  6:48     ` James Liao
2019-04-11 20:24   ` Stephen Boyd
2019-04-11 20:24     ` Stephen Boyd
2019-04-11 20:24     ` Stephen Boyd
2019-03-28  5:18 ` [PATCH v5 0/9] Mediatek MT8183 clock support Weiyi Lu
2019-03-28  5:18   ` Weiyi Lu
2019-03-28  5:18   ` Weiyi Lu

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=20190305050546.23431-11-weiyi.lu@mediatek.com \
    --to=weiyi.lu@mediatek.com \
    --cc=drinkcat@chromium.org \
    --cc=fan.chen@mediatek.com \
    --cc=jamesjj.liao@mediatek.com \
    --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@kernel.org \
    --cc=sboyd@codeaurora.org \
    --cc=srv_heupstream@mediatek.com \
    --cc=stable@vger.kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.