Skip to content

Commit 4c1a5e4

Browse files
committed
FROMLIST: media: qcom: camss: Add missing clocks for VFE lite on sa8775p
Add missing required clocks (cpas_ahb and camnoc_axi) for VFE lite instances on sa8775p platform. These clocks are necessary for proper VFE lite operation: Link: https://lore.kernel.org/linux-arm-msm/20260313-vfelite_fix-v2-3-7014429c8345@oss.qualcomm.com/ Fixes: e7b59e1 ("media: qcom: camss: Add support for VFE 690") Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>
1 parent f3cf702 commit 4c1a5e4

1 file changed

Lines changed: 25 additions & 15 deletions

File tree

  • drivers/media/platform/qcom/camss

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

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3742,15 +3742,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
37423742
/* VFE2 (lite) */
37433743
{
37443744
.regulators = {},
3745-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3745+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
37463746
"vfe_lite_csid", "vfe_lite_cphy_rx",
3747-
"vfe_lite"},
3747+
"vfe_lite", "camnoc_axi"},
37483748
.clock_rate = {
3749-
{ 0, 0, 0, 0 },
3749+
{ 0 },
3750+
{ 0 },
37503751
{ 300000000, 400000000, 400000000, 400000000 },
37513752
{ 400000000, 400000000, 400000000, 400000000 },
37523753
{ 400000000, 400000000, 400000000, 400000000 },
37533754
{ 480000000, 600000000, 600000000, 600000000 },
3755+
{ 400000000 },
37543756
},
37553757
.reg = { "vfe_lite0" },
37563758
.interrupt = { "vfe_lite0" },
@@ -3765,15 +3767,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
37653767
/* VFE3 (lite) */
37663768
{
37673769
.regulators = {},
3768-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3770+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
37693771
"vfe_lite_csid", "vfe_lite_cphy_rx",
3770-
"vfe_lite"},
3772+
"vfe_lite", "camnoc_axi"},
37713773
.clock_rate = {
3772-
{ 0, 0, 0, 0 },
3774+
{ 0 },
3775+
{ 0 },
37733776
{ 300000000, 400000000, 400000000, 400000000 },
37743777
{ 400000000, 400000000, 400000000, 400000000 },
37753778
{ 400000000, 400000000, 400000000, 400000000 },
37763779
{ 480000000, 600000000, 600000000, 600000000 },
3780+
{ 400000000 },
37773781
},
37783782
.reg = { "vfe_lite1" },
37793783
.interrupt = { "vfe_lite1" },
@@ -3788,15 +3792,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
37883792
/* VFE4 (lite) */
37893793
{
37903794
.regulators = {},
3791-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3795+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
37923796
"vfe_lite_csid", "vfe_lite_cphy_rx",
3793-
"vfe_lite"},
3797+
"vfe_lite", "camnoc_axi"},
37943798
.clock_rate = {
3795-
{ 0, 0, 0, 0 },
3799+
{ 0 },
3800+
{ 0 },
37963801
{ 300000000, 400000000, 400000000, 400000000 },
37973802
{ 400000000, 400000000, 400000000, 400000000 },
37983803
{ 400000000, 400000000, 400000000, 400000000 },
37993804
{ 480000000, 600000000, 600000000, 600000000 },
3805+
{ 400000000 },
38003806
},
38013807
.reg = { "vfe_lite2" },
38023808
.interrupt = { "vfe_lite2" },
@@ -3811,15 +3817,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
38113817
/* VFE5 (lite) */
38123818
{
38133819
.regulators = {},
3814-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3820+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
38153821
"vfe_lite_csid", "vfe_lite_cphy_rx",
3816-
"vfe_lite"},
3822+
"vfe_lite", "camnoc_axi"},
38173823
.clock_rate = {
3818-
{ 0, 0, 0, 0 },
3824+
{ 0 },
3825+
{ 0 },
38193826
{ 300000000, 400000000, 400000000, 400000000 },
38203827
{ 400000000, 400000000, 400000000, 400000000 },
38213828
{ 400000000, 400000000, 400000000, 400000000 },
38223829
{ 480000000, 600000000, 600000000, 600000000 },
3830+
{ 400000000 },
38233831
},
38243832
.reg = { "vfe_lite3" },
38253833
.interrupt = { "vfe_lite3" },
@@ -3834,15 +3842,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
38343842
/* VFE6 (lite) */
38353843
{
38363844
.regulators = {},
3837-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3845+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
38383846
"vfe_lite_csid", "vfe_lite_cphy_rx",
3839-
"vfe_lite"},
3847+
"vfe_lite", "camnoc_axi"},
38403848
.clock_rate = {
3841-
{ 0, 0, 0, 0 },
3849+
{ 0 },
3850+
{ 0 },
38423851
{ 300000000, 400000000, 400000000, 400000000 },
38433852
{ 400000000, 400000000, 400000000, 400000000 },
38443853
{ 400000000, 400000000, 400000000, 400000000 },
38453854
{ 480000000, 600000000, 600000000, 600000000 },
3855+
{ 400000000 },
38463856
},
38473857
.reg = { "vfe_lite4" },
38483858
.interrupt = { "vfe_lite4" },

0 commit comments

Comments
 (0)