From: Sean Wang <sean.wang@kernel.org>
To: drinkcat@chromium.org
Cc: weiyi.lu@mediatek.com, Matthias Brugger <matthias.bgg@gmail.com>,
sboyd@codeaurora.org, robh@kernel.org, jamesjj.liao@mediatek.com,
srv_heupstream@mediatek.com, linux-kernel@vger.kernel.org,
fan.chen@mediatek.com, linux-mediatek@lists.infradead.org,
owen.chen@mediatek.com, linux-clk@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2 03/11] clk: mediatek: Disable tuner_en before change PLL rate
Date: Tue, 27 Nov 2018 16:58:57 -0800 [thread overview]
Message-ID: <CAGp9LzqfgLa03p-bEOQaT2qtuOEqUL3e04nDS38TbZ2-2Ohauw@mail.gmail.com> (raw)
In-Reply-To: <CANMq1KB4tt9jdmE+LJXfji=QXC9-6wuhXWjJPkpNfo6hEMXH=A@mail.gmail.com>
>
> On Wed, Nov 28, 2018 at 4:37 AM Sean Wang <sean.wang@kernel.org> wrote:
> >
> > Weiyi Lu <weiyi.lu@mediatek.com> 於 2018年11月26日 週一 下午7:45寫道:
> > >
> > > From: Owen Chen <owen.chen@mediatek.com>
> > >
> > > PLLs with tuner_en bit, such as APLL1, need to disable
> > > tuner_en before apply new frequency settings, or the new frequency
> > > settings (pcw) will not be applied.
> > > The tuner_en bit will be disabled during changing PLL rate
> > > and be restored after new settings applied.
> >
> > It looks like a bug fix. If so, you should add a fixes tag and even cc
> > stable tree
> >
> > >
> > > Signed-off-by: Owen Chen <owen.chen@mediatek.com>
> > > ---
> > > drivers/clk/mediatek/clk-pll.c | 33 +++++++++++++++++++++++++++++++--
> > > 1 file changed, 31 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c
> > > index 1db161aced31..81400601f107 100644
> > > --- a/drivers/clk/mediatek/clk-pll.c
> > > +++ b/drivers/clk/mediatek/clk-pll.c
> > > @@ -27,7 +27,7 @@
> > > #define CON0_BASE_EN BIT(0)
> > > #define CON0_PWR_ON BIT(0)
> > > #define CON0_ISO_EN BIT(1)
> > > -#define CON0_PCW_CHG BIT(31)
> > > +#define CON1_PCW_CHG BIT(31)
> >
> > it seems like an unnecessary change
>
> Below, you have:
> con1 |= CON1_PCW_CHG;
>
> Presumably PCW_CHG is on BIT(31) of CON1(?), so I think this is a good
> change. Maybe this needs to be a separate patch, though?
>
Sure, for me it's not easily understood why the change is necessary
from the description. If it's really another fixup, it should be moved
to a separate patch or add more explanations about that in the same
patch.
> > >
> > > #define AUDPLL_TUNER_EN BIT(31)
> > >
> > > @@ -97,9 +97,31 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,
> > > {
> > > u32 con1, val;
> > > int pll_en;
> > > + u32 tuner_en = 0;
> > > + u32 tuner_en_mask;
> > > + void __iomem *tuner_en_addr = NULL;
> > >
> > > pll_en = readl(pll->base_addr + REG_CON0) & CON0_BASE_EN;
> > >
> > > + /* disable tuner */
> >
> > similar code pieces are ready on mtk_pll_[un]prepare. maybe we can add
> > common tuner operations for them to reuse.
> >
> > > + if (pll->tuner_en_addr) {
> > > + tuner_en_addr = pll->tuner_en_addr;
> > > + tuner_en_mask = BIT(pll->data->tuner_en_bit);
> > > + } else if (pll->tuner_addr) {
> > > + tuner_en_addr = pll->tuner_addr;
> > > + tuner_en_mask = AUDPLL_TUNER_EN;
> > > + }
> > > +
> > > + if (tuner_en_addr) {
> > > + val = readl(tuner_en_addr);
> > > + tuner_en = val & tuner_en_mask;
> > > +
> > > + if (tuner_en) {
> > > + val &= ~tuner_en_mask;
> > > + writel(val, tuner_en_addr);
> > > + }
> > > + }
> > > +
> > > /* set postdiv */
> > > val = readl(pll->pd_addr);
> > > val &= ~(POSTDIV_MASK << pll->data->pd_shift);
> > > @@ -120,12 +142,19 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw,
> > > con1 = readl(pll->base_addr + REG_CON1);
> > >
> > > if (pll_en)
> > > - con1 |= CON0_PCW_CHG;
> > > + con1 |= CON1_PCW_CHG;
> > >
> > > writel(con1, pll->base_addr + REG_CON1);
> > > if (pll->tuner_addr)
> > > writel(con1 + 1, pll->tuner_addr);
> > >
> > > + /* restore tuner_en */
> > > + if (tuner_en_addr && tuner_en) {
> >
> > if (tuner_en) is sufficient
> >
> > > + val = readl(tuner_en_addr);
> > > + val |= tuner_en_mask;
> > > + writel(val, tuner_en_addr);
> > > + }
> > > +
> > > if (pll_en)
> > > udelay(20);
> > > }
> > > --
> > > 2.18.0
> > >
> > >
> > > _______________________________________________
> > > Linux-mediatek mailing list
> > > Linux-mediatek@lists.infradead.org
> > > http://lists.infradead.org/mailman/listinfo/linux-mediatek
next prev parent reply other threads:[~2018-11-28 0:59 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-27 3:42 [PATCH v2 00/11] Mediatek MT8183 clock and scpsys support Weiyi Lu
2018-11-27 3:42 ` Weiyi Lu
2018-11-27 3:42 ` [PATCH v2 01/11] clk: mediatek: add new clkmux register API Weiyi Lu
2018-11-27 5:05 ` Nicolas Boichat
2018-11-27 10:13 ` Sean Wang
2018-11-27 3:42 ` [PATCH v2 02/11] clk: mediatek: add new member to mtk_pll_data Weiyi Lu
2018-11-27 10:41 ` Sean Wang
2018-11-27 3:42 ` [PATCH v2 03/11] clk: mediatek: Disable tuner_en before change PLL rate Weiyi Lu
2018-11-27 20:36 ` Sean Wang
2018-11-27 23:54 ` Nicolas Boichat
2018-11-28 0:58 ` Sean Wang [this message]
2018-11-27 3:42 ` [PATCH v2 04/11] soc: mediatek: add new flow for mtcmos power Weiyi Lu
2018-11-27 5:57 ` Nicolas Boichat
2018-11-27 3:42 ` [PATCH v2 05/11] dt-bindings: ARM: Mediatek: Document bindings for MT8183 Weiyi Lu
2018-11-27 3:42 ` [PATCH v2 06/11] clk: mediatek: Add dt-bindings for MT8183 clocks Weiyi Lu
2018-11-27 3:42 ` [PATCH v2 07/11] clk: mediatek: Add flags support for mtk_gate data Weiyi Lu
2018-11-27 3:42 ` [PATCH v2 08/11] clk: mediatek: Add MT8183 clock support Weiyi Lu
2018-11-27 10:42 ` kbuild test robot
2018-11-27 10:42 ` [PATCH] clk: mediatek: fix platform_no_drv_owner.cocci warnings kbuild test robot
2018-11-27 3:42 ` [PATCH v2 09/11] dt-bindings: soc: fix typo of MT8173 power dt-bindings Weiyi Lu
2018-11-27 3:42 ` [PATCH v2 10/11] dt-bindings: soc: Add MT8183 " Weiyi Lu
2018-11-27 3:42 ` [PATCH v2 11/11] soc: mediatek: Add MT8183 scpsys support Weiyi Lu
2018-11-27 6:11 ` Nicolas Boichat
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=CAGp9LzqfgLa03p-bEOQaT2qtuOEqUL3e04nDS38TbZ2-2Ohauw@mail.gmail.com \
--to=sean.wang@kernel.org \
--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=owen.chen@mediatek.com \
--cc=robh@kernel.org \
--cc=sboyd@codeaurora.org \
--cc=srv_heupstream@mediatek.com \
--cc=weiyi.lu@mediatek.com \
/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 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).