| Message ID | 20241114-b4-linux-next-master-24-11-14-titan-gdsc-v1-1-ef2533d487dc@linaro.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
| Series | clk: qcom: camcc-x1e80100: Set titan_top_gdsc as the parent GDSC of subordinate GDSCs | expand |
On 11/15/24 01:32, Bryan O'Donoghue wrote: > The Titan TOP GDSC is the parent GDSC for all other GDSCs in the CAMCC > block. None of the subordinate blocks will switch on without the parent > GDSC switched on. > > Fixes: 76126a5129b5 ("clk: qcom: Add camcc clock driver for x1e80100") > Cc: stable@vger.kernel.org > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > --- > drivers/clk/qcom/camcc-x1e80100.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/drivers/clk/qcom/camcc-x1e80100.c b/drivers/clk/qcom/camcc-x1e80100.c > index 85e76c7712ad84c88decb62ccaed68533d8848de..b73524ae64b1b2b1ee94ceca88b5f3b46143f20b 100644 > --- a/drivers/clk/qcom/camcc-x1e80100.c > +++ b/drivers/clk/qcom/camcc-x1e80100.c > @@ -2212,6 +2212,8 @@ static struct clk_branch cam_cc_sfe_0_fast_ahb_clk = { > }, > }; > > +static struct gdsc cam_cc_titan_top_gdsc; > + > static struct gdsc cam_cc_bps_gdsc = { > .gdscr = 0x10004, > .en_rest_wait_val = 0x2, > @@ -2221,6 +2223,7 @@ static struct gdsc cam_cc_bps_gdsc = { > .name = "cam_cc_bps_gdsc", > }, > .pwrsts = PWRSTS_OFF_ON, > + .parent = &cam_cc_titan_top_gdsc.pd, > .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, > }; > > @@ -2233,6 +2236,7 @@ static struct gdsc cam_cc_ife_0_gdsc = { > .name = "cam_cc_ife_0_gdsc", > }, > .pwrsts = PWRSTS_OFF_ON, > + .parent = &cam_cc_titan_top_gdsc.pd, > .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, > }; > > @@ -2245,6 +2249,7 @@ static struct gdsc cam_cc_ife_1_gdsc = { > .name = "cam_cc_ife_1_gdsc", > }, > .pwrsts = PWRSTS_OFF_ON, > + .parent = &cam_cc_titan_top_gdsc.pd, > .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, > }; > > @@ -2257,6 +2262,7 @@ static struct gdsc cam_cc_ipe_0_gdsc = { > .name = "cam_cc_ipe_0_gdsc", > }, > .pwrsts = PWRSTS_OFF_ON, > + .parent = &cam_cc_titan_top_gdsc.pd, > .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, > }; > > @@ -2269,6 +2275,7 @@ static struct gdsc cam_cc_sfe_0_gdsc = { > .name = "cam_cc_sfe_0_gdsc", > }, > .pwrsts = PWRSTS_OFF_ON, > + .parent = &cam_cc_titan_top_gdsc.pd, > .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, > }; > > Reviewed-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org> -- Best wishes, Vladimir
diff --git a/drivers/clk/qcom/camcc-x1e80100.c b/drivers/clk/qcom/camcc-x1e80100.c index 85e76c7712ad84c88decb62ccaed68533d8848de..b73524ae64b1b2b1ee94ceca88b5f3b46143f20b 100644 --- a/drivers/clk/qcom/camcc-x1e80100.c +++ b/drivers/clk/qcom/camcc-x1e80100.c @@ -2212,6 +2212,8 @@ static struct clk_branch cam_cc_sfe_0_fast_ahb_clk = { }, }; +static struct gdsc cam_cc_titan_top_gdsc; + static struct gdsc cam_cc_bps_gdsc = { .gdscr = 0x10004, .en_rest_wait_val = 0x2, @@ -2221,6 +2223,7 @@ static struct gdsc cam_cc_bps_gdsc = { .name = "cam_cc_bps_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .parent = &cam_cc_titan_top_gdsc.pd, .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; @@ -2233,6 +2236,7 @@ static struct gdsc cam_cc_ife_0_gdsc = { .name = "cam_cc_ife_0_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .parent = &cam_cc_titan_top_gdsc.pd, .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; @@ -2245,6 +2249,7 @@ static struct gdsc cam_cc_ife_1_gdsc = { .name = "cam_cc_ife_1_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .parent = &cam_cc_titan_top_gdsc.pd, .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; @@ -2257,6 +2262,7 @@ static struct gdsc cam_cc_ipe_0_gdsc = { .name = "cam_cc_ipe_0_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .parent = &cam_cc_titan_top_gdsc.pd, .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, }; @@ -2269,6 +2275,7 @@ static struct gdsc cam_cc_sfe_0_gdsc = { .name = "cam_cc_sfe_0_gdsc", }, .pwrsts = PWRSTS_OFF_ON, + .parent = &cam_cc_titan_top_gdsc.pd, .flags = POLL_CFG_GDSCR | RETAIN_FF_ENABLE, };
The Titan TOP GDSC is the parent GDSC for all other GDSCs in the CAMCC block. None of the subordinate blocks will switch on without the parent GDSC switched on. Fixes: 76126a5129b5 ("clk: qcom: Add camcc clock driver for x1e80100") Cc: stable@vger.kernel.org Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- drivers/clk/qcom/camcc-x1e80100.c | 7 +++++++ 1 file changed, 7 insertions(+) --- base-commit: 37c5695cb37a20403947062be8cb7e00f6bed353 change-id: 20241114-b4-linux-next-master-24-11-14-titan-gdsc-4d31c101d0a1 Best regards,