clk: mediatek: mt8186-mcu: Migrate to common probe mechanism

Convert MT8186 MCUSYS clocks to the common mtk_clk_simple_probe().

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>
Link: https://lore.kernel.org/r/20230306140543.1813621-36-angelogioacchino.delregno@collabora.com
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/mediatek/clk-mt8186-mcu.c b/drivers/clk/mediatek/clk-mt8186-mcu.c
index e52a2d986c99c9f4fbd8f5006fb2d3d58c7ca2cc..895856df95df84b07d856aa31b54d74bbc6d7bfa 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8186-mcu.c
+++ b/drivers/clk/mediatek/clk-mt8186-mcu.c
@@ -43,67 +43,25 @@ static struct mtk_composite mcu_muxes[] = {
        MUX(CLK_MCU_ARMPLL_BUS_SEL, "mcu_armpll_bus_sel", mcu_armpll_bus_parents, 0x2E0, 9, 2),
 };
 
-static const struct of_device_id of_match_clk_mt8186_mcu[] = {
-       { .compatible = "mediatek,mt8186-mcusys", },
-       {}
+static const struct mtk_clk_desc mcu_desc = {
+       .composite_clks = mcu_muxes,
+       .num_composite_clks = ARRAY_SIZE(mcu_muxes),
 };
 
-static int clk_mt8186_mcu_probe(struct platform_device *pdev)
-{
-       struct clk_hw_onecell_data *clk_data;
-       struct device_node *node = pdev->dev.of_node;
-       int r;
-       void __iomem *base;
-
-       clk_data = mtk_alloc_clk_data(CLK_MCU_NR_CLK);
-       if (!clk_data)
-               return -ENOMEM;
-
-       base = devm_platform_ioremap_resource(pdev, 0);
-       if (IS_ERR(base)) {
-               r = PTR_ERR(base);
-               goto free_mcu_data;
-       }
-
-       r = mtk_clk_register_composites(&pdev->dev, mcu_muxes,
-                                       ARRAY_SIZE(mcu_muxes), base,
-                                       NULL, clk_data);
-       if (r)
-               goto free_mcu_data;
-
-       r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
-       if (r)
-               goto unregister_composite_muxes;
-
-       platform_set_drvdata(pdev, clk_data);
-
-       return r;
-
-unregister_composite_muxes:
-       mtk_clk_unregister_composites(mcu_muxes, ARRAY_SIZE(mcu_muxes), clk_data);
-free_mcu_data:
-       mtk_free_clk_data(clk_data);
-       return r;
-}
-
-static int clk_mt8186_mcu_remove(struct platform_device *pdev)
-{
-       struct clk_hw_onecell_data *clk_data = platform_get_drvdata(pdev);
-       struct device_node *node = pdev->dev.of_node;
-
-       of_clk_del_provider(node);
-       mtk_clk_unregister_composites(mcu_muxes, ARRAY_SIZE(mcu_muxes), clk_data);
-       mtk_free_clk_data(clk_data);
-
-       return 0;
-}
+static const struct of_device_id of_match_clk_mt8186_mcu[] = {
+       { .compatible = "mediatek,mt8186-mcusys", .data = &mcu_desc },
+       { /* sentinel */}
+};
 
 static struct platform_driver clk_mt8186_mcu_drv = {
-       .probe = clk_mt8186_mcu_probe,
-       .remove = clk_mt8186_mcu_remove,
        .driver = {
                .name = "clk-mt8186-mcu",
                .of_match_table = of_match_clk_mt8186_mcu,
        },
+       .probe = mtk_clk_simple_probe,
+       .remove = mtk_clk_simple_remove,
 };
-builtin_platform_driver(clk_mt8186_mcu_drv);
+module_platform_driver(clk_mt8186_mcu_drv);
+
+MODULE_DESCRIPTION("MediaTek MT8186 mcusys clocks driver");
+MODULE_LICENSE("GPL");