lkml.org 
[lkml]   [2021]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 090/171] clk: qcom: regmap-mux: fix parent clock lookup
    Date
    From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

    commit 9a61f813fcc8d56d85fcf9ca6119cf2b5ac91dd5 upstream.

    The function mux_get_parent() uses qcom_find_src_index() to find the
    parent clock index, which is incorrect: qcom_find_src_index() uses src
    enum for the lookup, while mux_get_parent() should use cfg field (which
    corresponds to the register value). Add qcom_find_cfg_index() function
    doing this kind of lookup and use it for mux parent lookup.

    Fixes: df964016490b ("clk: qcom: add parent map for regmap mux")
    Cc: stable@vger.kernel.org
    Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
    Link: https://lore.kernel.org/r/20211115233407.1046179-1-dmitry.baryshkov@linaro.org
    Signed-off-by: Stephen Boyd <sboyd@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/clk/qcom/clk-regmap-mux.c | 2 +-
    drivers/clk/qcom/common.c | 12 ++++++++++++
    drivers/clk/qcom/common.h | 2 ++
    3 files changed, 15 insertions(+), 1 deletion(-)

    --- a/drivers/clk/qcom/clk-regmap-mux.c
    +++ b/drivers/clk/qcom/clk-regmap-mux.c
    @@ -28,7 +28,7 @@ static u8 mux_get_parent(struct clk_hw *
    val &= mask;

    if (mux->parent_map)
    - return qcom_find_src_index(hw, mux->parent_map, val);
    + return qcom_find_cfg_index(hw, mux->parent_map, val);

    return val;
    }
    --- a/drivers/clk/qcom/common.c
    +++ b/drivers/clk/qcom/common.c
    @@ -69,6 +69,18 @@ int qcom_find_src_index(struct clk_hw *h
    }
    EXPORT_SYMBOL_GPL(qcom_find_src_index);

    +int qcom_find_cfg_index(struct clk_hw *hw, const struct parent_map *map, u8 cfg)
    +{
    + int i, num_parents = clk_hw_get_num_parents(hw);
    +
    + for (i = 0; i < num_parents; i++)
    + if (cfg == map[i].cfg)
    + return i;
    +
    + return -ENOENT;
    +}
    +EXPORT_SYMBOL_GPL(qcom_find_cfg_index);
    +
    struct regmap *
    qcom_cc_map(struct platform_device *pdev, const struct qcom_cc_desc *desc)
    {
    --- a/drivers/clk/qcom/common.h
    +++ b/drivers/clk/qcom/common.h
    @@ -49,6 +49,8 @@ extern void
    qcom_pll_set_fsm_mode(struct regmap *m, u32 reg, u8 bias_count, u8 lock_count);
    extern int qcom_find_src_index(struct clk_hw *hw, const struct parent_map *map,
    u8 src);
    +extern int qcom_find_cfg_index(struct clk_hw *hw, const struct parent_map *map,
    + u8 cfg);

    extern int qcom_cc_register_board_clk(struct device *dev, const char *path,
    const char *name, unsigned long rate);

    \
     
     \ /
      Last update: 2021-12-13 11:25    [W:3.165 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site