Skip to content

Commit e7b1c13

Browse files
lweiss-fairphoneandersson
authored andcommitted
clk: qcom: camcc-sm6350: Add *_wait_val values for GDSCs
Compared to the msm-4.19 driver the mainline GDSC driver always sets the bits for en_rest, en_few & clk_dis, and if those values are not set per-GDSC in the respective driver then the default value from the GDSC driver is used. The downstream driver only conditionally sets clk_dis_wait_val if qcom,clk-dis-wait-val is given in devicetree. Correct this situation by explicitly setting those values. For all GDSCs the reset value of those bits are used. Fixes: 80f5451 ("clk: qcom: Add camera clock controller driver for SM6350") Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> Reviewed-by: Taniya Das <quic_tdas@quicinc.com> Link: https://lore.kernel.org/r/20250425-sm6350-gdsc-val-v1-1-1f252d9c5e4e@fairphone.com Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 36eb51a commit e7b1c13

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

drivers/clk/qcom/camcc-sm6350.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1695,6 +1695,9 @@ static struct clk_branch camcc_sys_tmr_clk = {
16951695

16961696
static struct gdsc bps_gdsc = {
16971697
.gdscr = 0x6004,
1698+
.en_rest_wait_val = 0x2,
1699+
.en_few_wait_val = 0x2,
1700+
.clk_dis_wait_val = 0xf,
16981701
.pd = {
16991702
.name = "bps_gdsc",
17001703
},
@@ -1704,6 +1707,9 @@ static struct gdsc bps_gdsc = {
17041707

17051708
static struct gdsc ipe_0_gdsc = {
17061709
.gdscr = 0x7004,
1710+
.en_rest_wait_val = 0x2,
1711+
.en_few_wait_val = 0x2,
1712+
.clk_dis_wait_val = 0xf,
17071713
.pd = {
17081714
.name = "ipe_0_gdsc",
17091715
},
@@ -1713,6 +1719,9 @@ static struct gdsc ipe_0_gdsc = {
17131719

17141720
static struct gdsc ife_0_gdsc = {
17151721
.gdscr = 0x9004,
1722+
.en_rest_wait_val = 0x2,
1723+
.en_few_wait_val = 0x2,
1724+
.clk_dis_wait_val = 0xf,
17161725
.pd = {
17171726
.name = "ife_0_gdsc",
17181727
},
@@ -1721,6 +1730,9 @@ static struct gdsc ife_0_gdsc = {
17211730

17221731
static struct gdsc ife_1_gdsc = {
17231732
.gdscr = 0xa004,
1733+
.en_rest_wait_val = 0x2,
1734+
.en_few_wait_val = 0x2,
1735+
.clk_dis_wait_val = 0xf,
17241736
.pd = {
17251737
.name = "ife_1_gdsc",
17261738
},
@@ -1729,6 +1741,9 @@ static struct gdsc ife_1_gdsc = {
17291741

17301742
static struct gdsc ife_2_gdsc = {
17311743
.gdscr = 0xb004,
1744+
.en_rest_wait_val = 0x2,
1745+
.en_few_wait_val = 0x2,
1746+
.clk_dis_wait_val = 0xf,
17321747
.pd = {
17331748
.name = "ife_2_gdsc",
17341749
},
@@ -1737,6 +1752,9 @@ static struct gdsc ife_2_gdsc = {
17371752

17381753
static struct gdsc titan_top_gdsc = {
17391754
.gdscr = 0x14004,
1755+
.en_rest_wait_val = 0x2,
1756+
.en_few_wait_val = 0x2,
1757+
.clk_dis_wait_val = 0xf,
17401758
.pd = {
17411759
.name = "titan_top_gdsc",
17421760
},

0 commit comments

Comments
 (0)