Skip to content

Commit 22ee38c

Browse files
wenmliugregkh
wenmliu
authored and
gregkh
committed
media: qcom: camss: Add missing clocks for VFE lite on sa8775p
commit d31fac4 upstream. 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: Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com> Fixes: e7b59e1 ("media: qcom: camss: Add support for VFE 690") Cc: stable@vger.kernel.org Signed-off-by: Bryan O'Donoghue <bod@kernel.org> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 696ac7c commit 22ee38c

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
@@ -2926,15 +2926,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
29262926
/* VFE2 (lite) */
29272927
{
29282928
.regulators = {},
2929-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
2929+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
29302930
"vfe_lite_csid", "vfe_lite_cphy_rx",
2931-
"vfe_lite"},
2931+
"vfe_lite", "camnoc_axi"},
29322932
.clock_rate = {
2933-
{ 0, 0, 0, 0 },
2933+
{ 0 },
2934+
{ 0 },
29342935
{ 300000000, 400000000, 400000000, 400000000 },
29352936
{ 400000000, 400000000, 400000000, 400000000 },
29362937
{ 400000000, 400000000, 400000000, 400000000 },
29372938
{ 480000000, 600000000, 600000000, 600000000 },
2939+
{ 400000000 },
29382940
},
29392941
.reg = { "vfe_lite0" },
29402942
.interrupt = { "vfe_lite0" },
@@ -2949,15 +2951,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
29492951
/* VFE3 (lite) */
29502952
{
29512953
.regulators = {},
2952-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
2954+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
29532955
"vfe_lite_csid", "vfe_lite_cphy_rx",
2954-
"vfe_lite"},
2956+
"vfe_lite", "camnoc_axi"},
29552957
.clock_rate = {
2956-
{ 0, 0, 0, 0 },
2958+
{ 0 },
2959+
{ 0 },
29572960
{ 300000000, 400000000, 400000000, 400000000 },
29582961
{ 400000000, 400000000, 400000000, 400000000 },
29592962
{ 400000000, 400000000, 400000000, 400000000 },
29602963
{ 480000000, 600000000, 600000000, 600000000 },
2964+
{ 400000000 },
29612965
},
29622966
.reg = { "vfe_lite1" },
29632967
.interrupt = { "vfe_lite1" },
@@ -2972,15 +2976,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
29722976
/* VFE4 (lite) */
29732977
{
29742978
.regulators = {},
2975-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
2979+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
29762980
"vfe_lite_csid", "vfe_lite_cphy_rx",
2977-
"vfe_lite"},
2981+
"vfe_lite", "camnoc_axi"},
29782982
.clock_rate = {
2979-
{ 0, 0, 0, 0 },
2983+
{ 0 },
2984+
{ 0 },
29802985
{ 300000000, 400000000, 400000000, 400000000 },
29812986
{ 400000000, 400000000, 400000000, 400000000 },
29822987
{ 400000000, 400000000, 400000000, 400000000 },
29832988
{ 480000000, 600000000, 600000000, 600000000 },
2989+
{ 400000000 },
29842990
},
29852991
.reg = { "vfe_lite2" },
29862992
.interrupt = { "vfe_lite2" },
@@ -2995,15 +3001,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
29953001
/* VFE5 (lite) */
29963002
{
29973003
.regulators = {},
2998-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3004+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
29993005
"vfe_lite_csid", "vfe_lite_cphy_rx",
3000-
"vfe_lite"},
3006+
"vfe_lite", "camnoc_axi"},
30013007
.clock_rate = {
3002-
{ 0, 0, 0, 0 },
3008+
{ 0 },
3009+
{ 0 },
30033010
{ 300000000, 400000000, 400000000, 400000000 },
30043011
{ 400000000, 400000000, 400000000, 400000000 },
30053012
{ 400000000, 400000000, 400000000, 400000000 },
30063013
{ 480000000, 600000000, 600000000, 600000000 },
3014+
{ 400000000 },
30073015
},
30083016
.reg = { "vfe_lite3" },
30093017
.interrupt = { "vfe_lite3" },
@@ -3018,15 +3026,17 @@ static const struct camss_subdev_resources vfe_res_8775p[] = {
30183026
/* VFE6 (lite) */
30193027
{
30203028
.regulators = {},
3021-
.clock = { "cpas_vfe_lite", "vfe_lite_ahb",
3029+
.clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb",
30223030
"vfe_lite_csid", "vfe_lite_cphy_rx",
3023-
"vfe_lite"},
3031+
"vfe_lite", "camnoc_axi"},
30243032
.clock_rate = {
3025-
{ 0, 0, 0, 0 },
3033+
{ 0 },
3034+
{ 0 },
30263035
{ 300000000, 400000000, 400000000, 400000000 },
30273036
{ 400000000, 400000000, 400000000, 400000000 },
30283037
{ 400000000, 400000000, 400000000, 400000000 },
30293038
{ 480000000, 600000000, 600000000, 600000000 },
3039+
{ 400000000 },
30303040
},
30313041
.reg = { "vfe_lite4" },
30323042
.interrupt = { "vfe_lite4" },

0 commit comments

Comments
 (0)