Skip to content

Commit 720e14f

Browse files
lumagandersson
authored andcommitted
Revert "clk: qcom: gcc-sc7280: 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-sc7280 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-3-dmitry.baryshkov@linaro.org
1 parent dd6456e commit 720e14f

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/clk/qcom/gcc-sc7280.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,14 +373,13 @@ static struct clk_regmap_mux gcc_pcie_0_pipe_clk_src = {
373373
.reg = 0x6b054,
374374
.shift = 0,
375375
.width = 2,
376-
.safe_src_parent = P_BI_TCXO,
377376
.parent_map = gcc_parent_map_6,
378377
.clkr = {
379378
.hw.init = &(struct clk_init_data){
380379
.name = "gcc_pcie_0_pipe_clk_src",
381380
.parent_data = gcc_parent_data_6,
382381
.num_parents = ARRAY_SIZE(gcc_parent_data_6),
383-
.ops = &clk_regmap_mux_safe_ops,
382+
.ops = &clk_regmap_mux_closest_ops,
384383
},
385384
},
386385
};
@@ -389,14 +388,13 @@ static struct clk_regmap_mux gcc_pcie_1_pipe_clk_src = {
389388
.reg = 0x8d054,
390389
.shift = 0,
391390
.width = 2,
392-
.safe_src_parent = P_BI_TCXO,
393391
.parent_map = gcc_parent_map_7,
394392
.clkr = {
395393
.hw.init = &(struct clk_init_data){
396394
.name = "gcc_pcie_1_pipe_clk_src",
397395
.parent_data = gcc_parent_data_7,
398396
.num_parents = ARRAY_SIZE(gcc_parent_data_7),
399-
.ops = &clk_regmap_mux_safe_ops,
397+
.ops = &clk_regmap_mux_closest_ops,
400398
},
401399
},
402400
};

0 commit comments

Comments
 (0)