Re: [PATCH 1/9] drivers: clk: st: Incorrect clocks status
From: Stephen Boyd <hidden>
Date: 2015-06-24 20:02:42
Also in:
linux-arm-kernel, linux-clk, lkml
On 06/23/2015 07:09 AM, Gabriel Fernandez wrote:
quoted hunk ↗ jump to hunk
In the clk_summary output, the h/w status of DivMux is incorrect (Parent and Enable status), since the clk_mux_ops.get_parent() returns -ERRCODE when clock is OFF. Signed-off-by: Pankaj Dev <redacted> Signed-off-by: Gabriel Fernandez <redacted> --- drivers/clk/st/clkgen-mux.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)diff --git a/drivers/clk/st/clkgen-mux.c b/drivers/clk/st/clkgen-mux.c index 4fbe6e0..c94b56b 100644 --- a/drivers/clk/st/clkgen-mux.c +++ b/drivers/clk/st/clkgen-mux.c@@ -128,7 +128,7 @@ static int clkgena_divmux_is_enabled(struct clk_hw *hw) __clk_hw_set_clk(mux_hw, hw); - return (s8)clk_mux_ops.get_parent(mux_hw) > 0; + return ((s8)clk_mux_ops.get_parent(mux_hw) >= 0);
Useless parentheses around it all, please drop.
quoted hunk ↗ jump to hunk
} static u8 clkgena_divmux_get_parent(struct clk_hw *hw)@@ -138,11 +138,13 @@ static u8 clkgena_divmux_get_parent(struct clk_hw *hw) __clk_hw_set_clk(mux_hw, hw); - genamux->muxsel = clk_mux_ops.get_parent(mux_hw); - if ((s8)genamux->muxsel < 0) { - pr_debug("%s: %s: Invalid parent, setting to default.\n", - __func__, __clk_get_name(hw->clk)); - genamux->muxsel = 0; + if (genamux->muxsel == CKGAX_CLKOPSRC_SWITCH_OFF) { + genamux->muxsel = clk_mux_ops.get_parent(mux_hw);
Hm.. maybe we should fix clk_mux_ops to return 0 if it can't find the parent? Or when this clock is registered we should read the hardware and set a default parent so that we can't get an error code here. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html