Merge tag 'vfio-v6.4-rc1' of https://github.com/awilliam/linux-vfio

[linux-block.git] / drivers / clk / mediatek / clk-mt8195-vpp0.c

diff --git a/drivers/clk/mediatek/clk-mt8195-vpp0.c b/drivers/clk/mediatek/clk-mt8195-vpp0.c
index e19664af09b6c0900a17d5e851848bc6972a8aae..1a98fb9a25e8a3274a87448ae09990aa2525175a 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8195-vpp0.c
+++ b/drivers/clk/mediatek/clk-mt8195-vpp0.c
@@ -86,54 +86,24 @@ static const struct mtk_gate vpp0_clks[] = {
        GATE_VPP0_2(CLK_VPP0_WARP1_MDP_DL_ASYNC, "vpp0_warp1_mdp_dl_async", "top_wpe_vpp", 3),
 };
 
-static int clk_mt8195_vpp0_probe(struct platform_device *pdev)
-{
-       struct device *dev = &pdev->dev;
-       struct device_node *node = dev->parent->of_node;
-       struct clk_hw_onecell_data *clk_data;
-       int r;
-
-       clk_data = mtk_alloc_clk_data(CLK_VPP0_NR_CLK);
-       if (!clk_data)
-               return -ENOMEM;
-
-       r = mtk_clk_register_gates(dev, node, vpp0_clks, ARRAY_SIZE(vpp0_clks), clk_data);
-       if (r)
-               goto free_vpp0_data;
-
-       r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
-       if (r)
-               goto unregister_gates;
-
-       platform_set_drvdata(pdev, clk_data);
-
-       return r;
-
-unregister_gates:
-       mtk_clk_unregister_gates(vpp0_clks, ARRAY_SIZE(vpp0_clks), clk_data);
-free_vpp0_data:
-       mtk_free_clk_data(clk_data);
-       return r;
-}
-
-static int clk_mt8195_vpp0_remove(struct platform_device *pdev)
-{
-       struct device *dev = &pdev->dev;
-       struct device_node *node = dev->parent->of_node;
-       struct clk_hw_onecell_data *clk_data = platform_get_drvdata(pdev);
-
-       of_clk_del_provider(node);
-       mtk_clk_unregister_gates(vpp0_clks, ARRAY_SIZE(vpp0_clks), clk_data);
-       mtk_free_clk_data(clk_data);
+static const struct mtk_clk_desc vpp0_desc = {
+       .clks = vpp0_clks,
+       .num_clks = ARRAY_SIZE(vpp0_clks),
+};
 
-       return 0;
-}
+static const struct platform_device_id clk_mt8195_vpp0_id_table[] = {
+       { .name = "clk-mt8195-vpp0", .driver_data = (kernel_ulong_t)&vpp0_desc },
+       { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, clk_mt8195_vpp0_id_table);
 
 static struct platform_driver clk_mt8195_vpp0_drv = {
-       .probe = clk_mt8195_vpp0_probe,
-       .remove = clk_mt8195_vpp0_remove,
+       .probe = mtk_clk_pdev_probe,
+       .remove = mtk_clk_pdev_remove,
        .driver = {
                .name = "clk-mt8195-vpp0",
        },
+       .id_table = clk_mt8195_vpp0_id_table,
 };
-builtin_platform_driver(clk_mt8195_vpp0_drv);
+module_platform_driver(clk_mt8195_vpp0_drv);
+MODULE_LICENSE("GPL");