Skip to content

Commit bf0a800

Browse files
Qiang Yuandersson
authored andcommitted
clk: qcom: gcc-x1e80100: Fix halt_check for pipediv2 clocks
The pipediv2_clk's source from the same mux as pipe clock. So they have same limitation, which is that the PHY sequence requires to enable these local CBCs before the PHY is actually outputting a clock to them. This means the clock won't actually turn on when we vote them. Hence, let's skip the halt bit check of the pipediv2_clk, otherwise pipediv2_clk may stuck at off state during bootup. Cc: stable@vger.kernel.org Fixes: 161b7c4 ("clk: qcom: Add Global Clock controller (GCC) driver for X1E80100") Suggested-by: Mike Tipton <quic_mdtipton@quicinc.com> Signed-off-by: Qiang Yu <quic_qianyu@quicinc.com> Reviewed-by: Konrad Dybcio <konradybcio@kernel.org> Reviewed-by: Johan Hovold <johan+linaro@kernel.org> Link: https://lore.kernel.org/r/20241011104142.1181773-6-quic_qianyu@quicinc.com Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent e02bfea commit bf0a800

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/clk/qcom/gcc-x1e80100.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3123,7 +3123,7 @@ static struct clk_branch gcc_pcie_3_pipe_clk = {
31233123

31243124
static struct clk_branch gcc_pcie_3_pipediv2_clk = {
31253125
.halt_reg = 0x58060,
3126-
.halt_check = BRANCH_HALT_VOTED,
3126+
.halt_check = BRANCH_HALT_SKIP,
31273127
.clkr = {
31283128
.enable_reg = 0x52020,
31293129
.enable_mask = BIT(5),
@@ -3248,7 +3248,7 @@ static struct clk_branch gcc_pcie_4_pipe_clk = {
32483248

32493249
static struct clk_branch gcc_pcie_4_pipediv2_clk = {
32503250
.halt_reg = 0x6b054,
3251-
.halt_check = BRANCH_HALT_VOTED,
3251+
.halt_check = BRANCH_HALT_SKIP,
32523252
.clkr = {
32533253
.enable_reg = 0x52010,
32543254
.enable_mask = BIT(27),
@@ -3373,7 +3373,7 @@ static struct clk_branch gcc_pcie_5_pipe_clk = {
33733373

33743374
static struct clk_branch gcc_pcie_5_pipediv2_clk = {
33753375
.halt_reg = 0x2f054,
3376-
.halt_check = BRANCH_HALT_VOTED,
3376+
.halt_check = BRANCH_HALT_SKIP,
33773377
.clkr = {
33783378
.enable_reg = 0x52018,
33793379
.enable_mask = BIT(19),
@@ -3511,7 +3511,7 @@ static struct clk_branch gcc_pcie_6a_pipe_clk = {
35113511

35123512
static struct clk_branch gcc_pcie_6a_pipediv2_clk = {
35133513
.halt_reg = 0x31060,
3514-
.halt_check = BRANCH_HALT_VOTED,
3514+
.halt_check = BRANCH_HALT_SKIP,
35153515
.clkr = {
35163516
.enable_reg = 0x52018,
35173517
.enable_mask = BIT(28),
@@ -3649,7 +3649,7 @@ static struct clk_branch gcc_pcie_6b_pipe_clk = {
36493649

36503650
static struct clk_branch gcc_pcie_6b_pipediv2_clk = {
36513651
.halt_reg = 0x8d060,
3652-
.halt_check = BRANCH_HALT_VOTED,
3652+
.halt_check = BRANCH_HALT_SKIP,
36533653
.clkr = {
36543654
.enable_reg = 0x52010,
36553655
.enable_mask = BIT(28),

0 commit comments

Comments
 (0)