From ff80a9c821adf7be00b3539747f60c2daa5fd83d Mon Sep 17 00:00:00 2001 From: Mike Tipton Date: Mon, 25 Nov 2019 11:38:14 -0800 Subject: [PATCH] clk: qcom: dispcc: Fix stuck on warning for disp_cc_mdss_mdp_lut_clk Fix the "status stuck at on" warning when disabling disp_cc_mdss_mdp_lut_clk. The enable bit for this clock doesn't actually do anything and instead the enable signal is tied to the enable bit of disp_cc_mdss_mdp_clk. Even though this clock isn't truly votable, use BRANCH_HALT_VOTED to ensure that the client enables disp_cc_mdss_mdp_clk before this one and that we don't throw a warning on the disable path when the clock doesn't actually turn off yet. Change-Id: Iac4a5f5480faaa0c182202c03bbf29c5cabcb7e6 Signed-off-by: Mike Tipton --- drivers/clk/qcom/dispcc-lahaina.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/qcom/dispcc-lahaina.c b/drivers/clk/qcom/dispcc-lahaina.c index 6c144bc5242a..653317a36c4c 100644 --- a/drivers/clk/qcom/dispcc-lahaina.c +++ b/drivers/clk/qcom/dispcc-lahaina.c @@ -1081,7 +1081,7 @@ static struct clk_branch disp_cc_mdss_mdp_clk = { static struct clk_branch disp_cc_mdss_mdp_lut_clk = { .halt_reg = 0x201c, - .halt_check = BRANCH_HALT, + .halt_check = BRANCH_HALT_VOTED, .clkr = { .enable_reg = 0x201c, .enable_mask = BIT(0),