| Message ID | 20230622-topic-8998clk-v1-6-5b7a0d6e98b1@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | MSM8998 clk cleanups and fixups | expand |
On 22.06.2023 13:57, Konrad Dybcio wrote: > Some branch clocks are governed externally and we're only supposed to > send a request concerning their shutdown, not actually ensure it happens. > > Use the BRANCH_HALT_SKIP define to skip checking the halt bit. > > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> > --- Whoops. Again, right after hitting send, I noticed this one was already sent with https://lore.kernel.org/linux-arm-msm/20230531-topic-8998_mmssclk-v1-0-2b5a8fc90991@linaro.org/ > drivers/clk/qcom/gcc-msm8998.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c > index cccb19cae481..ef410f52f09f 100644 > --- a/drivers/clk/qcom/gcc-msm8998.c > +++ b/drivers/clk/qcom/gcc-msm8998.c > @@ -2112,7 +2112,7 @@ static struct clk_branch gcc_gp3_clk = { > > static struct clk_branch gcc_bimc_gfx_clk = { > .halt_reg = 0x46040, > - .halt_check = BRANCH_HALT, > + .halt_check = BRANCH_HALT_SKIP, > .clkr = { > .enable_reg = 0x46040, > .enable_mask = BIT(0), > @@ -2125,7 +2125,7 @@ static struct clk_branch gcc_bimc_gfx_clk = { > > static struct clk_branch gcc_gpu_bimc_gfx_clk = { > .halt_reg = 0x71010, > - .halt_check = BRANCH_HALT, > + .halt_check = BRANCH_HALT_SKIP, > .clkr = { > .enable_reg = 0x71010, > .enable_mask = BIT(0), > @@ -2151,7 +2151,7 @@ static struct clk_branch gcc_gpu_bimc_gfx_src_clk = { > > static struct clk_branch gcc_gpu_cfg_ahb_clk = { > .halt_reg = 0x71004, > - .halt_check = BRANCH_HALT, > + .halt_check = BRANCH_HALT_SKIP, > .clkr = { > .enable_reg = 0x71004, > .enable_mask = BIT(0), >
diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c index cccb19cae481..ef410f52f09f 100644 --- a/drivers/clk/qcom/gcc-msm8998.c +++ b/drivers/clk/qcom/gcc-msm8998.c @@ -2112,7 +2112,7 @@ static struct clk_branch gcc_gp3_clk = { static struct clk_branch gcc_bimc_gfx_clk = { .halt_reg = 0x46040, - .halt_check = BRANCH_HALT, + .halt_check = BRANCH_HALT_SKIP, .clkr = { .enable_reg = 0x46040, .enable_mask = BIT(0), @@ -2125,7 +2125,7 @@ static struct clk_branch gcc_bimc_gfx_clk = { static struct clk_branch gcc_gpu_bimc_gfx_clk = { .halt_reg = 0x71010, - .halt_check = BRANCH_HALT, + .halt_check = BRANCH_HALT_SKIP, .clkr = { .enable_reg = 0x71010, .enable_mask = BIT(0), @@ -2151,7 +2151,7 @@ static struct clk_branch gcc_gpu_bimc_gfx_src_clk = { static struct clk_branch gcc_gpu_cfg_ahb_clk = { .halt_reg = 0x71004, - .halt_check = BRANCH_HALT, + .halt_check = BRANCH_HALT_SKIP, .clkr = { .enable_reg = 0x71004, .enable_mask = BIT(0),
Some branch clocks are governed externally and we're only supposed to send a request concerning their shutdown, not actually ensure it happens. Use the BRANCH_HALT_SKIP define to skip checking the halt bit. Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> --- drivers/clk/qcom/gcc-msm8998.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)