clk: qcom: sm8450: Fix eUSB clkref and camera clock collapse
Subsystems (3)
v2 cover clk: qcom: sm8450: Fix eUSB clkref and camera clock collapse
These fix three clock problems found bringing up mainline on an SM8475 phone (Nothing Phone (2)): the eUSB2 PHY reference clock reads 0 Hz so USB never probes, and the camera GDSCs lose register state and leave RCGs running across power collapse.
Changes in v2:
- Use my full name in From and Signed-off-by.
Sushmit Singh Rathore (3):
clk: qcom: gcc-sm8450: Parent the eUSB3 clkref to bi_tcxo
clk: qcom: camcc-sm8450: Retain flops across camera GDSC collapse
clk: qcom: camcc-sm8450: Park the camera RCGs when they are disabled
drivers/clk/qcom/camcc-sm8450.c | 113 ++++++++++++++++++++------------ drivers/clk/qcom/gcc-sm8450.c | 4 ++ 2 files changed, 74 insertions(+), 43 deletions(-)
Signature · 1 line
2.43.0
PATCH v2 1/3 clk: qcom: gcc-sm8450: Parent the eUSB3 clkref to bi_tcxo
gcc_eusb3_0_clkref_en gates the XO reference to the eUSB2 PHY, but it has no parent, so its rate reads as 0. On SM8475 the SNPS eUSB2 PHY takes this clock as its reference and rejects a 0 Hz rate as unsupported, so USB doesn't probe.
Parent it to bi_tcxo, as tcsrcc-sm8550 does for its clkref branches.
---
Changes in v2:
- Use full name in From and Signed-off-by.
drivers/clk/qcom/gcc-sm8450.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/clk/qcom/gcc-sm8450.c +4 -0
@@ -1500,6 +1500,10 @@ static struct clk_branch gcc_eusb3_0_clkref_en = { .enable_mask = BIT(0), .hw.init = &(struct clk_init_data ){ .name ="gcc_eusb3_0_clkref_en" , + .parent_data = &(const struct clk_parent_data ){ + .fw_name ="bi_tcxo" , + }, + .num_parents =1 , .ops = &clk_branch2_ops, }, },
Signature · 1 line
2.43.0
PATCH v2 2/3 clk: qcom: camcc-sm8450: Retain flops across camera GDSC collapse
In reply to Sushmit Singh RathoreThe camera GDSCs are collapsed between camera sessions. Without flop retention and with the default clock-disable wait, the IFE GDSC can stay stuck off when it is powered up for the next session.
Program the same wait values and set RETAIN_FF_ENABLE as camcc-sm8550 and the downstream camera clock controller driver do for these GDSCs.
Tested on the Nothing Phone (2) (SM8475) by running repeated camera sessions.
---
Changes in v2:
- Use full name in From and Signed-off-by.
drivers/clk/qcom/camcc-sm8450.c | 45 ++++++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 9 deletions(-)
drivers/clk/qcom/camcc-sm8450.c +36 -9
@@ -2930,90 +2930,117 @@ static struct gdsc titan_top_gdsc;static struct gdsc bps_gdsc = { .gdscr =0x10004 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="bps_gdsc" , }, - .flags =HW_CTRL |POLL_CFG_GDSCR , + .flags =HW_CTRL |POLL_CFG_GDSCR |RETAIN_FF_ENABLE , .parent = &titan_top_gdsc.pd, .pwrsts =PWRSTS_OFF_ON , };static struct gdsc ipe_0_gdsc = { .gdscr =0x10078 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="ipe_0_gdsc" , }, - .flags =HW_CTRL |POLL_CFG_GDSCR , + .flags =HW_CTRL |POLL_CFG_GDSCR |RETAIN_FF_ENABLE , .parent = &titan_top_gdsc.pd, .pwrsts =PWRSTS_OFF_ON , };static struct gdsc sbi_gdsc = { .gdscr =0x100d0 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="sbi_gdsc" , }, - .flags =POLL_CFG_GDSCR , + .flags =POLL_CFG_GDSCR |RETAIN_FF_ENABLE , .parent = &titan_top_gdsc.pd, .pwrsts =PWRSTS_OFF_ON , };static struct gdsc ife_0_gdsc = { .gdscr =0x11004 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="ife_0_gdsc" , }, - .flags =POLL_CFG_GDSCR , + .flags =POLL_CFG_GDSCR |RETAIN_FF_ENABLE , .parent = &titan_top_gdsc.pd, .pwrsts =PWRSTS_OFF_ON , };static struct gdsc ife_1_gdsc = { .gdscr =0x12004 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="ife_1_gdsc" , }, - .flags =POLL_CFG_GDSCR , + .flags =POLL_CFG_GDSCR |RETAIN_FF_ENABLE , .parent = &titan_top_gdsc.pd, .pwrsts =PWRSTS_OFF_ON , };static struct gdsc ife_2_gdsc = { .gdscr =0x12050 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="ife_2_gdsc" , }, - .flags =POLL_CFG_GDSCR , + .flags =POLL_CFG_GDSCR |RETAIN_FF_ENABLE , .parent = &titan_top_gdsc.pd, .pwrsts =PWRSTS_OFF_ON , };static struct gdsc sfe_0_gdsc = { .gdscr =0x13050 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="sfe_0_gdsc" , }, - .flags =POLL_CFG_GDSCR , + .flags =POLL_CFG_GDSCR |RETAIN_FF_ENABLE , .parent = &titan_top_gdsc.pd, .pwrsts =PWRSTS_OFF_ON , };static struct gdsc sfe_1_gdsc = { .gdscr =0x13098 , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="sfe_1_gdsc" , }, - .flags =POLL_CFG_GDSCR , + .flags =POLL_CFG_GDSCR |RETAIN_FF_ENABLE , .parent = &titan_top_gdsc.pd, .pwrsts =PWRSTS_OFF_ON , };static struct gdsc titan_top_gdsc = { .gdscr =0x131dc , + .en_rest_wait_val =0x2 , + .en_few_wait_val =0x2 , + .clk_dis_wait_val =0xf , .pd = { .name ="titan_top_gdsc" , }, - .flags =POLL_CFG_GDSCR , + .flags =POLL_CFG_GDSCR |RETAIN_FF_ENABLE , .pwrsts =PWRSTS_OFF_ON , };
Signature · 1 line
2.43.0
PATCH v2 3/3 clk: qcom: camcc-sm8450: Park the camera RCGs when they are disabled
In reply to Sushmit Singh RathoreThe camera RCGs use clk_rcg2_ops, so a disabled RCG stays configured on whichever PLL it last ran from. When that PLL is turned off and the Titan top GDSC then collapses after a camera session, the SoC hangs.
Switch them to clk_rcg2_shared_ops so they park on the XO while disabled, as camcc-sm8550 does. cam_cc_sleep_clk_src runs from the always-on sleep clock and is left alone.
Tested on the Nothing Phone (2) (SM8475).
---
Changes in v2:
- Use full name in From and Signed-off-by.
drivers/clk/qcom/camcc-sm8450.c | 68 ++++++++++++++++----------------- 1 file changed, 34 insertions(+), 34 deletions(-)
drivers/clk/qcom/camcc-sm8450.c +34 -34
@@ -834,7 +834,7 @@ static struct clk_rcg2 cam_cc_bps_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -856,7 +856,7 @@ static struct clk_rcg2 cam_cc_camnoc_axi_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -877,7 +877,7 @@ static struct clk_rcg2 cam_cc_cci_0_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -892,7 +892,7 @@ static struct clk_rcg2 cam_cc_cci_1_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -914,7 +914,7 @@ static struct clk_rcg2 cam_cc_cphy_rx_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -935,7 +935,7 @@ static struct clk_rcg2 cam_cc_csi0phytimer_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -950,7 +950,7 @@ static struct clk_rcg2 cam_cc_csi1phytimer_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -965,7 +965,7 @@ static struct clk_rcg2 cam_cc_csi2phytimer_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -980,7 +980,7 @@ static struct clk_rcg2 cam_cc_csi3phytimer_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -995,7 +995,7 @@ static struct clk_rcg2 cam_cc_csi4phytimer_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1010,7 +1010,7 @@ static struct clk_rcg2 cam_cc_csi5phytimer_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1031,7 +1031,7 @@ static struct clk_rcg2 cam_cc_csid_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1055,7 +1055,7 @@ static struct clk_rcg2 cam_cc_fast_ahb_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1078,7 +1078,7 @@ static struct clk_rcg2 cam_cc_icp_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1102,7 +1102,7 @@ static struct clk_rcg2 cam_cc_ife_0_clk_src = { .parent_data = cam_cc_parent_data_2, .num_parents = ARRAY_SIZE(cam_cc_parent_data_2), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1126,7 +1126,7 @@ static struct clk_rcg2 cam_cc_ife_1_clk_src = { .parent_data = cam_cc_parent_data_3, .num_parents = ARRAY_SIZE(cam_cc_parent_data_3), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1149,7 +1149,7 @@ static struct clk_rcg2 cam_cc_ife_2_clk_src = { .parent_data = cam_cc_parent_data_4, .num_parents = ARRAY_SIZE(cam_cc_parent_data_4), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1170,7 +1170,7 @@ static struct clk_rcg2 cam_cc_ife_lite_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1185,7 +1185,7 @@ static struct clk_rcg2 cam_cc_ife_lite_csid_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1208,7 +1208,7 @@ static struct clk_rcg2 cam_cc_ipe_nps_clk_src = { .parent_data = cam_cc_parent_data_5, .num_parents = ARRAY_SIZE(cam_cc_parent_data_5), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1223,7 +1223,7 @@ static struct clk_rcg2 cam_cc_jpeg_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1245,7 +1245,7 @@ static struct clk_rcg2 cam_cc_mclk0_clk_src = { .parent_data = cam_cc_parent_data_1, .num_parents = ARRAY_SIZE(cam_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1260,7 +1260,7 @@ static struct clk_rcg2 cam_cc_mclk1_clk_src = { .parent_data = cam_cc_parent_data_1, .num_parents = ARRAY_SIZE(cam_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1275,7 +1275,7 @@ static struct clk_rcg2 cam_cc_mclk2_clk_src = { .parent_data = cam_cc_parent_data_1, .num_parents = ARRAY_SIZE(cam_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1290,7 +1290,7 @@ static struct clk_rcg2 cam_cc_mclk3_clk_src = { .parent_data = cam_cc_parent_data_1, .num_parents = ARRAY_SIZE(cam_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1305,7 +1305,7 @@ static struct clk_rcg2 cam_cc_mclk4_clk_src = { .parent_data = cam_cc_parent_data_1, .num_parents = ARRAY_SIZE(cam_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1320,7 +1320,7 @@ static struct clk_rcg2 cam_cc_mclk5_clk_src = { .parent_data = cam_cc_parent_data_1, .num_parents = ARRAY_SIZE(cam_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1335,7 +1335,7 @@ static struct clk_rcg2 cam_cc_mclk6_clk_src = { .parent_data = cam_cc_parent_data_1, .num_parents = ARRAY_SIZE(cam_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1350,7 +1350,7 @@ static struct clk_rcg2 cam_cc_mclk7_clk_src = { .parent_data = cam_cc_parent_data_1, .num_parents = ARRAY_SIZE(cam_cc_parent_data_1), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1373,7 +1373,7 @@ static struct clk_rcg2 cam_cc_qdss_debug_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1396,7 +1396,7 @@ static struct clk_rcg2 cam_cc_sfe_0_clk_src = { .parent_data = cam_cc_parent_data_6, .num_parents = ARRAY_SIZE(cam_cc_parent_data_6), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1419,7 +1419,7 @@ static struct clk_rcg2 cam_cc_sfe_1_clk_src = { .parent_data = cam_cc_parent_data_7, .num_parents = ARRAY_SIZE(cam_cc_parent_data_7), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1460,7 +1460,7 @@ static struct clk_rcg2 cam_cc_slow_ahb_clk_src = { .parent_data = cam_cc_parent_data_0, .num_parents = ARRAY_SIZE(cam_cc_parent_data_0), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1480,7 +1480,7 @@ static struct clk_rcg2 cam_cc_xo_clk_src = { .parent_data = cam_cc_parent_data_9_ao, .num_parents = ARRAY_SIZE(cam_cc_parent_data_9_ao), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
Signature · 1 line
2.43.0
Re: [PATCH v2 1/3] clk: qcom: gcc-sm8450: Parent the eUSB3 clkref to bi_tcxo
In reply to Sushmit Singh RathoreQuoted 10 lines · Sushmit Singh Rathore
gcc_eusb3_0_clkref_engates the XO reference to the eUSB2 PHY, but it has no parent, so its rate reads as 0. On SM8475 the SNPS eUSB2 PHY takes this clock as its reference and rejects a 0 Hz rate as unsupported, so USB doesn't probe.Parent it to
bi_tcxo, as tcsrcc-sm8550 does for its clkref branches.Fixes db0c944ee92b ("clk: qcom: Add clock driver for SM8450")Assisted-by LLMSigned-off-by Sushmit Singh Rathore <[email protected]>
Re: [PATCH v2 2/3] clk: qcom: camcc-sm8450: Retain flops across camera GDSC collapse
In reply to Sushmit Singh RathoreQuoted 7 lines · Sushmit Singh Rathore
The camera GDSCs are collapsed between camera sessions. Without flop retention and with the default clock-disable wait, the IFE GDSC can stay stuck off when it is powered up for the next session.
Program the same wait values and set
RETAIN_FF_ENABLEas camcc-sm8550 and the downstream camera clock controller driver do for these GDSCs.
Quoted 6 lines
Tested on the Nothing Phone (2) (SM8475) by running repeated camera sessions.
Fixes 6082037fe62e ("clk: qcom: add camera clock controller driver for SM8450 SoC")Assisted-by LLMSigned-off-by Sushmit Singh Rathore <[email protected]>
Re: [PATCH v2 3/3] clk: qcom: camcc-sm8450: Park the camera RCGs when they are disabled
In reply to Sushmit Singh RathoreQuoted 8 lines · Sushmit Singh Rathore
The camera RCGs use
clk_rcg2_ops, so a disabled RCG stays configured on whichever PLL it last ran from. When that PLL is turned off and the Titan top GDSC then collapses after a camera session, the SoC hangs.Switch them to
clk_rcg2_shared_opsso they park on the XO while disabled, as camcc-sm8550 does.cam_cc_sleep_clk_srcruns from the always-on sleep clock and is left alone.
Quoted 5 lines
Tested on the Nothing Phone (2) (SM8475).
Fixes 6082037fe62e ("clk: qcom: add camera clock controller driver for SM8450 SoC")Assisted-by LLMSigned-off-by Sushmit Singh Rathore <[email protected]>
Re: [PATCH v2 1/3] clk: qcom: gcc-sm8450: Parent the eUSB3 clkref to bi_tcxo
In reply to Sushmit Singh RathoreQuoted 11 lines · Sushmit Singh Rathore
gcc_eusb3_0_clkref_engates the XO reference to the eUSB2 PHY, but it has no parent, so its rate reads as 0. On SM8475 the SNPS eUSB2 PHY takes this clock as its reference and rejects a 0 Hz rate as unsupported, so USB doesn't probe.Parent it to
bi_tcxo, as tcsrcc-sm8550 does for its clkref branches.Fixes db0c944ee92b ("clk: qcom: Add clock driver for SM8450")Assisted-by LLMSigned-off-by Sushmit Singh Rathore <[email protected]>---
Konrad
Re: [PATCH v2 2/3] clk: qcom: camcc-sm8450: Retain flops across camera GDSC collapse
In reply to Sushmit Singh RathoreQuoted 7 lines · Sushmit Singh Rathore
The camera GDSCs are collapsed between camera sessions. Without flop retention and with the default clock-disable wait, the IFE GDSC can stay stuck off when it is powered up for the next session.
Program the same wait values and set
RETAIN_FF_ENABLEas camcc-sm8550 and the downstream camera clock controller driver do for these GDSCs.
Quoted 7 lines
Tested on the Nothing Phone (2) (SM8475) by running repeated camera sessions.
Fixes 6082037fe62e ("clk: qcom: add camera clock controller driver for SM8450 SoC")Assisted-by LLMSigned-off-by Sushmit Singh Rathore <[email protected]>---
Konrad
Re: [PATCH v2 3/3] clk: qcom: camcc-sm8450: Park the camera RCGs when they are disabled
In reply to Sushmit Singh RathoreQuoted 8 lines · Sushmit Singh Rathore
The camera RCGs use
clk_rcg2_ops, so a disabled RCG stays configured on whichever PLL it last ran from. When that PLL is turned off and the Titan top GDSC then collapses after a camera session, the SoC hangs.Switch them to
clk_rcg2_shared_opsso they park on the XO while disabled, as camcc-sm8550 does.cam_cc_sleep_clk_srcruns from the always-on sleep clock and is left alone.
Quoted 6 lines
Tested on the Nothing Phone (2) (SM8475).
Fixes 6082037fe62e ("clk: qcom: add camera clock controller driver for SM8450 SoC")Assisted-by LLMSigned-off-by Sushmit Singh Rathore <[email protected]>---
Konrad
Quoted 9 lines · Sushmit Singh Rathore
These fix three clock problems found bringing up mainline on an SM8475 phone (Nothing Phone (2)): the eUSB2 PHY reference clock reads 0 Hz so USB never probes, and the camera GDSCs lose register state and leave RCGs running across power collapse.
Changes in v2:
- Use my full name in From and Signed-off-by.[...]
Applied, thanks!
[1/3] clk: qcom: gcc-sm8450: Parent the eUSB3 clkref to bi_tcxo
commit: 0645645582ee82e834e4039cf069671c8eb411af
[2/3] clk: qcom: camcc-sm8450: Retain flops across camera GDSC collapse
commit: c1793791923dbbbe2a948d4a2b22c9a225a24a39
[3/3] clk: qcom: camcc-sm8450: Park the camera RCGs when they are disabled
commit: 704930b1a25310c1357e9f7f9b6d0f4aff95a459Best regards,
Signature · 1 line
Bjorn Andersson <[email protected]>