| Message ID | 20210119113851.18946-1-srinivas.kandagatla@linaro.org |
|---|---|
| State | Accepted |
| Commit | 78ddb79cab178534b2c1d9ab95823f2af882ee8e |
| Headers | show |
| Series | clk: qcom: gfm-mux: fix clk mask | expand |
Quoting Srinivas Kandagatla (2021-01-19 03:38:51) > For some reason global GFM_MASK ended up with bit 1 instead of bit 0. > Remove the global GFM_MASK and reuse mux_mask field. > > Fixes: a2d8f507803e ("clk: qcom: Add support to LPASS AUDIO_CC Glitch Free Mux clocks") > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- Applied to clk-next
Hello: This patch was applied to qcom/linux.git (refs/heads/for-next): On Tue, 19 Jan 2021 11:38:51 +0000 you wrote: > For some reason global GFM_MASK ended up with bit 1 instead of bit 0. > Remove the global GFM_MASK and reuse mux_mask field. > > Fixes: a2d8f507803e ("clk: qcom: Add support to LPASS AUDIO_CC Glitch Free Mux clocks") > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > drivers/clk/qcom/lpass-gfm-sm8250.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Here is the summary with links: - clk: qcom: gfm-mux: fix clk mask https://git.kernel.org/qcom/c/78ddb79cab17 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/clk/qcom/lpass-gfm-sm8250.c b/drivers/clk/qcom/lpass-gfm-sm8250.c index d366c7c2abc7..f5e31e692b9b 100644 --- a/drivers/clk/qcom/lpass-gfm-sm8250.c +++ b/drivers/clk/qcom/lpass-gfm-sm8250.c @@ -33,14 +33,13 @@ struct clk_gfm { void __iomem *gfm_mux; }; -#define GFM_MASK BIT(1) #define to_clk_gfm(_hw) container_of(_hw, struct clk_gfm, hw) static u8 clk_gfm_get_parent(struct clk_hw *hw) { struct clk_gfm *clk = to_clk_gfm(hw); - return readl(clk->gfm_mux) & GFM_MASK; + return readl(clk->gfm_mux) & clk->mux_mask; } static int clk_gfm_set_parent(struct clk_hw *hw, u8 index) @@ -51,9 +50,10 @@ static int clk_gfm_set_parent(struct clk_hw *hw, u8 index) val = readl(clk->gfm_mux); if (index) - val |= GFM_MASK; + val |= clk->mux_mask; else - val &= ~GFM_MASK; + val &= ~clk->mux_mask; + writel(val, clk->gfm_mux);
For some reason global GFM_MASK ended up with bit 1 instead of bit 0. Remove the global GFM_MASK and reuse mux_mask field. Fixes: a2d8f507803e ("clk: qcom: Add support to LPASS AUDIO_CC Glitch Free Mux clocks") Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- drivers/clk/qcom/lpass-gfm-sm8250.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.21.0