Skip to content

Commit f3cf702

Browse files
committed
FROMLIST: media: qcom: camss: Fix csid clock configuration for sa8775p
Fix the mismatch between clock list and clock rate table for CSID lite instances. The current implementation has 5 clocks defined but only 2 are actually needed (vfe_lite_csid and vfe_lite_cphy_rx), while the clock rate table doesn't match this configuration. Update both clock list and rate table to maintain consistency: - Remove unused clocks: cpas_vfe_lite, vfe_lite_ahb, vfe_lite - Update clock rate table to match the remaining two clocks Link: https://lore.kernel.org/linux-arm-msm/20260313-vfelite_fix-v2-2-7014429c8345@oss.qualcomm.com/ Fixes: ed03e99 ("media: qcom: camss: Add support for CSID 690") Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>
1 parent 05876f6 commit f3cf702

1 file changed

Lines changed: 15 additions & 25 deletions

File tree

  • drivers/media/platform/qcom/camss

drivers/media/platform/qcom/camss/camss.c

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3598,12 +3598,10 @@ static const struct camss_subdev_resources csid_res_8775p[] = {
35983598
/* CSID2 (lite) */
35993599
{
36003600
.regulators = {},
3601-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3602-
"vfe_lite_csid", "vfe_lite_cphy_rx",
3603-
"vfe_lite"},
3601+
.clock = { "vfe_lite_csid", "vfe_lite_cphy_rx" },
36043602
.clock_rate = {
3605-
{ 0, 0, 400000000, 400000000, 0},
3606-
{ 0, 0, 400000000, 480000000, 0}
3603+
{ 400000000, 480000000 },
3604+
{ 400000000, 480000000 }
36073605
},
36083606
.reg = { "csid_lite0" },
36093607
.interrupt = { "csid_lite0" },
@@ -3617,12 +3615,10 @@ static const struct camss_subdev_resources csid_res_8775p[] = {
36173615
/* CSID3 (lite) */
36183616
{
36193617
.regulators = {},
3620-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3621-
"vfe_lite_csid", "vfe_lite_cphy_rx",
3622-
"vfe_lite"},
3618+
.clock = { "vfe_lite_csid", "vfe_lite_cphy_rx" },
36233619
.clock_rate = {
3624-
{ 0, 0, 400000000, 400000000, 0},
3625-
{ 0, 0, 400000000, 480000000, 0}
3620+
{ 400000000, 480000000 },
3621+
{ 400000000, 480000000 }
36263622
},
36273623
.reg = { "csid_lite1" },
36283624
.interrupt = { "csid_lite1" },
@@ -3636,12 +3632,10 @@ static const struct camss_subdev_resources csid_res_8775p[] = {
36363632
/* CSID4 (lite) */
36373633
{
36383634
.regulators = {},
3639-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3640-
"vfe_lite_csid", "vfe_lite_cphy_rx",
3641-
"vfe_lite"},
3635+
.clock = { "vfe_lite_csid", "vfe_lite_cphy_rx" },
36423636
.clock_rate = {
3643-
{ 0, 0, 400000000, 400000000, 0},
3644-
{ 0, 0, 400000000, 480000000, 0}
3637+
{ 400000000, 480000000 },
3638+
{ 400000000, 480000000 }
36453639
},
36463640
.reg = { "csid_lite2" },
36473641
.interrupt = { "csid_lite2" },
@@ -3655,12 +3649,10 @@ static const struct camss_subdev_resources csid_res_8775p[] = {
36553649
/* CSID5 (lite) */
36563650
{
36573651
.regulators = {},
3658-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3659-
"vfe_lite_csid", "vfe_lite_cphy_rx",
3660-
"vfe_lite"},
3652+
.clock = { "vfe_lite_csid", "vfe_lite_cphy_rx" },
36613653
.clock_rate = {
3662-
{ 0, 0, 400000000, 400000000, 0},
3663-
{ 0, 0, 400000000, 480000000, 0}
3654+
{ 400000000, 480000000 },
3655+
{ 400000000, 480000000 }
36643656
},
36653657
.reg = { "csid_lite3" },
36663658
.interrupt = { "csid_lite3" },
@@ -3674,12 +3666,10 @@ static const struct camss_subdev_resources csid_res_8775p[] = {
36743666
/* CSID6 (lite) */
36753667
{
36763668
.regulators = {},
3677-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3678-
"vfe_lite_csid", "vfe_lite_cphy_rx",
3679-
"vfe_lite"},
3669+
.clock = { "vfe_lite_csid", "vfe_lite_cphy_rx" },
36803670
.clock_rate = {
3681-
{ 0, 0, 400000000, 400000000, 0},
3682-
{ 0, 0, 400000000, 480000000, 0}
3671+
{ 400000000, 480000000 },
3672+
{ 400000000, 480000000 }
36833673
},
36843674
.reg = { "csid_lite4" },
36853675
.interrupt = { "csid_lite4" },

0 commit comments

Comments
 (0)