aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@linaro.org>2018-05-24 17:37:35 -0400
committerStephen Boyd <sboyd@kernel.org>2018-06-01 15:22:06 -0400
commit12d807cd34b8620a531f7871979242834039a5dd (patch)
treeb2f576f3a4272484055039b0f3b19bbbb4c9192b
parent096abdc296f1a4b36c4429934f8c218e0baca815 (diff)
clk: qcom: gcc-msm8996: Disable halt check on UFS clocks
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> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
-rw-r--r--drivers/clk/qcom/gcc-msm8996.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/qcom/gcc-msm8996.c b/drivers/clk/qcom/gcc-msm8996.c
index 8ff24b228f9b..aafcc2dd0b4b 100644
--- a/drivers/clk/qcom/gcc-msm8996.c
+++ b/drivers/clk/qcom/gcc-msm8996.c
@@ -2796,6 +2796,7 @@ static struct clk_branch gcc_ufs_tx_symbol_0_clk = {
2796 2796
2797static struct clk_branch gcc_ufs_rx_symbol_0_clk = { 2797static struct clk_branch gcc_ufs_rx_symbol_0_clk = {
2798 .halt_reg = 0x7501c, 2798 .halt_reg = 0x7501c,
2799 .halt_check = BRANCH_HALT_SKIP,
2799 .clkr = { 2800 .clkr = {
2800 .enable_reg = 0x7501c, 2801 .enable_reg = 0x7501c,
2801 .enable_mask = BIT(0), 2802 .enable_mask = BIT(0),
@@ -2811,6 +2812,7 @@ static struct clk_branch gcc_ufs_rx_symbol_0_clk = {
2811 2812
2812static struct clk_branch gcc_ufs_rx_symbol_1_clk = { 2813static struct clk_branch gcc_ufs_rx_symbol_1_clk = {
2813 .halt_reg = 0x75020, 2814 .halt_reg = 0x75020,
2815 .halt_check = BRANCH_HALT_SKIP,
2814 .clkr = { 2816 .clkr = {
2815 .enable_reg = 0x75020, 2817 .enable_reg = 0x75020,
2816 .enable_mask = BIT(0), 2818 .enable_mask = BIT(0),