Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 253c617e authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Greg Kroah-Hartman
Browse files

clk: qcom: gcc-msm8998: Disable halt check of UFS clocks 



[ Upstream commit 2abf856202fd3e4883e4c518acaa9a023b0dbe54 ]

Drop the halt check of the UFS symbol clocks, in accordance with other
platforms. This makes clk_disable_unused() happy and makes it possible
to turn the clocks on again without an error.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b6f4e1ca

drivers/clk/qcom/gcc-msm8998.c

+3 −3
Original line number Diff line number Diff line
@@ -2402,7 +2402,7 @@ static struct clk_branch gcc_ufs_phy_aux_clk = { 


static struct clk_branch gcc_ufs_rx_symbol_0_clk = {

	.halt_reg = 0x75014,

	.halt_check = BRANCH_HALT,

	.halt_check = BRANCH_HALT_SKIP,

	.clkr = {

		.enable_reg = 0x75014,

		.enable_mask = BIT(0),
@@ -2415,7 +2415,7 @@ static struct clk_branch gcc_ufs_rx_symbol_0_clk = { 


static struct clk_branch gcc_ufs_rx_symbol_1_clk = {

	.halt_reg = 0x7605c,

	.halt_check = BRANCH_HALT,

	.halt_check = BRANCH_HALT_SKIP,

	.clkr = {

		.enable_reg = 0x7605c,

		.enable_mask = BIT(0),
@@ -2428,7 +2428,7 @@ static struct clk_branch gcc_ufs_rx_symbol_1_clk = { 


static struct clk_branch gcc_ufs_tx_symbol_0_clk = {

	.halt_reg = 0x75010,

	.halt_check = BRANCH_HALT,

	.halt_check = BRANCH_HALT_SKIP,

	.clkr = {

		.enable_reg = 0x75010,

		.enable_mask = BIT(0),