[PATCH v6 16/27] clk: mediatek: Move fhctl_parse_dt call into mtk_clk_register_pllfhs
From: Louis-Alexis Eyraud <hidden>
Date: 2026-09-04 15:59:44
Also in:
linux-clk, linux-devicetree, linux-mediatek, lkml
Subsystem:
common clk framework, the rest · Maintainers:
Stephen Boyd, Brian Masney, Jerome Brunet, Linus Torvalds
Currently, in the probe functions of apmixedsys drivers with PLL frequency hopping support (FHCTL), the call to mtk_clk_register_pllfh is always preceded by a call to fhctl_parse_dt. This function purpose is to prepare FHCTL-related internal data, that are then used by mtk_clk_register_pllfhs. It is not used in another case and both functions are implemented in the same source file (clk-pllfh.c). There is little interest to keep as it this call sequence in the several probe functions. So, add an additional parameter (compatible name string) in mtk_clk_register_pllfhs and move the fhctl_parse_dt call into it. Finally, make this function private by removing it from clk-pllfh.h include, remove its EXPORT_SYMBOL_GPL macro use and add the static keyword. Signed-off-by: Louis-Alexis Eyraud <redacted> --- drivers/clk/mediatek/clk-mt6795-apmixedsys.c | 3 +-- drivers/clk/mediatek/clk-mt8173-apmixedsys.c | 5 ++--- drivers/clk/mediatek/clk-mt8186-apmixedsys.c | 4 +--- drivers/clk/mediatek/clk-mt8192-apmixedsys.c | 4 +--- drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 4 +--- drivers/clk/mediatek/clk-pllfh.c | 10 ++++++---- drivers/clk/mediatek/clk-pllfh.h | 5 +---- 7 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/drivers/clk/mediatek/clk-mt6795-apmixedsys.c b/drivers/clk/mediatek/clk-mt6795-apmixedsys.c
index 123d5d7fea85..a860708ef908 100644
--- a/drivers/clk/mediatek/clk-mt6795-apmixedsys.c
+++ b/drivers/clk/mediatek/clk-mt6795-apmixedsys.c@@ -151,8 +151,7 @@ static int clk_mt6795_apmixed_probe(struct platform_device *pdev) if (!clk_data) return -ENOMEM; - fhctl_parse_dt(fhctl_node, pllfhs, ARRAY_SIZE(pllfhs)); - ret = mtk_clk_register_pllfhs(dev, plls, ARRAY_SIZE(plls), + ret = mtk_clk_register_pllfhs(dev, fhctl_node, plls, ARRAY_SIZE(plls), pllfhs, ARRAY_SIZE(pllfhs), clk_data); if (ret) goto free_clk_data;
diff --git a/drivers/clk/mediatek/clk-mt8173-apmixedsys.c b/drivers/clk/mediatek/clk-mt8173-apmixedsys.c
index d7d416172ab3..8920eb1c3fa6 100644
--- a/drivers/clk/mediatek/clk-mt8173-apmixedsys.c
+++ b/drivers/clk/mediatek/clk-mt8173-apmixedsys.c@@ -156,9 +156,8 @@ static int clk_mt8173_apmixed_probe(struct platform_device *pdev) goto unmap_io; } - fhctl_parse_dt(fhctl_node, pllfhs, ARRAY_SIZE(pllfhs)); - r = mtk_clk_register_pllfhs(dev, plls, ARRAY_SIZE(plls), pllfhs, - ARRAY_SIZE(pllfhs), clk_data); + r = mtk_clk_register_pllfhs(dev, fhctl_node, plls, ARRAY_SIZE(plls), + pllfhs, ARRAY_SIZE(pllfhs), clk_data); if (r) goto free_clk_data;
diff --git a/drivers/clk/mediatek/clk-mt8186-apmixedsys.c b/drivers/clk/mediatek/clk-mt8186-apmixedsys.c
index d35dd2632e43..e8fc6bd90fcb 100644
--- a/drivers/clk/mediatek/clk-mt8186-apmixedsys.c
+++ b/drivers/clk/mediatek/clk-mt8186-apmixedsys.c@@ -149,9 +149,7 @@ static int clk_mt8186_apmixed_probe(struct platform_device *pdev) if (!clk_data) return -ENOMEM; - fhctl_parse_dt(fhctl_node, pllfhs, ARRAY_SIZE(pllfhs)); - - r = mtk_clk_register_pllfhs(&pdev->dev, plls, ARRAY_SIZE(plls), + r = mtk_clk_register_pllfhs(&pdev->dev, fhctl_node, plls, ARRAY_SIZE(plls), pllfhs, ARRAY_SIZE(pllfhs), clk_data); if (r) goto free_apmixed_data;
diff --git a/drivers/clk/mediatek/clk-mt8192-apmixedsys.c b/drivers/clk/mediatek/clk-mt8192-apmixedsys.c
index b0563a285bd6..2e4f5aff9eee 100644
--- a/drivers/clk/mediatek/clk-mt8192-apmixedsys.c
+++ b/drivers/clk/mediatek/clk-mt8192-apmixedsys.c@@ -160,9 +160,7 @@ static int clk_mt8192_apmixed_probe(struct platform_device *pdev) if (!clk_data) return -ENOMEM; - fhctl_parse_dt(fhctl_node, pllfhs, ARRAY_SIZE(pllfhs)); - - r = mtk_clk_register_pllfhs(&pdev->dev, plls, ARRAY_SIZE(plls), + r = mtk_clk_register_pllfhs(&pdev->dev, fhctl_node, plls, ARRAY_SIZE(plls), pllfhs, ARRAY_SIZE(pllfhs), clk_data); if (r) goto free_clk_data;
diff --git a/drivers/clk/mediatek/clk-mt8195-apmixedsys.c b/drivers/clk/mediatek/clk-mt8195-apmixedsys.c
index a120c3305547..12e51b39b764 100644
--- a/drivers/clk/mediatek/clk-mt8195-apmixedsys.c
+++ b/drivers/clk/mediatek/clk-mt8195-apmixedsys.c@@ -178,9 +178,7 @@ static int clk_mt8195_apmixed_probe(struct platform_device *pdev) if (!clk_data) return -ENOMEM; - fhctl_parse_dt(fhctl_node, pllfhs, ARRAY_SIZE(pllfhs)); - - r = mtk_clk_register_pllfhs(&pdev->dev, plls, ARRAY_SIZE(plls), + r = mtk_clk_register_pllfhs(&pdev->dev, fhctl_node, plls, ARRAY_SIZE(plls), pllfhs, ARRAY_SIZE(pllfhs), clk_data); if (r) goto free_apmixed_data;
diff --git a/drivers/clk/mediatek/clk-pllfh.c b/drivers/clk/mediatek/clk-pllfh.c
index f36dbc7fa06d..398edad2a69e 100644
--- a/drivers/clk/mediatek/clk-pllfh.c
+++ b/drivers/clk/mediatek/clk-pllfh.c@@ -69,8 +69,9 @@ static struct mtk_pllfh_data *get_pllfh_by_id(struct mtk_pllfh_data *pllfhs, return NULL; } -void fhctl_parse_dt(const u8 *compatible_node, struct mtk_pllfh_data *pllfhs, - int num_fhs) +static void fhctl_parse_dt(const u8 *compatible_node, + struct mtk_pllfh_data *pllfhs, + int num_fhs) { void __iomem *base; struct device_node *node;
@@ -121,7 +122,6 @@ void fhctl_parse_dt(const u8 *compatible_node, struct mtk_pllfh_data *pllfhs, iounmap(base); goto out_node_put; } -EXPORT_SYMBOL_GPL(fhctl_parse_dt); static int pllfh_init(struct mtk_fh *fh, struct mtk_pllfh_data *pllfh_data) {
@@ -252,7 +252,7 @@ static void mtk_clk_cleanup_pllfhs(void __iomem *iomem_base, } -int mtk_clk_register_pllfhs(struct device *dev, +int mtk_clk_register_pllfhs(struct device *dev, const u8 *fhctl_node, const struct mtk_pll_data *plls, int num_plls, struct mtk_pllfh_data *pllfhs, int num_fhs, struct clk_hw_onecell_data *clk_data)
@@ -261,6 +261,8 @@ int mtk_clk_register_pllfhs(struct device *dev, int i; struct clk_hw *hw; + fhctl_parse_dt(fhctl_node, pllfhs, num_fhs); + base = of_iomap(dev->of_node, 0); if (!base) { pr_err("%s(): ioremap failed\n", __func__);
diff --git a/drivers/clk/mediatek/clk-pllfh.h b/drivers/clk/mediatek/clk-pllfh.h
index a9eb7558de1c..07269e467e34 100644
--- a/drivers/clk/mediatek/clk-pllfh.h
+++ b/drivers/clk/mediatek/clk-pllfh.h@@ -71,7 +71,7 @@ struct fh_operation { extern const struct clk_ops mtk_pllfh_setclr_ops; -int mtk_clk_register_pllfhs(struct device *dev, +int mtk_clk_register_pllfhs(struct device *dev, const u8 *fhctl_node, const struct mtk_pll_data *plls, int num_plls, struct mtk_pllfh_data *pllfhs, int num_pllfhs, struct clk_hw_onecell_data *clk_data);
@@ -80,7 +80,4 @@ void mtk_clk_unregister_pllfhs(const struct mtk_pll_data *plls, int num_plls, struct mtk_pllfh_data *pllfhs, int num_fhs, struct clk_hw_onecell_data *clk_data); -void fhctl_parse_dt(const u8 *compatible_node, struct mtk_pllfh_data *pllfhs, - int num_pllfhs); - #endif /* __CLK_PLLFH_H */
--
2.55.0