7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hans de Goede [ Upstream commit 583b27edfe669fe27c631b4ac77c0ce0250f7bba ] The "gcc_axi_hf" clock is correctly listed in the clock list of the 8775p 2 main VFE-s, but it is missing from all the VFE-lite clock lists, causing these to not work on platforms where the firmware allows turning off "gcc_axi_hf". Add the missing "gcc_axi_hf" to fix the VFE-lite blocks not working on these platforms. Fixes: 924f45e58b1fe ("media: qcom: camss: Add missing clocks for VFE lite on sa8775p") Cc: stable@vger.kernel.org Suggested-by: Wenmeng Liu Reviewed-by: Bryan O'Donoghue Signed-off-by: Hans de Goede Tested-by: Cory Keitz Reviewed-by: Loic Poulain Reviewed-by: Vladimir Zapolskiy Signed-off-by: Bryan O'Donoghue Signed-off-by: Sasha Levin --- drivers/media/platform/qcom/camss/camss.c | 25 ++++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c index 2123f6388e3d7..68491b16d6476 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -4037,10 +4037,11 @@ static const struct camss_subdev_resources vfe_res_8775p[] = { /* VFE2 (lite) */ { .regulators = {}, - .clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb", - "vfe_lite_csid", "vfe_lite_cphy_rx", + .clock = { "cpas_ahb", "gcc_axi_hf", "cpas_vfe_lite", + "vfe_lite_ahb", "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "camnoc_axi"}, .clock_rate = { + { 0 }, { 0 }, { 0 }, { 300000000, 400000000, 400000000, 400000000 }, @@ -4062,10 +4063,11 @@ static const struct camss_subdev_resources vfe_res_8775p[] = { /* VFE3 (lite) */ { .regulators = {}, - .clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb", - "vfe_lite_csid", "vfe_lite_cphy_rx", + .clock = { "cpas_ahb", "gcc_axi_hf", "cpas_vfe_lite", + "vfe_lite_ahb", "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "camnoc_axi"}, .clock_rate = { + { 0 }, { 0 }, { 0 }, { 300000000, 400000000, 400000000, 400000000 }, @@ -4087,10 +4089,11 @@ static const struct camss_subdev_resources vfe_res_8775p[] = { /* VFE4 (lite) */ { .regulators = {}, - .clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb", - "vfe_lite_csid", "vfe_lite_cphy_rx", + .clock = { "cpas_ahb", "gcc_axi_hf", "cpas_vfe_lite", + "vfe_lite_ahb", "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "camnoc_axi"}, .clock_rate = { + { 0 }, { 0 }, { 0 }, { 300000000, 400000000, 400000000, 400000000 }, @@ -4112,10 +4115,11 @@ static const struct camss_subdev_resources vfe_res_8775p[] = { /* VFE5 (lite) */ { .regulators = {}, - .clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb", - "vfe_lite_csid", "vfe_lite_cphy_rx", + .clock = { "cpas_ahb", "gcc_axi_hf", "cpas_vfe_lite", + "vfe_lite_ahb", "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "camnoc_axi"}, .clock_rate = { + { 0 }, { 0 }, { 0 }, { 300000000, 400000000, 400000000, 400000000 }, @@ -4137,10 +4141,11 @@ static const struct camss_subdev_resources vfe_res_8775p[] = { /* VFE6 (lite) */ { .regulators = {}, - .clock = { "cpas_ahb", "cpas_vfe_lite", "vfe_lite_ahb", - "vfe_lite_csid", "vfe_lite_cphy_rx", + .clock = { "cpas_ahb", "gcc_axi_hf", "cpas_vfe_lite", + "vfe_lite_ahb", "vfe_lite_csid", "vfe_lite_cphy_rx", "vfe_lite", "camnoc_axi"}, .clock_rate = { + { 0 }, { 0 }, { 0 }, { 300000000, 400000000, 400000000, 400000000 }, -- 2.53.0