clk: imx: clk-composite-8m: add lock to gate/mux (073a01e8) · Commits · 戴 / test

There is a lock to divider in the composite driver, but that's not enough. lock to gate/mux are also needed to provide exclusive access to the register. Fixes: ("clk: imx: Add imx composite clock") Signed-off-by:

Peng Fan <peng.fan@nxp.com> Cc: <stable@vger.kernel.org> Signed-off-by:

Shawn Guo <shawnguo@kernel.org>

drivers/clk/imx/clk-composite-8m.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,7 @@ struct clk imx8m_clk_composite_flags(const char name,
		mux->reg = reg;
		mux->shift = PCG_PCS_SHIFT;
		mux->mask = PCG_PCS_MASK;
		mux->lock = &imx_ccm_lock;

		div = kzalloc(sizeof(*div), GFP_KERNEL);
		if (!div)
		@@ -161,6 +162,7 @@ struct clk imx8m_clk_composite_flags(const char name,
		gate_hw = &gate->hw;
		gate->reg = reg;
		gate->bit_idx = PCG_CGC_SHIFT;
		gate->lock = &imx_ccm_lock;

		hw = clk_hw_register_composite(NULL, name, parent_names, num_parents,
		mux_hw, &clk_mux_ops, div_hw,

Admin message