samsung_sm8750/android_kernel_samsung_sm8750-devicetrees
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: dts: msm: Add interconnect path names for pineapple

Browse Source 
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: I669e1c6b05735d2162867d954af927baca1a829d
Signed-off-by: Mukund Madhusudan Atre <quic_matre@quicinc.com>
This commit is contained in:
Mukund Madhusudan Atre
2023-11-07 18:43:40 -08:00
committed by Camera Software Integration
parent 15f0d91006
commit 3d725b5858
1 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
pineapple-camera.dtsi
View File

@@ -1614,9 +1614,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_ICP
&mc_virt SLAVE_EBI1>;
rpmh-bcm-info = <13 0x4 0x800 0 4>;
cam-ahb-num-cases = <8>;
cam-ahb-bw-KBps =
@@ -1673,19 +1692,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>;
};
};
@@ -1695,10 +1705,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";
};
};
@@ -1708,11 +1715,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_ICP
&mc_virt SLAVE_EBI1>;
};
};
};