From 3ab3624b68789e056aff2f0d9213da7d55f89fa2 Mon Sep 17 00:00:00 2001 From: Mike Tipton Date: Wed, 19 Feb 2020 16:08:19 -0800 Subject: [PATCH] clk: qcom: gpucc-lahaina: Remove CLK_IS_CRITICAL Currently a number of gpucc clocks are marked as CLK_IS_CRITICAL, which is not actually required. All of these can be voted dynamically by clients. Marking them as critical will block low power modes such as CX collapse and XO shutdown, since they source from local RCGs that source from local PLLs. Local PLLs don't have active-only versions, so any critical clocks parented to a local PLL will result in regulator and XO votes in both active/sleep sets. Remove the critical flag to unblock low power modes. Change-Id: I01f8fc23870afa0071d7848724f419550f5bd693 Signed-off-by: Mike Tipton --- drivers/clk/qcom/gpucc-lahaina.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/clk/qcom/gpucc-lahaina.c b/drivers/clk/qcom/gpucc-lahaina.c index bc1267aea73b..ee77a7061f80 100644 --- a/drivers/clk/qcom/gpucc-lahaina.c +++ b/drivers/clk/qcom/gpucc-lahaina.c @@ -249,7 +249,7 @@ static struct clk_branch gpu_cc_ahb_clk = { .hw = &gpu_cc_hub_ahb_div_clk_src.clkr.hw, }, .num_parents = 1, - .flags = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_ops, }, }, @@ -311,7 +311,7 @@ static struct clk_branch gpu_cc_cx_gmu_clk = { .hw = &gpu_cc_gmu_clk_src.clkr.hw, }, .num_parents = 1, - .flags = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_aon_ops, }, }, @@ -477,8 +477,8 @@ static struct clk_branch gpu_cc_hub_aon_clk = { .hw = &gpu_cc_hub_clk_src.clkr.hw, }, .num_parents = 1, - .flags = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT, - .ops = &clk_branch2_ops, + .flags = CLK_SET_RATE_PARENT, + .ops = &clk_branch2_aon_ops, }, }, }; @@ -495,7 +495,7 @@ static struct clk_branch gpu_cc_hub_cx_int_clk = { .hw = &gpu_cc_hub_cx_int_div_clk_src.clkr.hw, }, .num_parents = 1, - .flags = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT, + .flags = CLK_SET_RATE_PARENT, .ops = &clk_branch2_aon_ops, }, },