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>,
	Chun-Jie Chen <chun-jie.chen@mediatek.com>
Subject: [v3 03/24] clk: mediatek: Fix corner case of tuner_en_reg
Date: Tue, 14 Sep 2021 10:16:12 +0800	[thread overview]
Message-ID: <20210914021633.26377-4-chun-jie.chen@mediatek.com> (raw)
In-Reply-To: <20210914021633.26377-1-chun-jie.chen@mediatek.com>
On MT8195, tuner_en_reg is moved to register offest 0x0.
If we only judge by tuner_en_reg, it may lead to wrong address.
Add tuner_en_bit to the check condition. And it has been confirmed,
on all the MediaTek SoCs, bit0 of offset 0x0 is always occupied by
clock square control.
Signed-off-by: Chun-Jie Chen <chun-jie.chen@mediatek.com>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
---
 drivers/clk/mediatek/clk-pll.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c
index 7fb001a4e7d8..99ada6e06697 100644
--- a/drivers/clk/mediatek/clk-pll.c
+++ b/drivers/clk/mediatek/clk-pll.c
@@ -332,7 +332,7 @@ static struct clk *mtk_clk_register_pll(const struct mtk_pll_data *data,
 		pll->pcw_chg_addr = pll->base_addr + REG_CON1;
 	if (data->tuner_reg)
 		pll->tuner_addr = base + data->tuner_reg;
-	if (data->tuner_en_reg)
+	if (data->tuner_en_reg || data->tuner_en_bit)
 		pll->tuner_en_addr = base + data->tuner_en_reg;
 	if (data->en_reg)
 		pll->en_addr = base + data->en_reg;
-- 
2.18.0
next prev parent reply	other threads:[~2021-09-14  2:17 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-14  2:16 [v3 00/24] Mediatek MT8195 clock support Chun-Jie Chen
2021-09-14  2:16 ` [v3 01/24] dt-bindings: ARM: Mediatek: Add new document bindings of MT8195 clock Chun-Jie Chen
2021-09-14 22:17   ` Stephen Boyd
2021-09-14  2:16 ` [v3 02/24] clk: mediatek: Add dt-bindings of MT8195 clocks Chun-Jie Chen
2021-09-14 22:17   ` Stephen Boyd
2021-09-14  2:16 ` Chun-Jie Chen [this message]
2021-09-14 22:18   ` [v3 03/24] clk: mediatek: Fix corner case of tuner_en_reg Stephen Boyd
2021-09-14  2:16 ` [v3 04/24] clk: mediatek: Add API for clock resource recycle Chun-Jie Chen
2021-09-14 22:18   ` Stephen Boyd
2021-09-14  2:16 ` [v3 05/24] clk: mediatek: Fix resource leak in mtk_clk_simple_probe Chun-Jie Chen
2021-09-14 22:18   ` Stephen Boyd
2021-09-14  2:16 ` [v3 06/24] clk: mediatek: Add MT8195 apmixedsys clock support Chun-Jie Chen
2021-09-14 22:18   ` Stephen Boyd
2021-09-14  2:16 ` [v3 07/24] clk: mediatek: Add MT8195 topckgen " Chun-Jie Chen
2021-09-14  3:54   ` Chen-Yu Tsai
2021-09-14 22:18   ` Stephen Boyd
2021-09-14  2:16 ` [v3 08/24] clk: mediatek: Add MT8195 peripheral " Chun-Jie Chen
2021-09-14 22:18   ` Stephen Boyd
2021-09-14  2:16 ` [v3 09/24] clk: mediatek: Add MT8195 infrastructure " Chun-Jie Chen
2021-09-14  3:57   ` Chen-Yu Tsai
2021-09-14 22:18   ` Stephen Boyd
2021-09-14  2:16 ` [v3 10/24] clk: mediatek: Add MT8195 camsys " Chun-Jie Chen
2021-09-14 22:18   ` Stephen Boyd
2021-09-14  2:16 ` [v3 11/24] clk: mediatek: Add MT8195 ccusys " Chun-Jie Chen
2021-09-14 22:18   ` Stephen Boyd
2021-09-14  2:16 ` [v3 12/24] clk: mediatek: Add MT8195 imgsys " Chun-Jie Chen
2021-09-14 22:19   ` Stephen Boyd
2021-09-14  2:16 ` [v3 13/24] clk: mediatek: Add MT8195 ipesys " Chun-Jie Chen
2021-09-14  3:58   ` Chen-Yu Tsai
2021-09-14 22:19   ` Stephen Boyd
2021-09-14  2:16 ` [v3 14/24] clk: mediatek: Add MT8195 mfgcfg " Chun-Jie Chen
2021-09-14  3:59   ` Chen-Yu Tsai
2021-09-14 22:19   ` Stephen Boyd
2021-09-14  2:16 ` [v3 15/24] clk: mediatek: Add MT8195 scp adsp " Chun-Jie Chen
2021-09-14 22:19   ` Stephen Boyd
2021-09-14  2:16 ` [v3 16/24] clk: mediatek: Add MT8195 vdecsys " Chun-Jie Chen
2021-09-14 22:19   ` Stephen Boyd
2021-09-14  2:16 ` [v3 17/24] clk: mediatek: Add MT8195 vdosys0 " Chun-Jie Chen
2021-09-14  4:00   ` Chen-Yu Tsai
2021-09-14 22:19   ` Stephen Boyd
2021-09-14  2:16 ` [v3 18/24] clk: mediatek: Add MT8195 vdosys1 " Chun-Jie Chen
2021-09-14  4:00   ` Chen-Yu Tsai
2021-09-14 22:19   ` Stephen Boyd
2021-09-14  2:16 ` [v3 19/24] clk: mediatek: Add MT8195 vencsys " Chun-Jie Chen
2021-09-14 22:19   ` Stephen Boyd
2021-09-14  2:16 ` [v3 20/24] clk: mediatek: Add MT8195 vppsys0 " Chun-Jie Chen
2021-09-14 22:19   ` Stephen Boyd
2021-09-14  2:16 ` [v3 21/24] clk: mediatek: Add MT8195 vppsys1 " Chun-Jie Chen
2021-09-14 22:19   ` Stephen Boyd
2021-09-14  2:16 ` [v3 22/24] clk: mediatek: Add MT8195 wpesys " Chun-Jie Chen
2021-09-14 22:20   ` Stephen Boyd
2021-09-14  2:16 ` [v3 23/24] clk: mediatek: Add MT8195 imp i2c wrapper " Chun-Jie Chen
2021-09-14 22:20   ` Stephen Boyd
2021-09-14  2:16 ` [v3 24/24] clk: mediatek: Add MT8195 apusys " Chun-Jie Chen
2021-09-14 22:20   ` 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=20210914021633.26377-4-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 \
    /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).