Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cfb3120 authored by Ansuel Smith's avatar Ansuel Smith Committed by Greg Kroah-Hartman
Browse files

clk: qcom: clk-krait: unlock spin after mux completion 



[ Upstream commit df83d2c9e72910416f650ade1e07cc314ff02731 ]

Unlock spinlock after the mux switch is completed to prevent any corner
case of mux request while the switch still needs to be done.

Fixes: 4d7dc77b ("clk: qcom: Add support for Krait clocks")
Signed-off-by: default avatarAnsuel Smith <ansuelsmth@gmail.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220430054458.31321-3-ansuelsmth@gmail.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 8191b6cd

drivers/clk/qcom/clk-krait.c

+6 −1
Original line number Diff line number Diff line
@@ -32,11 +32,16 @@ static void __krait_mux_set_sel(struct krait_mux_clk *mux, int sel) 
		regval |= (sel & mux->mask) << (mux->shift + LPL_SHIFT);

	}

	krait_set_l2_indirect_reg(mux->offset, regval);

	spin_unlock_irqrestore(&krait_clock_reg_lock, flags);



	/* Wait for switch to complete. */

	mb();

	udelay(1);



	/*

	 * Unlock now to make sure the mux register is not

	 * modified while switching to the new parent.

	 */

	spin_unlock_irqrestore(&krait_clock_reg_lock, flags);

}



static int krait_mux_set_parent(struct clk_hw *hw, u8 index)