[PATCH] clk: mediatek: fix dependency of MT7986 ADC clocks

[PATCH] clk: mediatek: fix dependency of MT7986 ADC clocks

[Daniel Golle]

It seems like CLK_INFRA_ADC_FRC_CK always need to be enabled for
CLK_INFRA_ADC_26M_CK to work. Instead of adding this dependency to the
mtk-thermal and mt6577_auxadc drivers, add dependency to the clock
driver clk-mt7986-infracfg.c.

Suggested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 drivers/clk/mediatek/clk-mt7986-infracfg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/mediatek/clk-mt7986-infracfg.c b/drivers/clk/mediatek/clk-mt7986-infracfg.c
index d90727a53283c7..49666047bf0ed5 100644
--- a/drivers/clk/mediatek/clk-mt7986-infracfg.c
+++ b/drivers/clk/mediatek/clk-mt7986-infracfg.c
@@ -153,7 +153,7 @@ static const struct mtk_gate infra_clks[] = {
 		    18),
 	GATE_INFRA1(CLK_INFRA_MSDC_66M_CK, "infra_msdc_66m", "infra_sysaxi_d2",
 		    19),
-	GATE_INFRA1(CLK_INFRA_ADC_26M_CK, "infra_adc_26m", "csw_f26m_sel", 20),
+	GATE_INFRA1(CLK_INFRA_ADC_26M_CK, "infra_adc_26m", "infra_adc_frc", 20),
 	GATE_INFRA1(CLK_INFRA_ADC_FRC_CK, "infra_adc_frc", "csw_f26m_sel", 21),
 	GATE_INFRA1(CLK_INFRA_FBIST2FPC_CK, "infra_fbist2fpc", "nfi1x_sel", 23),
 	/* INFRA2 */
-- 
2.38.1

Re: [PATCH] clk: mediatek: fix dependency of MT7986 ADC clocks

[AngeloGioacchino Del Regno]

Il 20/10/22 21:52, Daniel Golle ha scritto:
> It seems like CLK_INFRA_ADC_FRC_CK always need to be enabled for
> CLK_INFRA_ADC_26M_CK to work. Instead of adding this dependency to the
> mtk-thermal and mt6577_auxadc drivers, add dependency to the clock
> driver clk-mt7986-infracfg.c.
> 
> Suggested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

Re: [PATCH] clk: mediatek: fix dependency of MT7986 ADC clocks

[AngeloGioacchino Del Regno]

Il 20/10/22 21:52, Daniel Golle ha scritto:
> It seems like CLK_INFRA_ADC_FRC_CK always need to be enabled for
> CLK_INFRA_ADC_26M_CK to work. Instead of adding this dependency to the
> mtk-thermal and mt6577_auxadc drivers, add dependency to the clock
> driver clk-mt7986-infracfg.c.
> 
> Suggested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>

Sorry, I gave you my Reviewed-by tag, but I've just realized that you're missing
a Fixes tag.

Please send a v2 with:

Fixes: ec97d23c8e22 ("clk: mediatek: add mt7986 clock support")

...and retain my reviewed-by tag after that.

Cheers,
Angelo

[PATCH v2] clk: mediatek: fix dependency of MT7986 ADC clocks

[Daniel Golle]

It seems like CLK_INFRA_ADC_FRC_CK always need to be enabled for
CLK_INFRA_ADC_26M_CK to work. Instead of adding this dependency to the
mtk-thermal and mt6577_auxadc drivers, add dependency to the clock
driver clk-mt7986-infracfg.c.

Fixes: ec97d23c8e22 ("clk: mediatek: add mt7986 clock support")
Suggested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
v2: add Fixes: tag

 drivers/clk/mediatek/clk-mt7986-infracfg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clk/mediatek/clk-mt7986-infracfg.c b/drivers/clk/mediatek/clk-mt7986-infracfg.c
index d90727a53283c7..49666047bf0ed5 100644
--- a/drivers/clk/mediatek/clk-mt7986-infracfg.c
+++ b/drivers/clk/mediatek/clk-mt7986-infracfg.c
@@ -153,7 +153,7 @@ static const struct mtk_gate infra_clks[] = {
 		    18),
 	GATE_INFRA1(CLK_INFRA_MSDC_66M_CK, "infra_msdc_66m", "infra_sysaxi_d2",
 		    19),
-	GATE_INFRA1(CLK_INFRA_ADC_26M_CK, "infra_adc_26m", "csw_f26m_sel", 20),
+	GATE_INFRA1(CLK_INFRA_ADC_26M_CK, "infra_adc_26m", "infra_adc_frc", 20),
 	GATE_INFRA1(CLK_INFRA_ADC_FRC_CK, "infra_adc_frc", "csw_f26m_sel", 21),
 	GATE_INFRA1(CLK_INFRA_FBIST2FPC_CK, "infra_fbist2fpc", "nfi1x_sel", 23),
 	/* INFRA2 */
-- 
2.38.1

Re: [PATCH v2] clk: mediatek: fix dependency of MT7986 ADC clocks

[Stephen Boyd]

Quoting Daniel Golle (2022-10-26 09:18:07)
> It seems like CLK_INFRA_ADC_FRC_CK always need to be enabled for
> CLK_INFRA_ADC_26M_CK to work. Instead of adding this dependency to the
> mtk-thermal and mt6577_auxadc drivers, add dependency to the clock
> driver clk-mt7986-infracfg.c.

Is this a cleanup patch? Or a pre-requisite for thermal and auxadc
drivers? I don't understand the priority of this patch. Should I apply
it to fix a regression?

Re: [PATCH v2] clk: mediatek: fix dependency of MT7986 ADC clocks

[Daniel Golle]

On Thu, Oct 27, 2022 at 02:41:49PM -0700, Stephen Boyd wrote:
> Quoting Daniel Golle (2022-10-26 09:18:07)
> > It seems like CLK_INFRA_ADC_FRC_CK always need to be enabled for
> > CLK_INFRA_ADC_26M_CK to work. Instead of adding this dependency to the
> > mtk-thermal and mt6577_auxadc drivers, add dependency to the clock
> > driver clk-mt7986-infracfg.c.
> 
> Is this a cleanup patch? Or a pre-requisite for thermal and auxadc
> drivers? I don't understand the priority of this patch. Should I apply
> it to fix a regression?

I'd say 'no', as AUXADC and thermal has not yet been added to
mt7986a.dtsi, also the corresponding clocks are currently still unused.
So while this commit does fix a previous commit, it doesn't have a direct
impact and will only matter once thermal and auxadc units are added to
mt7986.dtsi.

Re: [PATCH v2] clk: mediatek: fix dependency of MT7986 ADC clocks

[Stephen Boyd]

Quoting Daniel Golle (2022-10-27 16:24:35)
> On Thu, Oct 27, 2022 at 02:41:49PM -0700, Stephen Boyd wrote:
> > Quoting Daniel Golle (2022-10-26 09:18:07)
> > > It seems like CLK_INFRA_ADC_FRC_CK always need to be enabled for
> > > CLK_INFRA_ADC_26M_CK to work. Instead of adding this dependency to the
> > > mtk-thermal and mt6577_auxadc drivers, add dependency to the clock
> > > driver clk-mt7986-infracfg.c.
> > 
> > Is this a cleanup patch? Or a pre-requisite for thermal and auxadc
> > drivers? I don't understand the priority of this patch. Should I apply
> > it to fix a regression?
> 
> I'd say 'no', as AUXADC and thermal has not yet been added to
> mt7986a.dtsi, also the corresponding clocks are currently still unused.
> So while this commit does fix a previous commit, it doesn't have a direct
> impact and will only matter once thermal and auxadc units are added to
> mt7986.dtsi.

Thanks! Please include these details next time.

Re: [PATCH v2] clk: mediatek: fix dependency of MT7986 ADC clocks

[Chen-Yu Tsai]

On Wed, 26 Oct 2022 17:18:07 +0100, Daniel Golle wrote:
> It seems like CLK_INFRA_ADC_FRC_CK always need to be enabled for
> CLK_INFRA_ADC_26M_CK to work. Instead of adding this dependency to the
> mtk-thermal and mt6577_auxadc drivers, add dependency to the clock
> driver clk-mt7986-infracfg.c.
> 
> 

Applied, thanks!

[1/1] clk: mediatek: fix dependency of MT7986 ADC clocks
      commit: a46315295489933209e902638cd287aeb5f982ab

Best regards,
-- 
Chen-Yu Tsai <wenst@chromium.org>