[PATCH v2 20/32] clk: mediatek: mt8516: use driver data to store the clock tree

[Julien Stephan]

Pass each controller's struct mtk_clk_tree through the driver data and use
the generic probe function for all the MT8516 clock drivers, instead of a
dedicated probe per controller.

The apmixedsys and topckgen controllers keep their own U_BOOT_DRIVER since
they rely on dedicated ops and on the parent bind() callback, but they now
get their tree from the compatible data.

No functional change intended.

Signed-off-by: Julien Stephan <jstep...@baylibre.com>
---
 drivers/clk/mediatek/clk-mt8516.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/drivers/clk/mediatek/clk-mt8516.c 
b/drivers/clk/mediatek/clk-mt8516.c
index 53e32d12445..35b04ed5429 100644
--- a/drivers/clk/mediatek/clk-mt8516.c
+++ b/drivers/clk/mediatek/clk-mt8516.c
@@ -774,16 +774,6 @@ static const struct mtk_clk_tree mt8516_clk_tree = {
        .num_gates = ARRAY_SIZE(top_clks),
 };
 
-static int mt8516_apmixedsys_probe(struct udevice *dev)
-{
-       return mtk_common_clk_init(dev, &mt8516_apmixed_clk_tree);
-}
-
-static int mt8516_topckgen_probe(struct udevice *dev)
-{
-       return mtk_common_clk_init(dev, &mt8516_topckgen_clk_tree);
-}
-
 static int mt8516_clk_probe(struct udevice *dev)
 {
        const struct mtk_clk_tree *tree = (void *)dev_get_driver_data(dev);
@@ -792,12 +782,18 @@ static int mt8516_clk_probe(struct udevice *dev)
 }
 
 static const struct udevice_id mt8516_apmixed_compat[] = {
-       { .compatible = "mediatek,mt8516-apmixedsys", },
+       {
+               .compatible = "mediatek,mt8516-apmixedsys",
+               .data = (ulong)&mt8516_apmixed_clk_tree
+       },
        { }
 };
 
 static const struct udevice_id mt8516_topckgen_compat[] = {
-       { .compatible = "mediatek,mt8516-topckgen", },
+       {
+               .compatible = "mediatek,mt8516-topckgen",
+               .data = (ulong)&mt8516_topckgen_clk_tree
+       },
        { }
 };
 
@@ -814,7 +810,7 @@ U_BOOT_DRIVER(mt8516_clk_apmixedsys) = {
        .id = UCLASS_CLK,
        .of_match = mt8516_apmixed_compat,
        .bind = mtk_common_clk_parent_bind,
-       .probe = mt8516_apmixedsys_probe,
+       .probe = mt8516_clk_probe,
        .priv_auto      = sizeof(struct mtk_clk_priv),
        .ops = &mtk_clk_apmixedsys_ops,
        .flags = DM_FLAG_PRE_RELOC,
@@ -825,7 +821,7 @@ U_BOOT_DRIVER(mt8516_clk_topckgen) = {
        .id = UCLASS_CLK,
        .of_match = mt8516_topckgen_compat,
        .bind = mtk_common_clk_parent_bind,
-       .probe = mt8516_topckgen_probe,
+       .probe = mt8516_clk_probe,
        .priv_auto      = sizeof(struct mtk_clk_priv),
        .ops = &mtk_clk_topckgen_ops,
        .flags = DM_FLAG_PRE_RELOC,

-- 
2.54.0