Move the apmixedsys compatible into the mt8195-clk of_match table and drop its separate U_BOOT_DRIVER entry.
It was only kept apart because it used different clk_ops. Now that all MediaTek clock drivers share mtk_clk_ops, its entry is identical to mt8195-clk apart from the of_match table. No functional change. Signed-off-by: David Lechner <[email protected]> --- drivers/clk/mediatek/clk-mt8195.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt8195.c b/drivers/clk/mediatek/clk-mt8195.c index aa46d1b451c..eb3aa917dae 100644 --- a/drivers/clk/mediatek/clk-mt8195.c +++ b/drivers/clk/mediatek/clk-mt8195.c @@ -1598,15 +1598,11 @@ static const struct mtk_gate infra_ao_clks[] = { MTK_GATE_CLK_TREE(mt8195_infracfg_ao_clk_tree, infra_ao_clks, ext_clock_rates); -static const struct udevice_id mt8195_apmixed[] = { +static const struct udevice_id mt8195_clk_compat[] = { { .compatible = "mediatek,mt8195-apmixedsys", .data = (ulong)&mt8195_apmixedsys_clk_tree, }, - { } -}; - -static const struct udevice_id mt8195_clk_compat[] = { { .compatible = "mediatek,mt8195-topckgen", .data = (ulong)&mt8195_topckgen_clk_tree, @@ -1618,16 +1614,6 @@ static const struct udevice_id mt8195_clk_compat[] = { { } }; -U_BOOT_DRIVER(mt8195_clk_apmixedsys) = { - .name = "mt8195-apmixedsys", - .id = UCLASS_CLK, - .of_match = mt8195_apmixed, - .probe = mtk_clk_probe, - .priv_auto = sizeof(struct mtk_clk_priv), - .ops = &mtk_clk_ops, - .flags = DM_FLAG_PRE_RELOC, -}; - U_BOOT_DRIVER(mt8195_clk) = { .name = "mt8195-clk", .id = UCLASS_CLK, -- 2.43.0
