[PATCH 11/11] clk: mediatek: mt8518: merge the clock drivers into a single driver

[Julien Stephan]

The topckgen and topckgen-cg U_BOOT_DRIVER entries only differ by
their of_match table: they share the same probe, ops, private data
and flags. Merge them into a single mt8518-clk driver, the way
clk-mt8366.c already does, so that a new clock block only needs a
new of_match entry.

While at it, fix the indentation of the .priv_auto assignments.

No functional change.

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

diff --git a/drivers/clk/mediatek/clk-mt8518.c 
b/drivers/clk/mediatek/clk-mt8518.c
index f2472d039b0..70dc659419c 100644
--- a/drivers/clk/mediatek/clk-mt8518.c
+++ b/drivers/clk/mediatek/clk-mt8518.c
@@ -1533,15 +1533,11 @@ static const struct udevice_id mt8518_apmixed_compat[] 
= {
        { }
 };
 
-static const struct udevice_id mt8518_topckgen_compat[] = {
+static const struct udevice_id mt8518_clk_compat[] = {
        {
                .compatible = "mediatek,mt8518-topckgen",
                .data = (ulong)&mt8518_topckgen_clk_tree,
        },
-       { }
-};
-
-static const struct udevice_id mt8518_topckgen_cg_compat[] = {
        {
                .compatible = "mediatek,mt8518-topckgen-cg",
                .data = (ulong)&mt8518_clk_tree,
@@ -1554,25 +1550,15 @@ U_BOOT_DRIVER(mt8518_clk_apmixedsys) = {
        .id = UCLASS_CLK,
        .of_match = mt8518_apmixed_compat,
        .probe = mtk_clk_probe,
-       .priv_auto      = sizeof(struct mtk_clk_priv),
+       .priv_auto = sizeof(struct mtk_clk_priv),
        .ops = &mtk_clk_apmixedsys_ops,
        .flags = DM_FLAG_PRE_RELOC,
 };
 
-U_BOOT_DRIVER(mt8518_clk_topckgen) = {
-       .name = "mt8518-topckgen",
-       .id = UCLASS_CLK,
-       .of_match = mt8518_topckgen_compat,
-       .probe = mtk_clk_probe,
-       .priv_auto      = sizeof(struct mtk_clk_priv),
-       .ops = &mtk_clk_topckgen_ops,
-       .flags = DM_FLAG_PRE_RELOC,
-};
-
-U_BOOT_DRIVER(mt8518_clk_topckgen_cg) = {
-       .name = "mt8518-topckgen-cg",
+U_BOOT_DRIVER(mt8518_clk) = {
+       .name = "mt8518-clk",
        .id = UCLASS_CLK,
-       .of_match = mt8518_topckgen_cg_compat,
+       .of_match = mt8518_clk_compat,
        .probe = mtk_clk_probe,
        .priv_auto = sizeof(struct mtk_clk_priv),
        .ops = &mtk_clk_topckgen_ops,

-- 
2.55.0