Commit dd6456e6 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Andersson
Browse files

Revert "clk: qcom: gcc-sm8450: use new clk_regmap_mux_safe_ops for PCIe pipe clocks" 



Johan Hovold has pointed out that there are several deficiencies and a
race condition in the regmap_mux_safe ops that were merged. Revert the
commit that switches gcc-sm8450 driver to use regmap_mux_safe.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Tested-by: default avatarReviewed-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220521005343.1429642-2-dmitry.baryshkov@linaro.org
parent 703db1f5

drivers/clk/qcom/gcc-sm8450.c

+2 −4
Original line number Diff line number Diff line
@@ -243,14 +243,13 @@ static struct clk_regmap_mux gcc_pcie_0_pipe_clk_src = { 
	.reg = 0x7b060,

	.shift = 0,

	.width = 2,

	.safe_src_parent = P_BI_TCXO,

	.parent_map = gcc_parent_map_4,

	.clkr = {

		.hw.init = &(struct clk_init_data){

			.name = "gcc_pcie_0_pipe_clk_src",

			.parent_data = gcc_parent_data_4,

			.num_parents = ARRAY_SIZE(gcc_parent_data_4),

			.ops = &clk_regmap_mux_safe_ops,

			.ops = &clk_regmap_mux_closest_ops,

		},

	},

};
@@ -274,14 +273,13 @@ static struct clk_regmap_mux gcc_pcie_1_pipe_clk_src = { 
	.reg = 0x9d064,

	.shift = 0,

	.width = 2,

	.safe_src_parent = P_BI_TCXO,

	.parent_map = gcc_parent_map_6,

	.clkr = {

		.hw.init = &(struct clk_init_data){

			.name = "gcc_pcie_1_pipe_clk_src",

			.parent_data = gcc_parent_data_6,

			.num_parents = ARRAY_SIZE(gcc_parent_data_6),

			.ops = &clk_regmap_mux_safe_ops,

			.ops = &clk_regmap_mux_closest_ops,

		},

	},

};