Merge branches 'clk-range', 'clk-uniphier', 'clk-apple' and 'clk-qcom' into clk-next

[linux-2.6-microblaze.git] / drivers / clk / mediatek / clk-mt8195-vdo1.c

diff --git a/drivers/clk/mediatek/clk-mt8195-vdo1.c b/drivers/clk/mediatek/clk-mt8195-vdo1.c
index 03df8ea..90c738a 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8195-vdo1.c
+++ b/drivers/clk/mediatek/clk-mt8195-vdo1.c
@@ -122,17 +122,35 @@ static int clk_mt8195_vdo1_probe(struct platform_device *pdev)
 
        r = of_clk_add_provider(node, of_clk_src_onecell_get, clk_data);
        if (r)
-               goto free_vdo1_data;
+               goto unregister_gates;
+
+       platform_set_drvdata(pdev, clk_data);
 
        return r;
 
+unregister_gates:
+       mtk_clk_unregister_gates(vdo1_clks, ARRAY_SIZE(vdo1_clks), clk_data);
 free_vdo1_data:
        mtk_free_clk_data(clk_data);
        return r;
 }
 
+static int clk_mt8195_vdo1_remove(struct platform_device *pdev)
+{
+       struct device *dev = &pdev->dev;
+       struct device_node *node = dev->parent->of_node;
+       struct clk_onecell_data *clk_data = platform_get_drvdata(pdev);
+
+       of_clk_del_provider(node);
+       mtk_clk_unregister_gates(vdo1_clks, ARRAY_SIZE(vdo1_clks), clk_data);
+       mtk_free_clk_data(clk_data);
+
+       return 0;
+}
+
 static struct platform_driver clk_mt8195_vdo1_drv = {
        .probe = clk_mt8195_vdo1_probe,
+       .remove = clk_mt8195_vdo1_remove,
        .driver = {
                .name = "clk-mt8195-vdo1",
        },