clk: mediatek: mt8195: Implement remove functions

Until now the mediatek clk driver library did not have any way to
unregister clks, and so none of the drivers implemented remove
functions.

Now that the library does have APIs to unregister clks, use them
to implement remove functions for the mt8195 clk drivers.

Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: Miles Chen <miles.chen@mediatek.com>
Link: https://lore.kernel.org/r/20220208124034.414635-31-wenst@chromium.org
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>

diff --git a/drivers/clk/mediatek/clk-mt8195-apmixedsys.c b/drivers/clk/mediatek/clk-mt8195-apmixedsys.c
index d0fdb5a4a921e086a6ea69f93d53811c29f2167d..eecc7035a56a7f51572204497ae516122bc765f7 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8195-apmixedsys.c
+++ b/drivers/clk/mediatek/clk-mt8195-apmixedsys.c
@@ -132,6 +132,8 @@ static int clk_mt8195_apmixed_probe(struct platform_device *pdev)
        if (r)
                goto unregister_gates;
 
+       platform_set_drvdata(pdev, clk_data);
+
        return r;
 
 unregister_gates:
@@ -143,8 +145,22 @@ free_apmixed_data:
        return r;
 }
 
+static int clk_mt8195_apmixed_remove(struct platform_device *pdev)
+{
+       struct device_node *node = pdev->dev.of_node;
+       struct clk_onecell_data *clk_data = platform_get_drvdata(pdev);
+
+       of_clk_del_provider(node);
+       mtk_clk_unregister_gates(apmixed_clks, ARRAY_SIZE(apmixed_clks), clk_data);
+       mtk_clk_unregister_plls(plls, ARRAY_SIZE(plls), clk_data);
+       mtk_free_clk_data(clk_data);
+
+       return 0;
+}
+
 static struct platform_driver clk_mt8195_apmixed_drv = {
        .probe = clk_mt8195_apmixed_probe,
+       .remove = clk_mt8195_apmixed_remove,
        .driver = {
                .name = "clk-mt8195-apmixed",
                .of_match_table = of_match_clk_mt8195_apmixed,

diff --git a/drivers/clk/mediatek/clk-mt8195-apusys_pll.c b/drivers/clk/mediatek/clk-mt8195-apusys_pll.c
index f489b57e325e45662b8e9ea8538c64158ba1c58e..8cd88dfc3283f125bb9a101784a37250fdf9f38f 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8195-apusys_pll.c
+++ b/drivers/clk/mediatek/clk-mt8195-apusys_pll.c
@@ -74,6 +74,8 @@ static int clk_mt8195_apusys_pll_probe(struct platform_device *pdev)
        if (r)
                goto unregister_plls;
 
+       platform_set_drvdata(pdev, clk_data);
+
        return r;
 
 unregister_plls:
@@ -83,6 +85,18 @@ free_apusys_pll_data:
        return r;
 }
 
+static int clk_mt8195_apusys_pll_remove(struct platform_device *pdev)
+{
+       struct clk_onecell_data *clk_data = platform_get_drvdata(pdev);
+       struct device_node *node = pdev->dev.of_node;
+
+       of_clk_del_provider(node);
+       mtk_clk_unregister_plls(apusys_plls, ARRAY_SIZE(apusys_plls), clk_data);
+       mtk_free_clk_data(clk_data);
+
+       return 0;
+}
+
 static const struct of_device_id of_match_clk_mt8195_apusys_pll[] = {
        { .compatible = "mediatek,mt8195-apusys_pll", },
        {}
@@ -90,6 +104,7 @@ static const struct of_device_id of_match_clk_mt8195_apusys_pll[] = {
 
 static struct platform_driver clk_mt8195_apusys_pll_drv = {
        .probe = clk_mt8195_apusys_pll_probe,
+       .remove = clk_mt8195_apusys_pll_remove,
        .driver = {
                .name = "clk-mt8195-apusys_pll",
                .of_match_table = of_match_clk_mt8195_apusys_pll,

diff --git a/drivers/clk/mediatek/clk-mt8195-topckgen.c b/drivers/clk/mediatek/clk-mt8195-topckgen.c
index 3631f49a5e5af40256efdaf7fdd96704bbe52d36..b602fcd7f1d1edb882b9978607d6483b093af21a 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8195-topckgen.c
+++ b/drivers/clk/mediatek/clk-mt8195-topckgen.c
@@ -1271,6 +1271,8 @@ static int clk_mt8195_topck_probe(struct platform_device *pdev)
        if (r)
                goto unregister_gates;
 
+       platform_set_drvdata(pdev, top_clk_data);
+
        return r;
 
 unregister_gates:
@@ -1290,8 +1292,26 @@ free_top_data:
        return r;
 }
 
+static int clk_mt8195_topck_remove(struct platform_device *pdev)
+{
+       struct clk_onecell_data *top_clk_data = platform_get_drvdata(pdev);
+       struct device_node *node = pdev->dev.of_node;
+
+       of_clk_del_provider(node);
+       mtk_clk_unregister_gates(top_clks, ARRAY_SIZE(top_clks), top_clk_data);
+       mtk_clk_unregister_composites(top_adj_divs, ARRAY_SIZE(top_adj_divs), top_clk_data);
+       mtk_clk_unregister_composites(top_muxes, ARRAY_SIZE(top_muxes), top_clk_data);
+       mtk_clk_unregister_muxes(top_mtk_muxes, ARRAY_SIZE(top_mtk_muxes), top_clk_data);
+       mtk_clk_unregister_factors(top_divs, ARRAY_SIZE(top_divs), top_clk_data);
+       mtk_clk_unregister_fixed_clks(top_fixed_clks, ARRAY_SIZE(top_fixed_clks), top_clk_data);
+       mtk_free_clk_data(top_clk_data);
+
+       return 0;
+}
+
 static struct platform_driver clk_mt8195_topck_drv = {
        .probe = clk_mt8195_topck_probe,
+       .remove = clk_mt8195_topck_remove,
        .driver = {
                .name = "clk-mt8195-topck",
                .of_match_table = of_match_clk_mt8195_topck,

diff --git a/drivers/clk/mediatek/clk-mt8195-vdo0.c b/drivers/clk/mediatek/clk-mt8195-vdo0.c
index af34eb564b1da04f1b5ccfaebbd95228142af73b..3bc7ed19d5508f2638227a98c8e87e50d7b01df1 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8195-vdo0.c
+++ b/drivers/clk/mediatek/clk-mt8195-vdo0.c
@@ -107,6 +107,8 @@ static int clk_mt8195_vdo0_probe(struct platform_device *pdev)
        if (r)
                goto unregister_gates;
 
+       platform_set_drvdata(pdev, clk_data);
+
        return r;
 
 unregister_gates:
@@ -116,8 +118,22 @@ free_vdo0_data:
        return r;
 }
 
+static int clk_mt8195_vdo0_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(vdo0_clks, ARRAY_SIZE(vdo0_clks), clk_data);
+       mtk_free_clk_data(clk_data);
+
+       return 0;
+}
+
 static struct platform_driver clk_mt8195_vdo0_drv = {
        .probe = clk_mt8195_vdo0_probe,
+       .remove = clk_mt8195_vdo0_remove,
        .driver = {
                .name = "clk-mt8195-vdo0",
        },

diff --git a/drivers/clk/mediatek/clk-mt8195-vdo1.c b/drivers/clk/mediatek/clk-mt8195-vdo1.c
index 6b502bbc730c02c8258509705df84ff4eb136338..90c738a85ff1f5c472d3e7660fa36f6488dc413e 100644 (file)
--- a/drivers/clk/mediatek/clk-mt8195-vdo1.c
+++ b/drivers/clk/mediatek/clk-mt8195-vdo1.c
@@ -124,6 +124,8 @@ static int clk_mt8195_vdo1_probe(struct platform_device *pdev)
        if (r)
                goto unregister_gates;
 
+       platform_set_drvdata(pdev, clk_data);
+
        return r;
 
 unregister_gates:
@@ -133,8 +135,22 @@ free_vdo1_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",
        },