clk: mediatek: Propagate struct device with mtk_clk_register_dividers()

Propagate struct device for divider clocks registered through clk-mtk
helpers to be able to get runtime PM support for MTK clocks.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Tested-by: Chen-Yu Tsai <wenst@chromium.org> # MT8183, MT8192, MT8195 Chromebooks
Link: https://lore.kernel.org/r/20230306140543.1813621-32-angelogioacchino.delregno@collabora.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/mediatek/clk-mt2701.c b/drivers/clk/mediatek/clk-mt2701.c
index dfe328f7a44b2641331a788a552148bb9ffbfad6..e9c27b1364b66be6e209ee98132384b619692e54 100644 (file)
--- a/drivers/clk/mediatek/clk-mt2701.c
+++ b/drivers/clk/mediatek/clk-mt2701.c
@@ -681,7 +681,7 @@ static int mtk_topckgen_init(struct platform_device *pdev)
                                    ARRAY_SIZE(top_muxes), base,
                                    &mt2701_clk_lock, clk_data);
 
-       mtk_clk_register_dividers(top_adj_divs, ARRAY_SIZE(top_adj_divs),
+       mtk_clk_register_dividers(&pdev->dev, top_adj_divs, ARRAY_SIZE(top_adj_divs),
                                base, &mt2701_clk_lock, clk_data);
 
        mtk_clk_register_gates(&pdev->dev, node, top_clks,

diff --git a/drivers/clk/mediatek/clk-mt8167-apmixedsys.c b/drivers/clk/mediatek/clk-mt8167-apmixedsys.c
index ebd90365be5fe6a7c3a8093d978662a2c691a5ed..27597fdeb6e94bc1d0c620cc27072cf647e14fdf 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8167-apmixedsys.c
+++ b/drivers/clk/mediatek/clk-mt8167-apmixedsys.c
@@ -109,7 +109,7 @@ static int clk_mt8167_apmixed_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       ret = mtk_clk_register_dividers(adj_divs, ARRAY_SIZE(adj_divs), base,
+       ret = mtk_clk_register_dividers(dev, adj_divs, ARRAY_SIZE(adj_divs), base,
                                        &mt8167_apmixed_clk_lock, clk_data);
        if (ret)
                goto unregister_plls;

diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c
index 01224cfbcc79de776349a5df8496f513b1428616..fd2214c3242f2b2c372d088337fbdeef18220de8 100644 (file)
--- a/drivers/clk/mediatek/clk-mtk.c
+++ b/drivers/clk/mediatek/clk-mtk.c
@@ -393,7 +393,8 @@ void mtk_clk_unregister_composites(const struct mtk_composite *mcs, int num,
 }
 EXPORT_SYMBOL_GPL(mtk_clk_unregister_composites);
 
-int mtk_clk_register_dividers(const struct mtk_clk_divider *mcds, int num,
+int mtk_clk_register_dividers(struct device *dev,
+                             const struct mtk_clk_divider *mcds, int num,
                              void __iomem *base, spinlock_t *lock,
                              struct clk_hw_onecell_data *clk_data)
 {
@@ -412,7 +413,7 @@ int mtk_clk_register_dividers(const struct mtk_clk_divider *mcds, int num,
                        continue;
                }
 
-               hw = clk_hw_register_divider(NULL, mcd->name, mcd->parent_name,
+               hw = clk_hw_register_divider(dev, mcd->name, mcd->parent_name,
                        mcd->flags, base +  mcd->div_reg, mcd->div_shift,
                        mcd->div_width, mcd->clk_divider_flags, lock);
 
@@ -535,7 +536,8 @@ static int __mtk_clk_simple_probe(struct platform_device *pdev,
        }
 
        if (mcd->divider_clks) {
-               r = mtk_clk_register_dividers(mcd->divider_clks,
+               r = mtk_clk_register_dividers(&pdev->dev,
+                                             mcd->divider_clks,
                                              mcd->num_divider_clks,
                                              base, mcd->clk_lock, clk_data);
                if (r)

diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h
index 554aecdc10152b70be8a6861e331562209074685..b7a751861fcee32b45dba3c5dedd6507ed0aeb13 100644 (file)
--- a/drivers/clk/mediatek/clk-mtk.h
+++ b/drivers/clk/mediatek/clk-mtk.h
@@ -202,7 +202,8 @@ struct mtk_clk_divider {
                .div_width = _width,                            \
 }
 
-int mtk_clk_register_dividers(const struct mtk_clk_divider *mcds, int num,
+int mtk_clk_register_dividers(struct device *dev,
+                             const struct mtk_clk_divider *mcds, int num,
                              void __iomem *base, spinlock_t *lock,
                              struct clk_hw_onecell_data *clk_data);
 void mtk_clk_unregister_dividers(const struct mtk_clk_divider *mcds, int num,