From f489c7adcf58c05fa5296b2b6234ac220f3a688b Mon Sep 17 00:00:00 2001 From: Mike Tipton Date: Fri, 7 Aug 2020 11:27:03 -0700 Subject: [PATCH] clk: qcom: gpucc-lahaina: Fix "stuck at on" warning The gpu_cc_hlos1_vote_gpu_smmu_clk clock is votable by multiple masters, so it won't always turn off when requested, since other masters can still be voting for it. Change its halt_check to BRANCH_HALT_VOTED to skip polling for it to turn off. Change-Id: I8c8a0160a0055b3462c76df3fdd3403e12352e53 Signed-off-by: Mike Tipton --- drivers/clk/qcom/gpucc-lahaina.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/qcom/gpucc-lahaina.c b/drivers/clk/qcom/gpucc-lahaina.c index bf8bc191a428..9a0924686222 100644 --- a/drivers/clk/qcom/gpucc-lahaina.c +++ b/drivers/clk/qcom/gpucc-lahaina.c @@ -476,7 +476,7 @@ static struct clk_branch gpu_cc_gx_vsense_clk = { static struct clk_branch gpu_cc_hlos1_vote_gpu_smmu_clk = { .halt_reg = 0x5000, - .halt_check = BRANCH_HALT, + .halt_check = BRANCH_HALT_VOTED, .clkr = { .enable_reg = 0x5000, .enable_mask = BIT(0),