From d2536ff52251c023fee10f5794a3ab0ffd1ace36 Mon Sep 17 00:00:00 2001 From: Mukund Madhusudan Atre Date: Thu, 9 Nov 2023 14:50:13 -0800 Subject: [PATCH] ARM: dts: msm: Add interconnect path names for sun Add interconnect path names separately in camera bus nodes, so that they can be matched to interconnects in top level cpas node. This is done to ensure compatibility with of_icc_get during creation of path handles for ahb and axi voting. CRs-Fixed: 3656156 Change-Id: Ia8ed566eadab413c38755af82d70a50196ae5f06 Signed-off-by: Mukund Madhusudan Atre --- sun-camera.dtsi | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/sun-camera.dtsi b/sun-camera.dtsi index 2c3c2698..a8aed9c9 100644 --- a/sun-camera.dtsi +++ b/sun-camera.dtsi @@ -1652,9 +1652,28 @@ camnoc-axi-clk-bw-margin-perc = <20>; domain-id = , ; - interconnect-names = "cam_ahb"; - interconnects =<&gem_noc MASTER_APPSS_PROC - &config_noc SLAVE_CAMERA_CFG>; + cam-icc-path-names = "cam_ahb"; + interconnect-names = "cam_ahb", + "cam_hf_0", + "cam_ife_0_drv", + "cam_ife_1_drv", + "cam_ife_2_drv", + "cam_sf_0", + "cam_sf_icp"; + interconnects = <&gem_noc MASTER_APPSS_PROC + &config_noc SLAVE_CAMERA_CFG>, + <&mmss_noc MASTER_CAMNOC_HF + &mc_virt SLAVE_EBI1>, + <&mmss_noc MASTER_CAMNOC_HF_CAM_IFE_0 + &mc_virt SLAVE_EBI1_CAM_IFE_0>, + <&mmss_noc MASTER_CAMNOC_HF_CAM_IFE_1 + &mc_virt SLAVE_EBI1_CAM_IFE_1>, + <&mmss_noc MASTER_CAMNOC_HF_CAM_IFE_2 + &mc_virt SLAVE_EBI1_CAM_IFE_2>, + <&mmss_noc MASTER_CAMNOC_SF + &mc_virt SLAVE_EBI1>, + <&mmss_noc MASTER_CAMNOC_NRT_ICP_SF + &mc_virt SLAVE_EBI1>; rpmh-bcm-info = <13 0x4 0x800 0 4>; cam-ahb-num-cases = <8>; cam-ahb-bw-KBps = @@ -1706,19 +1725,10 @@ ib-bw-voting-needed; rt-axi-port; qcom,axi-port-mnoc { - interconnect-names = "cam_hf_0", + cam-icc-path-names = "cam_hf_0", "cam_ife_0_drv", "cam_ife_1_drv", "cam_ife_2_drv"; - interconnects = - <&mmss_noc MASTER_CAMNOC_HF - &mc_virt SLAVE_EBI1>, - <&mmss_noc MASTER_CAMNOC_HF_CAM_IFE_0 - &mc_virt SLAVE_EBI1_CAM_IFE_0>, - <&mmss_noc MASTER_CAMNOC_HF_CAM_IFE_1 - &mc_virt SLAVE_EBI1_CAM_IFE_1>, - <&mmss_noc MASTER_CAMNOC_HF_CAM_IFE_2 - &mc_virt SLAVE_EBI1_CAM_IFE_2>; }; }; @@ -1728,10 +1738,7 @@ traffic-merge-type = ; qcom,axi-port-mnoc { - interconnect-names = "cam_sf_0"; - interconnects = - <&mmss_noc MASTER_CAMNOC_SF - &mc_virt SLAVE_EBI1>; + cam-icc-path-names = "cam_sf_0"; }; }; @@ -1741,11 +1748,8 @@ traffic-merge-type = ; qcom,axi-port-mnoc { - interconnect-names = + cam-icc-path-names = "cam_sf_icp"; - interconnects = - <&mmss_noc MASTER_CAMNOC_NRT_ICP_SF - &mc_virt SLAVE_EBI1>; }; }; };