| Message ID | 20240311-linux-next-camcc-fixes-v1-2-d126ae0b9350@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | qcom: clk: camcc: Fix power-domain definitions on x1e80100 | expand |
On 3/11/2024 6:03 AM, 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") > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Acked-by: Rajendra Nayak <quic_rjendra@quicinc.com> > --- > 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 46bb225906bff..d421da57697a2 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, > }; > >
On 3/11/24 01:33, 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") > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad
diff --git a/drivers/clk/qcom/camcc-x1e80100.c b/drivers/clk/qcom/camcc-x1e80100.c index 46bb225906bff..d421da57697a2 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") Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- drivers/clk/qcom/camcc-x1e80100.c | 7 +++++++ 1 file changed, 7 insertions(+)