summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Hugo <jhugo@codeaurora.org>2019-01-04 19:50:15 +0300
committerStephen Boyd <sboyd@kernel.org>2019-01-09 21:57:29 +0300
commit5f2420ed218981f037910bd029c19ff35ad1839c (patch)
tree764de286cdc89ff612003541478041fa9c8c7902
parent0c8ff62504e3a667387e87889a259632c3199a86 (diff)
downloadlinux-5f2420ed218981f037910bd029c19ff35ad1839c.tar.xz
clk: qcom: Skip halt checks on gcc_usb3_phy_pipe_clk for 8998
The gcc_usb3_phy_pipe_clk is generated by the phy, but is also used by the phy during init. The clock needs to be enabled during the init sequence, but may not be fully active until after the init sequence is complete. This causes a catch-22 if the clock status is checked during enable. As a result, skip the checks to avoid the troubling situation. Signed-off-by: Jeffrey Hugo <jhugo@codeaurora.org> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-rw-r--r--drivers/clk/qcom/gcc-msm8998.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c
index 96cf00c425a8..3cbabbb8bd9a 100644
--- a/drivers/clk/qcom/gcc-msm8998.c
+++ b/drivers/clk/qcom/gcc-msm8998.c
@@ -2544,7 +2544,7 @@ static struct clk_branch gcc_usb3_phy_aux_clk = {
static struct clk_branch gcc_usb3_phy_pipe_clk = {
.halt_reg = 0x50004,
- .halt_check = BRANCH_HALT,
+ .halt_check = BRANCH_HALT_SKIP,
.clkr = {
.enable_reg = 0x50004,
.enable_mask = BIT(0),