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 <quic_matre@quicinc.com>
This commit is contained in:
Mukund Madhusudan Atre
2023-11-09 14:50:13 -08:00
committed by Camera Software Integration
parent 28ba146d6b
commit d2536ff522

View File

@@ -1652,9 +1652,28 @@
camnoc-axi-clk-bw-margin-perc = <20>;
domain-id = <CAM_CPAS_SECURE_DOMAIN 16>,
<CAM_CPAS_NON_SECURE_DOMAIN 0>;
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 =
<CAM_CPAS_TRAFFIC_MERGE_SUM>;
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 =
<CAM_CPAS_TRAFFIC_MERGE_SUM>;
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>;
};
};
};