[PATCH 21/32] clk: mediatek: mt7986-apmixed: Switch to common probe/remove helpers
From: Akari Tsuyukusa <hidden>
Date: 2026-08-03 14:19:16
Also in:
linux-arm-kernel, linux-clk, linux-mediatek, lkml, stable
Subsystem:
common clk framework, the rest · Maintainers:
Michael Turquette, Stephen Boyd, Linus Torvalds
The MT7986 apmixed driver can use the MediaTek clock framework common initialization sequence. Reduce boilerplate code by creating struct mtk_clk_desc and using the mtk_clk_simple_probe/remove helpers. Also, add a remove callback to properly support module unloading. Signed-off-by: Akari Tsuyukusa <redacted> --- drivers/clk/mediatek/clk-mt7986-apmixed.c | 37 ++++++----------------- 1 file changed, 9 insertions(+), 28 deletions(-)
diff --git a/drivers/clk/mediatek/clk-mt7986-apmixed.c b/drivers/clk/mediatek/clk-mt7986-apmixed.c
index af3e002bbfb7..6df3e9555e4e 100644
--- a/drivers/clk/mediatek/clk-mt7986-apmixed.c
+++ b/drivers/clk/mediatek/clk-mt7986-apmixed.c@@ -57,45 +57,26 @@ static const struct mtk_pll_data plls[] = { 0x0278, 4, 0, 0x027c, 0), }; +static const struct mtk_clk_desc apmixed_desc = { + .plls = plls, + .num_plls = ARRAY_SIZE(plls), +}; + static const struct of_device_id of_match_clk_mt7986_apmixed[] = { - { .compatible = "mediatek,mt7986-apmixedsys", }, + { .compatible = "mediatek,mt7986-apmixedsys", .data = &apmixed_desc }, { } }; MODULE_DEVICE_TABLE(of, of_match_clk_mt7986_apmixed); -static int clk_mt7986_apmixed_probe(struct platform_device *pdev) -{ - struct clk_hw_onecell_data *clk_data; - struct device_node *node = pdev->dev.of_node; - int r; - - clk_data = mtk_alloc_clk_data(ARRAY_SIZE(plls)); - if (!clk_data) - return -ENOMEM; - - mtk_clk_register_plls(&pdev->dev, plls, ARRAY_SIZE(plls), clk_data); - - r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); - if (r) { - pr_err("%s(): could not register clock provider: %d\n", - __func__, r); - goto free_apmixed_data; - } - return r; - -free_apmixed_data: - mtk_free_clk_data(clk_data); - return r; -} - static struct platform_driver clk_mt7986_apmixed_drv = { - .probe = clk_mt7986_apmixed_probe, + .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, .driver = { .name = "clk-mt7986-apmixed", .of_match_table = of_match_clk_mt7986_apmixed, }, }; -builtin_platform_driver(clk_mt7986_apmixed_drv); +module_platform_driver(clk_mt7986_apmixed_drv); MODULE_DESCRIPTION("MediaTek MT7986 apmixedsys clocks driver"); MODULE_LICENSE("GPL");
--
2.55.0