lkml.org 
[lkml]   [2023]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: [PATCH v6 3/4] clk: mediatek: remove MT8195 vppsys/0/1 simple_probe
    Date
    On Tue, 2023-01-31 at 17:50 +0800, Chen-Yu Tsai wrote:
    > On Wed, Jan 18, 2023 at 11:16 AM Moudy Ho <moudy.ho@mediatek.com>
    > wrote:
    > >
    > > MT8195 VPPSYS0/1 will be probed by the compatible name in
    > > the mtk-mmsys driver and then probe its own clock driver as
    > > a platform driver.
    > >
    > > Signed-off-by: Moudy Ho <moudy.ho@mediatek.com>
    > > ---
    > > drivers/clk/mediatek/clk-mt8195-vpp0.c | 58 +++++++++++++++++++---
    > > ----
    > > drivers/clk/mediatek/clk-mt8195-vpp1.c | 58 +++++++++++++++++++---
    > > ----
    > > 2 files changed, 86 insertions(+), 30 deletions(-)
    > >
    > > diff --git a/drivers/clk/mediatek/clk-mt8195-vpp0.c
    > > b/drivers/clk/mediatek/clk-mt8195-vpp0.c
    > > index bf2939c3a023..6d5800f69f6c 100644
    > > --- a/drivers/clk/mediatek/clk-mt8195-vpp0.c
    > > +++ b/drivers/clk/mediatek/clk-mt8195-vpp0.c
    > > @@ -86,26 +86,54 @@ 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 const struct mtk_clk_desc vpp0_desc = {
    > > - .clks = vpp0_clks,
    > > - .num_clks = ARRAY_SIZE(vpp0_clks),
    > > -};
    > > +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_onecell_data *clk_data;
    >
    > mtk_alloc_clk_data() API changed a couple releases back. So:
    >
    > struct clk_hw_onecell_data
    >
    > > + int r;
    > >
    > > -static const struct of_device_id of_match_clk_mt8195_vpp0[] = {
    > > - {
    > > - .compatible = "mediatek,mt8195-vppsys0",
    > > - .data = &vpp0_desc,
    > > - }, {
    > > - /* sentinel */
    > > - }
    > > -};
    > > + clk_data = mtk_alloc_clk_data(CLK_VPP0_NR_CLK);
    > > + if (!clk_data)
    > > + return -ENOMEM;
    > > +
    > > + r = mtk_clk_register_gates(node, vpp0_clks,
    > > ARRAY_SIZE(vpp0_clks), clk_data);
    >
    > API changed.
    >
    > > + if (r)
    > > + goto free_vpp0_data;
    > > +
    > > + r = of_clk_add_provider(node, of_clk_src_onecell_get,
    > > clk_data);
    >
    > of_clk_add_provider(node, of_clk_hw_onecell_get,
    > clk_data);
    >
    > Same for the other driver.
    >
    >
    > ChenYu
    >

    Hi ChenYu,

    Thanks for taking the time, could you please take a look at the v7?

    https://lore.kernel.org/lkml/20230207014800.7619-1-moudy.ho@mediatek.com/

    Regards,
    Moudy
    > > + 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);
    > > +
    > > + return 0;
    > > +}
    > >
    > > static struct platform_driver clk_mt8195_vpp0_drv = {
    > > - .probe = mtk_clk_simple_probe,
    > > - .remove = mtk_clk_simple_remove,
    > > + .probe = clk_mt8195_vpp0_probe,
    > > + .remove = clk_mt8195_vpp0_remove,
    > > .driver = {
    > > .name = "clk-mt8195-vpp0",
    > > - .of_match_table = of_match_clk_mt8195_vpp0,
    > > },
    > > };
    > > builtin_platform_driver(clk_mt8195_vpp0_drv);
    > > diff --git a/drivers/clk/mediatek/clk-mt8195-vpp1.c
    > > b/drivers/clk/mediatek/clk-mt8195-vpp1.c
    > > index ffd52c762890..3b88c69e96c9 100644
    > > --- a/drivers/clk/mediatek/clk-mt8195-vpp1.c
    > > +++ b/drivers/clk/mediatek/clk-mt8195-vpp1.c
    > > @@ -84,26 +84,54 @@ static const struct mtk_gate vpp1_clks[] = {
    > > GATE_VPP1_1(CLK_VPP1_VPP_SPLIT_26M, "vpp1_vpp_split_26m",
    > > "clk26m", 26),
    > > };
    > >
    > > -static const struct mtk_clk_desc vpp1_desc = {
    > > - .clks = vpp1_clks,
    > > - .num_clks = ARRAY_SIZE(vpp1_clks),
    > > -};
    > > +static int clk_mt8195_vpp1_probe(struct platform_device *pdev)
    > > +{
    > > + struct device *dev = &pdev->dev;
    > > + struct device_node *node = dev->parent->of_node;
    > > + struct clk_onecell_data *clk_data;
    > > + int r;
    > >
    > > -static const struct of_device_id of_match_clk_mt8195_vpp1[] = {
    > > - {
    > > - .compatible = "mediatek,mt8195-vppsys1",
    > > - .data = &vpp1_desc,
    > > - }, {
    > > - /* sentinel */
    > > - }
    > > -};
    > > + clk_data = mtk_alloc_clk_data(CLK_VPP1_NR_CLK);
    > > + if (!clk_data)
    > > + return -ENOMEM;
    > > +
    > > + r = mtk_clk_register_gates(node, vpp1_clks,
    > > ARRAY_SIZE(vpp1_clks), clk_data);
    > > + if (r)
    > > + goto free_vpp1_data;
    > > +
    > > + r = of_clk_add_provider(node, of_clk_src_onecell_get,
    > > clk_data);
    > > + if (r)
    > > + goto unregister_gates;
    > > +
    > > + platform_set_drvdata(pdev, clk_data);
    > > +
    > > + return r;
    > > +
    > > +unregister_gates:
    > > + mtk_clk_unregister_gates(vpp1_clks, ARRAY_SIZE(vpp1_clks),
    > > clk_data);
    > > +free_vpp1_data:
    > > + mtk_free_clk_data(clk_data);
    > > + return r;
    > > +}
    > > +
    > > +static int clk_mt8195_vpp1_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(vpp1_clks, ARRAY_SIZE(vpp1_clks),
    > > clk_data);
    > > + mtk_free_clk_data(clk_data);
    > > +
    > > + return 0;
    > > +}
    > >
    > > static struct platform_driver clk_mt8195_vpp1_drv = {
    > > - .probe = mtk_clk_simple_probe,
    > > - .remove = mtk_clk_simple_remove,
    > > + .probe = clk_mt8195_vpp1_probe,
    > > + .remove = clk_mt8195_vpp1_remove,
    > > .driver = {
    > > .name = "clk-mt8195-vpp1",
    > > - .of_match_table = of_match_clk_mt8195_vpp1,
    > > },
    > > };
    > > builtin_platform_driver(clk_mt8195_vpp1_drv);
    > > --
    > > 2.18.0
    > >
    \
     
     \ /
      Last update: 2023-03-27 00:11    [W:2.479 / U:0.332 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site