lkml.org 
[lkml]   [2022]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V3 08/17] clk: mediatek: reset: Add new register reset function with device
    Date
    It's a proper implementation using device to register reset controller.
    Howerver, some clock drviers of MediaTeks only provide device_node.
    Therefore, we still remain register reset function with device_node and
    add a function with device to register reset controller.

    Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com>
    ---
    drivers/clk/mediatek/clk-mt2701-eth.c | 2 +-
    drivers/clk/mediatek/clk-mt2701-g3d.c | 2 +-
    drivers/clk/mediatek/clk-mt2701-hif.c | 2 +-
    drivers/clk/mediatek/clk-mt2701.c | 4 +-
    drivers/clk/mediatek/clk-mt2712.c | 4 +-
    drivers/clk/mediatek/clk-mt7622-eth.c | 2 +-
    drivers/clk/mediatek/clk-mt7622-hif.c | 4 +-
    drivers/clk/mediatek/clk-mt7622.c | 4 +-
    drivers/clk/mediatek/clk-mt7629-eth.c | 2 +-
    drivers/clk/mediatek/clk-mt7629-hif.c | 4 +-
    drivers/clk/mediatek/clk-mt8183.c | 2 +-
    drivers/clk/mediatek/reset.c | 53 +++++++++++++++++++++++++++
    drivers/clk/mediatek/reset.h | 2 +
    13 files changed, 71 insertions(+), 16 deletions(-)

    diff --git a/drivers/clk/mediatek/clk-mt2701-eth.c b/drivers/clk/mediatek/clk-mt2701-eth.c
    index b651f3878267..90d662d955a9 100644
    --- a/drivers/clk/mediatek/clk-mt2701-eth.c
    +++ b/drivers/clk/mediatek/clk-mt2701-eth.c
    @@ -64,7 +64,7 @@ static int clk_mt2701_eth_probe(struct platform_device *pdev)
    "could not register clock provider: %s: %d\n",
    pdev->name, r);

    - mtk_register_reset_controller(node, &clk_rst_desc);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);

    return r;
    }
    diff --git a/drivers/clk/mediatek/clk-mt2701-g3d.c b/drivers/clk/mediatek/clk-mt2701-g3d.c
    index 7696870f6f23..fc6563e29da7 100644
    --- a/drivers/clk/mediatek/clk-mt2701-g3d.c
    +++ b/drivers/clk/mediatek/clk-mt2701-g3d.c
    @@ -58,7 +58,7 @@ static int clk_mt2701_g3dsys_init(struct platform_device *pdev)
    "could not register clock provider: %s: %d\n",
    pdev->name, r);

    - mtk_register_reset_controller(node, &clk_rst_desc);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);

    return r;
    }
    diff --git a/drivers/clk/mediatek/clk-mt2701-hif.c b/drivers/clk/mediatek/clk-mt2701-hif.c
    index 57fa63c47452..13acc15de2e3 100644
    --- a/drivers/clk/mediatek/clk-mt2701-hif.c
    +++ b/drivers/clk/mediatek/clk-mt2701-hif.c
    @@ -63,7 +63,7 @@ static int clk_mt2701_hif_probe(struct platform_device *pdev)
    return r;
    }

    - mtk_register_reset_controller(node, &clk_rst_desc);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);

    return 0;
    }
    diff --git a/drivers/clk/mediatek/clk-mt2701.c b/drivers/clk/mediatek/clk-mt2701.c
    index 496afc7483ae..76662d1810ab 100644
    --- a/drivers/clk/mediatek/clk-mt2701.c
    +++ b/drivers/clk/mediatek/clk-mt2701.c
    @@ -800,7 +800,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)
    if (r)
    return r;

    - mtk_register_reset_controller(node, &clk_rst_desc[0]);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[0]);

    return 0;
    }
    @@ -923,7 +923,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)
    if (r)
    return r;

    - mtk_register_reset_controller(node, &clk_rst_desc[1]);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[1]);

    return 0;
    }
    diff --git a/drivers/clk/mediatek/clk-mt2712.c b/drivers/clk/mediatek/clk-mt2712.c
    index 04ff9b1327d2..664d56d665fe 100644
    --- a/drivers/clk/mediatek/clk-mt2712.c
    +++ b/drivers/clk/mediatek/clk-mt2712.c
    @@ -1376,7 +1376,7 @@ static int clk_mt2712_infra_probe(struct platform_device *pdev)
    pr_err("%s(): could not register clock provider: %d\n",
    __func__, r);

    - mtk_register_reset_controller(node, &clk_rst_desc[0]);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[0]);

    return r;
    }
    @@ -1398,7 +1398,7 @@ static int clk_mt2712_peri_probe(struct platform_device *pdev)
    pr_err("%s(): could not register clock provider: %d\n",
    __func__, r);

    - mtk_register_reset_controller(node, &clk_rst_desc[1]);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[1]);

    return r;
    }
    diff --git a/drivers/clk/mediatek/clk-mt7622-eth.c b/drivers/clk/mediatek/clk-mt7622-eth.c
    index 3bf7f4610ad1..88462698c2af 100644
    --- a/drivers/clk/mediatek/clk-mt7622-eth.c
    +++ b/drivers/clk/mediatek/clk-mt7622-eth.c
    @@ -88,7 +88,7 @@ static int clk_mt7622_ethsys_init(struct platform_device *pdev)
    "could not register clock provider: %s: %d\n",
    pdev->name, r);

    - mtk_register_reset_controller(node, &clk_rst_desc);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);

    return r;
    }
    diff --git a/drivers/clk/mediatek/clk-mt7622-hif.c b/drivers/clk/mediatek/clk-mt7622-hif.c
    index 88fe9b447158..bb23a88a7810 100644
    --- a/drivers/clk/mediatek/clk-mt7622-hif.c
    +++ b/drivers/clk/mediatek/clk-mt7622-hif.c
    @@ -99,7 +99,7 @@ static int clk_mt7622_ssusbsys_init(struct platform_device *pdev)
    "could not register clock provider: %s: %d\n",
    pdev->name, r);

    - mtk_register_reset_controller(node, &clk_rst_desc);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);

    return r;
    }
    @@ -121,7 +121,7 @@ static int clk_mt7622_pciesys_init(struct platform_device *pdev)
    "could not register clock provider: %s: %d\n",
    pdev->name, r);

    - mtk_register_reset_controller(node, &clk_rst_desc);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);

    return r;
    }
    diff --git a/drivers/clk/mediatek/clk-mt7622.c b/drivers/clk/mediatek/clk-mt7622.c
    index 3f937723b211..8f2003dd1e75 100644
    --- a/drivers/clk/mediatek/clk-mt7622.c
    +++ b/drivers/clk/mediatek/clk-mt7622.c
    @@ -678,7 +678,7 @@ static int mtk_infrasys_init(struct platform_device *pdev)
    if (r)
    return r;

    - mtk_register_reset_controller(node, &clk_rst_desc[0]);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[0]);

    return 0;
    }
    @@ -729,7 +729,7 @@ static int mtk_pericfg_init(struct platform_device *pdev)

    clk_prepare_enable(clk_data->clks[CLK_PERI_UART0_PD]);

    - mtk_register_reset_controller(node, &clk_rst_desc[1]);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc[1]);

    return 0;
    }
    diff --git a/drivers/clk/mediatek/clk-mt7629-eth.c b/drivers/clk/mediatek/clk-mt7629-eth.c
    index 079b8facf63f..32f035822a9a 100644
    --- a/drivers/clk/mediatek/clk-mt7629-eth.c
    +++ b/drivers/clk/mediatek/clk-mt7629-eth.c
    @@ -98,7 +98,7 @@ static int clk_mt7629_ethsys_init(struct platform_device *pdev)
    "could not register clock provider: %s: %d\n",
    pdev->name, r);

    - mtk_register_reset_controller(node, &clk_rst_desc);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);

    return r;
    }
    diff --git a/drivers/clk/mediatek/clk-mt7629-hif.c b/drivers/clk/mediatek/clk-mt7629-hif.c
    index 69a2ecf8d3df..e4a5b66ac005 100644
    --- a/drivers/clk/mediatek/clk-mt7629-hif.c
    +++ b/drivers/clk/mediatek/clk-mt7629-hif.c
    @@ -94,7 +94,7 @@ static int clk_mt7629_ssusbsys_init(struct platform_device *pdev)
    "could not register clock provider: %s: %d\n",
    pdev->name, r);

    - mtk_register_reset_controller(node, &clk_rst_desc);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);

    return r;
    }
    @@ -116,7 +116,7 @@ static int clk_mt7629_pciesys_init(struct platform_device *pdev)
    "could not register clock provider: %s: %d\n",
    pdev->name, r);

    - mtk_register_reset_controller(node, &clk_rst_desc);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);

    return r;
    }
    diff --git a/drivers/clk/mediatek/clk-mt8183.c b/drivers/clk/mediatek/clk-mt8183.c
    index c957249d4cdf..b8884e94604d 100644
    --- a/drivers/clk/mediatek/clk-mt8183.c
    +++ b/drivers/clk/mediatek/clk-mt8183.c
    @@ -1245,7 +1245,7 @@ static int clk_mt8183_infra_probe(struct platform_device *pdev)
    return r;
    }

    - mtk_register_reset_controller(node, &clk_rst_desc);
    + mtk_register_reset_controller_with_dev(&pdev->dev, &clk_rst_desc);

    return r;
    }
    diff --git a/drivers/clk/mediatek/reset.c b/drivers/clk/mediatek/reset.c
    index 03d865f3308e..fe917b2eeab4 100644
    --- a/drivers/clk/mediatek/reset.c
    +++ b/drivers/clk/mediatek/reset.c
    @@ -149,4 +149,57 @@ int mtk_register_reset_controller(struct device_node *np,
    return 0;
    }

    +int mtk_register_reset_controller_with_dev(struct device *dev,
    + const struct mtk_clk_rst_desc *desc)
    +{
    + struct device_node *np = dev->of_node;
    + struct regmap *regmap;
    + const struct reset_control_ops *rcops = NULL;
    + struct mtk_clk_rst_data *data;
    + int ret;
    +
    + if (!desc) {
    + dev_err(dev, "mtk clock reset desc is NULL\n");
    + return -EINVAL;
    + }
    +
    + switch (desc->version) {
    + case MTK_RST_SIMPLE:
    + rcops = &mtk_reset_ops;
    + break;
    + case MTK_RST_SET_CLR:
    + rcops = &mtk_reset_ops_set_clr;
    + break;
    + default:
    + dev_err(dev, "Unknown reset version %d\n", desc->version);
    + return -EINVAL;
    + }
    +
    + regmap = device_node_to_regmap(np);
    + if (IS_ERR(regmap)) {
    + dev_err(dev, "Cannot find regmap %pe\n", regmap);
    + return -EINVAL;
    + }
    +
    + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
    + if (!data)
    + return -ENOMEM;
    +
    + data->desc = desc;
    + data->regmap = regmap;
    + data->rcdev.owner = THIS_MODULE;
    + data->rcdev.nr_resets = desc->rst_set_nr * 32;
    + data->rcdev.ops = rcops;
    + data->rcdev.of_node = np;
    + data->rcdev.dev = dev;
    +
    + ret = devm_reset_controller_register(dev, &data->rcdev);
    + if (ret) {
    + dev_err(dev, "could not register reset controller: %d\n", ret);
    + return ret;
    + }
    +
    + return 0;
    +}
    +
    MODULE_LICENSE("GPL");
    diff --git a/drivers/clk/mediatek/reset.h b/drivers/clk/mediatek/reset.h
    index c3a2f2a4f486..79efbea37c9b 100644
    --- a/drivers/clk/mediatek/reset.h
    +++ b/drivers/clk/mediatek/reset.h
    @@ -29,5 +29,7 @@ struct mtk_clk_rst_data {

    int mtk_register_reset_controller(struct device_node *np,
    const struct mtk_clk_rst_desc *desc);
    +int mtk_register_reset_controller_with_dev(struct device *dev,
    + const struct mtk_clk_rst_desc *desc);

    #endif /* __DRV_CLK_MTK_RESET_H */
    --
    2.18.0
    \
     
     \ /
      Last update: 2022-04-22 08:04    [W:4.116 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site