lkml.org 
[lkml]   [2022]   [Dec]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 21/23] clk: mediatek: clk-mt6795-topckgen: Migrate to mtk_clk_simple_probe()
    Date
    Migrate away from custom probe functions and use the commonized
    mtk_clk_simple_{probe, remove}().

    Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
    ---
    drivers/clk/mediatek/clk-mt6795-topckgen.c | 84 ++++------------------
    1 file changed, 14 insertions(+), 70 deletions(-)

    diff --git a/drivers/clk/mediatek/clk-mt6795-topckgen.c b/drivers/clk/mediatek/clk-mt6795-topckgen.c
    index 19440fe5460d..e80fa588e309 100644
    --- a/drivers/clk/mediatek/clk-mt6795-topckgen.c
    +++ b/drivers/clk/mediatek/clk-mt6795-topckgen.c
    @@ -523,86 +523,30 @@ static struct mtk_composite top_aud_divs[] = {
    DIV_GATE(CLK_TOP_APLL2_DIV5, "apll2_div5", "apll2_div4", 0x12c, 21, 0x12c, 4, 4),
    };

    +static const struct mtk_clk_desc topck_desc = {
    + .fixed_clks = fixed_clks,
    + .num_fixed_clks = ARRAY_SIZE(fixed_clks),
    + .factor_clks = top_divs,
    + .num_factor_clks = ARRAY_SIZE(top_divs),
    + .mux_clks = top_muxes,
    + .num_mux_clks = ARRAY_SIZE(top_muxes),
    + .composite_clks = top_aud_divs,
    + .num_composite_clks = ARRAY_SIZE(top_aud_divs),
    + .clk_lock = &mt6795_top_clk_lock,
    +};

    static const struct of_device_id of_match_clk_mt6795_topckgen[] = {
    - { .compatible = "mediatek,mt6795-topckgen" },
    + { .compatible = "mediatek,mt6795-topckgen", .data = &topck_desc },
    { /* sentinel */ }
    };

    -static int clk_mt6795_topckgen_probe(struct platform_device *pdev)
    -{
    - struct clk_hw_onecell_data *clk_data;
    - struct device_node *node = pdev->dev.of_node;
    - void __iomem *base;
    - int ret;
    -
    - base = devm_platform_ioremap_resource(pdev, 0);
    - if (IS_ERR(base))
    - return PTR_ERR(base);
    -
    - clk_data = mtk_alloc_clk_data(CLK_TOP_NR_CLK);
    - if (!clk_data)
    - return -ENOMEM;
    -
    - ret = mtk_clk_register_fixed_clks(fixed_clks, ARRAY_SIZE(fixed_clks), clk_data);
    - if (ret)
    - goto free_clk_data;
    -
    - ret = mtk_clk_register_factors(top_divs, ARRAY_SIZE(top_divs), clk_data);
    - if (ret)
    - goto unregister_fixed_clks;
    -
    - ret = mtk_clk_register_muxes(top_muxes, ARRAY_SIZE(top_muxes), node,
    - &mt6795_top_clk_lock, clk_data, &pdev->dev);
    - if (ret)
    - goto unregister_factors;
    -
    - ret = mtk_clk_register_composites(top_aud_divs, ARRAY_SIZE(top_aud_divs), base,
    - &mt6795_top_clk_lock, clk_data, &pdev->dev);
    - if (ret)
    - goto unregister_muxes;
    -
    - ret = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
    - if (ret)
    - goto unregister_composites;
    -
    - return 0;
    -
    -unregister_composites:
    - mtk_clk_unregister_composites(top_aud_divs, ARRAY_SIZE(top_aud_divs), clk_data);
    -unregister_muxes:
    - mtk_clk_unregister_muxes(top_muxes, ARRAY_SIZE(top_muxes), clk_data);
    -unregister_factors:
    - mtk_clk_unregister_factors(top_divs, ARRAY_SIZE(top_divs), clk_data);
    -unregister_fixed_clks:
    - mtk_clk_unregister_fixed_clks(fixed_clks, ARRAY_SIZE(fixed_clks), clk_data);
    -free_clk_data:
    - mtk_free_clk_data(clk_data);
    - return ret;
    -}
    -
    -static int clk_mt6795_topckgen_remove(struct platform_device *pdev)
    -{
    - struct device_node *node = pdev->dev.of_node;
    - struct clk_hw_onecell_data *clk_data = platform_get_drvdata(pdev);
    -
    - of_clk_del_provider(node);
    - mtk_clk_unregister_composites(top_aud_divs, ARRAY_SIZE(top_aud_divs), clk_data);
    - mtk_clk_unregister_muxes(top_muxes, ARRAY_SIZE(top_muxes), clk_data);
    - mtk_clk_unregister_factors(top_divs, ARRAY_SIZE(top_divs), clk_data);
    - mtk_clk_unregister_fixed_clks(fixed_clks, ARRAY_SIZE(fixed_clks), clk_data);
    - mtk_free_clk_data(clk_data);
    -
    - return 0;
    -}
    -
    static struct platform_driver clk_mt6795_topckgen_drv = {
    .driver = {
    .name = "clk-mt6795-topckgen",
    .of_match_table = of_match_clk_mt6795_topckgen,
    },
    - .probe = clk_mt6795_topckgen_probe,
    - .remove = clk_mt6795_topckgen_remove,
    + .probe = mtk_clk_simple_probe,
    + .remove = mtk_clk_simple_remove,
    };
    module_platform_driver(clk_mt6795_topckgen_drv);

    --
    2.39.0
    \
     
     \ /
      Last update: 2023-03-26 23:18    [W:4.377 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site