Skip to content

Commit d31e5c8

Browse files
sgaud-quicsgaud-quic
authored
Merge pull request #362 from wenmliu/qcom-6.18.y
Fix Lemans Vfe lite can`t work issue
2 parents 3d37e94 + 4c1a5e4 commit d31e5c8

2 files changed

Lines changed: 43 additions & 43 deletions

File tree

‎drivers/media/platform/qcom/camss/camss-csid-gen3.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
#define IS_CSID_690(csid) ((csid->camss->res->version == CAMSS_8775P) \
4949
|| (csid->camss->res->version == CAMSS_8300))
5050
#define CSID_BUF_DONE_IRQ_STATUS 0x8C
51-
#define BUF_DONE_IRQ_STATUS_RDI_OFFSET (csid_is_lite(csid) ?\
52-
1 : (IS_CSID_690(csid) ?\
53-
13 : 14))
51+
#define BUF_DONE_IRQ_STATUS_RDI_OFFSET (csid_is_lite(csid) ? \
52+
((IS_CSID_690(csid) ? 0 : 1)) : \
53+
((IS_CSID_690(csid) ? 13 : 14)))
5454
#define CSID_BUF_DONE_IRQ_MASK 0x90
5555
#define CSID_BUF_DONE_IRQ_CLEAR 0x94
5656
#define CSID_BUF_DONE_IRQ_SET 0x98

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

Lines changed: 40 additions & 40 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" },
@@ -3752,15 +3742,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
37523742
/* VFE2 (lite) */
37533743
{
37543744
.regulators = {},
3755-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3745+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
37563746
"vfe_lite_csid", "vfe_lite_cphy_rx",
3757-
"vfe_lite"},
3747+
"vfe_lite", "camnoc_axi"},
37583748
.clock_rate = {
3759-
{ 0, 0, 0, 0 },
3749+
{ 0 },
3750+
{ 0 },
37603751
{ 300000000, 400000000, 400000000, 400000000 },
37613752
{ 400000000, 400000000, 400000000, 400000000 },
37623753
{ 400000000, 400000000, 400000000, 400000000 },
37633754
{ 480000000, 600000000, 600000000, 600000000 },
3755+
{ 400000000 },
37643756
},
37653757
.reg = { "vfe_lite0" },
37663758
.interrupt = { "vfe_lite0" },
@@ -3775,15 +3767,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
37753767
/* VFE3 (lite) */
37763768
{
37773769
.regulators = {},
3778-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3770+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
37793771
"vfe_lite_csid", "vfe_lite_cphy_rx",
3780-
"vfe_lite"},
3772+
"vfe_lite", "camnoc_axi"},
37813773
.clock_rate = {
3782-
{ 0, 0, 0, 0 },
3774+
{ 0 },
3775+
{ 0 },
37833776
{ 300000000, 400000000, 400000000, 400000000 },
37843777
{ 400000000, 400000000, 400000000, 400000000 },
37853778
{ 400000000, 400000000, 400000000, 400000000 },
37863779
{ 480000000, 600000000, 600000000, 600000000 },
3780+
{ 400000000 },
37873781
},
37883782
.reg = { "vfe_lite1" },
37893783
.interrupt = { "vfe_lite1" },
@@ -3798,15 +3792,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
37983792
/* VFE4 (lite) */
37993793
{
38003794
.regulators = {},
3801-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3795+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
38023796
"vfe_lite_csid", "vfe_lite_cphy_rx",
3803-
"vfe_lite"},
3797+
"vfe_lite", "camnoc_axi"},
38043798
.clock_rate = {
3805-
{ 0, 0, 0, 0 },
3799+
{ 0 },
3800+
{ 0 },
38063801
{ 300000000, 400000000, 400000000, 400000000 },
38073802
{ 400000000, 400000000, 400000000, 400000000 },
38083803
{ 400000000, 400000000, 400000000, 400000000 },
38093804
{ 480000000, 600000000, 600000000, 600000000 },
3805+
{ 400000000 },
38103806
},
38113807
.reg = { "vfe_lite2" },
38123808
.interrupt = { "vfe_lite2" },
@@ -3821,15 +3817,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
38213817
/* VFE5 (lite) */
38223818
{
38233819
.regulators = {},
3824-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3820+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
38253821
"vfe_lite_csid", "vfe_lite_cphy_rx",
3826-
"vfe_lite"},
3822+
"vfe_lite", "camnoc_axi"},
38273823
.clock_rate = {
3828-
{ 0, 0, 0, 0 },
3824+
{ 0 },
3825+
{ 0 },
38293826
{ 300000000, 400000000, 400000000, 400000000 },
38303827
{ 400000000, 400000000, 400000000, 400000000 },
38313828
{ 400000000, 400000000, 400000000, 400000000 },
38323829
{ 480000000, 600000000, 600000000, 600000000 },
3830+
{ 400000000 },
38333831
},
38343832
.reg = { "vfe_lite3" },
38353833
.interrupt = { "vfe_lite3" },
@@ -3844,15 +3842,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
38443842
/* VFE6 (lite) */
38453843
{
38463844
.regulators = {},
3847-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3845+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
38483846
"vfe_lite_csid", "vfe_lite_cphy_rx",
3849-
"vfe_lite"},
3847+
"vfe_lite", "camnoc_axi"},
38503848
.clock_rate = {
3851-
{ 0, 0, 0, 0 },
3849+
{ 0 },
3850+
{ 0 },
38523851
{ 300000000, 400000000, 400000000, 400000000 },
38533852
{ 400000000, 400000000, 400000000, 400000000 },
38543853
{ 400000000, 400000000, 400000000, 400000000 },
38553854
{ 480000000, 600000000, 600000000, 600000000 },
3855+
{ 400000000 },
38563856
},
38573857
.reg = { "vfe_lite4" },
38583858
.interrupt = { "vfe_lite4" },

0 commit comments

Comments
 (0)