Skip to content

Commit dd6456e

Browse files
lumagandersson
authored andcommitted
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: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Johan Hovold <johan+linaro@kernel.org> Tested-by: Reviewed-by: Johan Hovold <johan+linaro@kernel.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Link: https://lore.kernel.org/r/20220521005343.1429642-2-dmitry.baryshkov@linaro.org
1 parent 703db1f commit dd6456e

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/clk/qcom/gcc-sm8450.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,14 +243,13 @@ static struct clk_regmap_mux gcc_pcie_0_pipe_clk_src = {
243243
.reg = 0x7b060,
244244
.shift = 0,
245245
.width = 2,
246-
.safe_src_parent = P_BI_TCXO,
247246
.parent_map = gcc_parent_map_4,
248247
.clkr = {
249248
.hw.init = &(struct clk_init_data){
250249
.name = "gcc_pcie_0_pipe_clk_src",
251250
.parent_data = gcc_parent_data_4,
252251
.num_parents = ARRAY_SIZE(gcc_parent_data_4),
253-
.ops = &clk_regmap_mux_safe_ops,
252+
.ops = &clk_regmap_mux_closest_ops,
254253
},
255254
},
256255
};
@@ -274,14 +273,13 @@ static struct clk_regmap_mux gcc_pcie_1_pipe_clk_src = {
274273
.reg = 0x9d064,
275274
.shift = 0,
276275
.width = 2,
277-
.safe_src_parent = P_BI_TCXO,
278276
.parent_map = gcc_parent_map_6,
279277
.clkr = {
280278
.hw.init = &(struct clk_init_data){
281279
.name = "gcc_pcie_1_pipe_clk_src",
282280
.parent_data = gcc_parent_data_6,
283281
.num_parents = ARRAY_SIZE(gcc_parent_data_6),
284-
.ops = &clk_regmap_mux_safe_ops,
282+
.ops = &clk_regmap_mux_closest_ops,
285283
},
286284
},
287285
};

0 commit comments

Comments
 (0)