lkml.org 
[lkml]   [2022]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V2 04/30] cpufreq: imx: Migrate to dev_pm_opp_set_config()
    Date
    The OPP core now provides a unified API for setting all configuration
    types, i.e. dev_pm_opp_set_config().

    Lets start using it.

    Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
    ---
    drivers/cpufreq/imx-cpufreq-dt.c | 18 +++++++++++-------
    1 file changed, 11 insertions(+), 7 deletions(-)

    diff --git a/drivers/cpufreq/imx-cpufreq-dt.c b/drivers/cpufreq/imx-cpufreq-dt.c
    index 3fe9125156b4..8104fed4ff7c 100644
    --- a/drivers/cpufreq/imx-cpufreq-dt.c
    +++ b/drivers/cpufreq/imx-cpufreq-dt.c
    @@ -31,8 +31,8 @@

    /* cpufreq-dt device registered by imx-cpufreq-dt */
    static struct platform_device *cpufreq_dt_pdev;
    -static struct opp_table *cpufreq_opp_table;
    static struct device *cpu_dev;
    +static int cpufreq_opp_token;

    enum IMX7ULP_CPUFREQ_CLKS {
    ARM,
    @@ -86,6 +86,10 @@ static int imx_cpufreq_dt_probe(struct platform_device *pdev)
    u32 cell_value, supported_hw[2];
    int speed_grade, mkt_segment;
    int ret;
    + struct dev_pm_opp_config config = {
    + .supported_hw = supported_hw,
    + .supported_hw_count = ARRAY_SIZE(supported_hw),
    + };

    cpu_dev = get_cpu_device(0);

    @@ -153,17 +157,17 @@ static int imx_cpufreq_dt_probe(struct platform_device *pdev)
    dev_info(&pdev->dev, "cpu speed grade %d mkt segment %d supported-hw %#x %#x\n",
    speed_grade, mkt_segment, supported_hw[0], supported_hw[1]);

    - cpufreq_opp_table = dev_pm_opp_set_supported_hw(cpu_dev, supported_hw, 2);
    - if (IS_ERR(cpufreq_opp_table)) {
    - ret = PTR_ERR(cpufreq_opp_table);
    - dev_err(&pdev->dev, "Failed to set supported opp: %d\n", ret);
    + cpufreq_opp_token = dev_pm_opp_set_config(cpu_dev, &config);
    + if (cpufreq_opp_token < 0) {
    + ret = cpufreq_opp_token;
    + dev_err(&pdev->dev, "Failed to set Opp config: %d\n", ret);
    return ret;
    }

    cpufreq_dt_pdev = platform_device_register_data(
    &pdev->dev, "cpufreq-dt", -1, NULL, 0);
    if (IS_ERR(cpufreq_dt_pdev)) {
    - dev_pm_opp_put_supported_hw(cpufreq_opp_table);
    + dev_pm_opp_clear_config(cpufreq_opp_token);
    ret = PTR_ERR(cpufreq_dt_pdev);
    dev_err(&pdev->dev, "Failed to register cpufreq-dt: %d\n", ret);
    return ret;
    @@ -176,7 +180,7 @@ static int imx_cpufreq_dt_remove(struct platform_device *pdev)
    {
    platform_device_unregister(cpufreq_dt_pdev);
    if (!of_machine_is_compatible("fsl,imx7ulp"))
    - dev_pm_opp_put_supported_hw(cpufreq_opp_table);
    + dev_pm_opp_clear_config(cpufreq_opp_token);
    else
    clk_bulk_put(ARRAY_SIZE(imx7ulp_clks), imx7ulp_clks);

    --
    2.31.1.272.g89b43f80a514
    \
     
     \ /
      Last update: 2022-07-01 10:22    [W:2.546 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site