clk: qcom: sc8180x: PM-related fixes (and refactoring)

[PATCH v2 09/11] clk: qcom: camcc-sc8180x: Remove wait_val for Titan GDSC

Posted by Val Packett 3 weeks, 5 days ago

These values seem to have been copied from newer SoCs, but e.g. SC7180
and SDM845 do not use them. They seem to play a role in causing the
"titan_top_gdsc stuck at off" errors on boot on the Surface Pro X.

Remove to fix.

Fixes: 691f3413baa4 ("clk: qcom: camcc-sc8180x: Add SC8180X camera clock controller driver")
Signed-off-by: Val Packett <val@packett.cool>
---
 drivers/clk/qcom/camcc-sc8180x.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/clk/qcom/camcc-sc8180x.c b/drivers/clk/qcom/camcc-sc8180x.c
index 388fedf1dc81..cd4c40a81c28 100644
--- a/drivers/clk/qcom/camcc-sc8180x.c
+++ b/drivers/clk/qcom/camcc-sc8180x.c
@@ -2538,9 +2538,6 @@ static struct clk_branch cam_cc_mclk7_clk = {
 
 static struct gdsc titan_top_gdsc = {
 	.gdscr = 0xc1bc,
-	.en_rest_wait_val = 0x2,
-	.en_few_wait_val = 0x2,
-	.clk_dis_wait_val = 0xf,
 	.pd = {
 		.name = "titan_top_gdsc",
 	},
-- 
2.52.0

Re: [PATCH v2 09/11] clk: qcom: camcc-sc8180x: Remove wait_val for Titan GDSC

Posted by Konrad Dybcio 3 weeks, 4 days ago

On 3/12/26 12:12 PM, Val Packett wrote:
> These values seem to have been copied from newer SoCs, but e.g. SC7180
> and SDM845 do not use them. They seem to play a role in causing the
> "titan_top_gdsc stuck at off" errors on boot on the Surface Pro X.
> 
> Remove to fix.
> 
> Fixes: 691f3413baa4 ("clk: qcom: camcc-sc8180x: Add SC8180X camera clock controller driver")
> Signed-off-by: Val Packett <val@packett.cool>
> ---
>  drivers/clk/qcom/camcc-sc8180x.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/clk/qcom/camcc-sc8180x.c b/drivers/clk/qcom/camcc-sc8180x.c
> index 388fedf1dc81..cd4c40a81c28 100644
> --- a/drivers/clk/qcom/camcc-sc8180x.c
> +++ b/drivers/clk/qcom/camcc-sc8180x.c
> @@ -2538,9 +2538,6 @@ static struct clk_branch cam_cc_mclk7_clk = {
>  
>  static struct gdsc titan_top_gdsc = {
>  	.gdscr = 0xc1bc,
> -	.en_rest_wait_val = 0x2,
> -	.en_few_wait_val = 0x2,
> -	.clk_dis_wait_val = 0xf,

Those are the 'correct' / on-reset values which if absent, are going to
be overriden by the driver, with values destined for MSM8974, so please
drop this one

Konrad

Re: [PATCH v2 09/11] clk: qcom: camcc-sc8180x: Remove wait_val for Titan GDSC

Posted by Dmitry Baryshkov 3 weeks, 4 days ago

On Fri, Mar 13, 2026 at 11:50:03AM +0100, Konrad Dybcio wrote:
> On 3/12/26 12:12 PM, Val Packett wrote:
> > These values seem to have been copied from newer SoCs, but e.g. SC7180
> > and SDM845 do not use them. They seem to play a role in causing the
> > "titan_top_gdsc stuck at off" errors on boot on the Surface Pro X.
> > 
> > Remove to fix.
> > 
> > Fixes: 691f3413baa4 ("clk: qcom: camcc-sc8180x: Add SC8180X camera clock controller driver")
> > Signed-off-by: Val Packett <val@packett.cool>
> > ---
> >  drivers/clk/qcom/camcc-sc8180x.c | 3 ---
> >  1 file changed, 3 deletions(-)
> > 
> > diff --git a/drivers/clk/qcom/camcc-sc8180x.c b/drivers/clk/qcom/camcc-sc8180x.c
> > index 388fedf1dc81..cd4c40a81c28 100644
> > --- a/drivers/clk/qcom/camcc-sc8180x.c
> > +++ b/drivers/clk/qcom/camcc-sc8180x.c
> > @@ -2538,9 +2538,6 @@ static struct clk_branch cam_cc_mclk7_clk = {
> >  
> >  static struct gdsc titan_top_gdsc = {
> >  	.gdscr = 0xc1bc,
> > -	.en_rest_wait_val = 0x2,
> > -	.en_few_wait_val = 0x2,
> > -	.clk_dis_wait_val = 0xf,
> 
> Those are the 'correct' / on-reset values which if absent, are going to
> be overriden by the driver, with values destined for MSM8974, so please
> drop this one

Probably we should fix the drivers to stop showing in MSM8974 values...

-- 
With best wishes
Dmitry