lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 262/663] clk: meson: clk-pll: propagate the error from meson_clk_pll_set_rate()
    Date
    From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

    [ Upstream commit ccdc1f0836f8e37b558a424f1e491f929b2e7ede ]

    Popagate the error code from meson_clk_pll_set_rate() when the PLL does
    not lock with the new settings.

    Fixes: 722825dcd54b2e ("clk: meson: migrate plls clocks to clk_regmap")
    Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
    Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
    Link: https://lore.kernel.org/r/20201226121556.975418-4-martin.blumenstingl@googlemail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/clk/meson/clk-pll.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c
    index 5b932976483fd..49f27fe532139 100644
    --- a/drivers/clk/meson/clk-pll.c
    +++ b/drivers/clk/meson/clk-pll.c
    @@ -394,7 +394,8 @@ static int meson_clk_pll_set_rate(struct clk_hw *hw, unsigned long rate,
    if (!enabled)
    return 0;

    - if (meson_clk_pll_enable(hw)) {
    + ret = meson_clk_pll_enable(hw);
    + if (ret) {
    pr_warn("%s: pll did not lock, trying to restore old rate %lu\n",
    __func__, old_rate);
    /*
    @@ -406,7 +407,7 @@ static int meson_clk_pll_set_rate(struct clk_hw *hw, unsigned long rate,
    meson_clk_pll_set_rate(hw, old_rate, parent_rate);
    }

    - return 0;
    + return ret;
    }

    /*
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 03:10    [W:4.223 / U:0.792 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site