clk: qcom: gcc-msm8996: Disable halt check on UFS clocks

Message ID 20180524213735.12121-1-bjorn.andersson@linaro.org
State Accepted
Commit 12d807cd34b8620a531f7871979242834039a5dd
Headers show
Series
  • clk: qcom: gcc-msm8996: Disable halt check on UFS clocks
Related show

Commit Message

Bjorn Andersson May 24, 2018, 9:37 p.m.
The halt check of the UFS symbol clocks always fails, as such probing
UFS after clk_disable_unused always fails. This makes it impossible to
boot a system with the UFS phy or UFS HCD drivers compiled as modules.

Follow SDM845 and disable the halt check on these clocks.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

---
 drivers/clk/qcom/gcc-msm8996.c | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.17.0

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Stephen Boyd June 1, 2018, 7:22 p.m. | #1
Quoting Bjorn Andersson (2018-05-24 14:37:35)
> The halt check of the UFS symbol clocks always fails, as such probing

> UFS after clk_disable_unused always fails. This makes it impossible to

> boot a system with the UFS phy or UFS HCD drivers compiled as modules.

> 

> Follow SDM845 and disable the halt check on these clocks.

> 

> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

> ---


Applied to clk-next

--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/clk/qcom/gcc-msm8996.c b/drivers/clk/qcom/gcc-msm8996.c
index 3d6452932797..5f17080c5804 100644
--- a/drivers/clk/qcom/gcc-msm8996.c
+++ b/drivers/clk/qcom/gcc-msm8996.c
@@ -2792,6 +2792,7 @@  static struct clk_branch gcc_ufs_tx_symbol_0_clk = {
 
 static struct clk_branch gcc_ufs_rx_symbol_0_clk = {
 	.halt_reg = 0x7501c,
+	.halt_check = BRANCH_HALT_SKIP,
 	.clkr = {
 		.enable_reg = 0x7501c,
 		.enable_mask = BIT(0),
@@ -2807,6 +2808,7 @@  static struct clk_branch gcc_ufs_rx_symbol_0_clk = {
 
 static struct clk_branch gcc_ufs_rx_symbol_1_clk = {
 	.halt_reg = 0x75020,
+	.halt_check = BRANCH_HALT_SKIP,
 	.clkr = {
 		.enable_reg = 0x75020,
 		.enable_mask = BIT(0),