ARM: dts: msm: Update ports, lpass path, cti, usb for Khaje

-Update the compatible string and periphid details
for all the cti nodes to comply with the 5.15 design.
-Update all the port numbers to match with the registers
-Update the audio etm and lpass tpdm paths to go via the
static lpass funnel to funnel_qatb.
-Add usb_bam_support to enable usb out_mode.

Change-Id: Ic4afb2c0f2d305d3825154dbf81fc1ee30f9056e
This commit is contained in:
Shilpa Suresh
2022-10-27 16:49:25 +05:30
committed by Bharat Pawar
parent b3506e76ed
commit 99b28d08d2

View File

@@ -142,14 +142,16 @@
out-ports {
port {
audio_etm0_out_funnel_qatb: endpoint {
audio_etm0_out_funnel_lpass_lpi: endpoint {
remote-endpoint =
<&funnel_qatb_in_audio_etm0>;
<&funnel_lpass_lpi_in_audio_etm0>;
};
};
};
};
snoc: snoc {
compatible = "qcom,coresight-dummy";
@@ -174,9 +176,9 @@
out-ports {
port {
tpdm_lpass_out_funnel_qatb: endpoint {
tpdm_lpass_out_funnel_lpass_lpi: endpoint {
remote-endpoint =
<&funnel_qatb_in_tpdm_lpass>;
<&funnel_lpass_lpi_in_tpdm_lpass>;
};
};
};
@@ -636,7 +638,7 @@
#address-cells = <1>;
#size-cells = <0>;
port@1 {
port@0 {
reg = <0>;
funnel_apss0_in_etm0: endpoint {
remote-endpoint =
@@ -644,7 +646,7 @@
};
};
port@2 {
port@1 {
reg = <1>;
funnel_apss0_in_etm1: endpoint {
remote-endpoint =
@@ -652,7 +654,7 @@
};
};
port@3 {
port@2 {
reg = <2>;
funnel_apss0_in_etm2: endpoint {
remote-endpoint =
@@ -660,7 +662,7 @@
};
};
port@4 {
port@3 {
reg = <3>;
funnel_apss0_in_etm3: endpoint {
remote-endpoint =
@@ -668,7 +670,7 @@
};
};
port@5 {
port@4 {
reg = <4>;
funnel_apss0_in_etm4: endpoint {
remote-endpoint =
@@ -676,7 +678,7 @@
};
};
port@6 {
port@5 {
reg = <5>;
funnel_apss0_in_etm5: endpoint {
remote-endpoint =
@@ -684,7 +686,7 @@
};
};
port@7 {
port@6 {
reg = <6>;
funnel_apss0_in_etm6: endpoint {
remote-endpoint =
@@ -692,7 +694,7 @@
};
};
port@8 {
port@7 {
reg = <7>;
funnel_apss0_in_etm7: endpoint {
remote-endpoint =
@@ -730,7 +732,7 @@
#address-cells = <1>;
#size-cells = <0>;
port@1 {
port@0 {
reg = <0>;
tpda_actpm_in_tpdm_actpm: endpoint {
remote-endpoint =
@@ -769,7 +771,7 @@
#address-cells = <1>;
#size-cells = <0>;
port@1 {
port@0 {
reg = <0>;
tpda_apss_in_tpdm_apss: endpoint {
remote-endpoint =
@@ -807,7 +809,7 @@
#address-cells = <1>;
#size-cells = <0>;
port@1 {
port@0 {
reg = <0>;
tpda_llm_silver_in_tpdm_llm_silver: endpoint {
remote-endpoint =
@@ -843,7 +845,7 @@
#address-cells = <1>;
#size-cells = <0>;
port@1 {
port@0 {
reg = <0>;
funnel_apss1_in_funnel_apss0: endpoint {
remote-endpoint =
@@ -907,7 +909,7 @@
#address-cells = <1>;
#size-cells = <0>;
port@1 {
port@0 {
reg = <0>;
tpda_mapss_in_tpdm_mapss: endpoint {
remote-endpoint =
@@ -942,7 +944,7 @@
#address-cells = <1>;
#size-cells = <0>;
port@1 {
port@0 {
reg = <0>;
funnel_gpu_in_tpdm_gpu: endpoint {
remote-endpoint =
@@ -987,7 +989,7 @@
#address-cells = <1>;
#size-cells = <0>;
port@2 {
port@0 {
reg = <0>;
funnel_turing_in_tpdm_turing: endpoint {
remote-endpoint =
@@ -995,7 +997,7 @@
};
};
port@3 {
port@1 {
reg = <1>;
funnel_turing_in_turing_etm0: endpoint {
remote-endpoint =
@@ -1043,7 +1045,7 @@
#address-cells = <1>;
#size-cells = <0>;
port@1 {
port@0 {
reg = <0>;
tpda0_in_tpdm_dl_ct: endpoint {
remote-endpoint =
@@ -1051,7 +1053,7 @@
};
};
port@2 {
port@1 {
reg = <1>;
tpda1_in_funnel_gpu: endpoint {
remote-endpoint =
@@ -1059,7 +1061,7 @@
};
};
port@3 {
port@5 {
reg = <5>;
tpda5_in_funnel_turing: endpoint {
remote-endpoint =
@@ -1067,7 +1069,7 @@
};
};
port@4 {
port@7 {
reg = <7>;
tpda7_in_tpdm_vsense: endpoint {
remote-endpoint =
@@ -1075,7 +1077,7 @@
};
};
port@5 {
port@8 {
reg = <8>;
tpda8_in_tpdm_dcc: endpoint {
remote-endpoint =
@@ -1083,7 +1085,7 @@
};
};
port@6 {
port@10 {
reg = <10>;
tpda10_in_tpdm_prng: endpoint {
remote-endpoint =
@@ -1091,7 +1093,7 @@
};
};
port@7 {
port@12 {
reg = <12>;
tpda12_in_tpdm_qm: endpoint {
remote-endpoint =
@@ -1099,7 +1101,7 @@
};
};
port@8 {
port@13 {
reg = <13>;
tpda13_in_tpdm_west: endpoint {
remote-endpoint =
@@ -1107,7 +1109,7 @@
};
};
port@9 {
port@15 {
reg = <15>;
tpda15_in_tpdm_pimem: endpoint {
remote-endpoint =
@@ -1118,6 +1120,43 @@
};
};
funnel_lpass_lpi: funnel@8a24000 {
compatible = "arm,coresight-static-funnel";
coresight-name = "coresight-funnel-lpass-lpi";
in-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
funnel_lpass_lpi_in_audio_etm0: endpoint {
remote-endpoint =
<&audio_etm0_out_funnel_lpass_lpi>;
};
};
port@5 {
reg = <5>;
funnel_lpass_lpi_in_tpdm_lpass: endpoint {
remote-endpoint =
<&tpdm_lpass_out_funnel_lpass_lpi>;
};
};
};
out-ports {
port {
lpass_lpi_out_funnel_qatb: endpoint {
remote-endpoint =
<&funnel_qatb_in_lpass_lpi>;
};
};
};
};
funnel_qatb: funnel@8005000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb908>;
@@ -1143,7 +1182,7 @@
#address-cells = <1>;
#size-cells = <0>;
port@1 {
port@0 {
reg = <0>;
funnel_qatb_in_tpda: endpoint {
remote-endpoint =
@@ -1151,7 +1190,7 @@
};
};
port@2 {
port@6 {
reg = <6>;
funnel_qatb_in_funnel_turing: endpoint {
remote-endpoint =
@@ -1159,21 +1198,14 @@
};
};
port@3 {
port@5 {
reg = <5>;
funnel_qatb_in_tpdm_lpass: endpoint {
funnel_qatb_in_lpass_lpi: endpoint {
remote-endpoint =
<&tpdm_lpass_out_funnel_qatb>;
<&lpass_lpi_out_funnel_qatb>;
};
};
port@4 {
reg = <5>;
funnel_qatb_in_audio_etm0: endpoint {
remote-endpoint =
<&audio_etm0_out_funnel_qatb>;
};
};
};
};
@@ -1202,7 +1234,7 @@
#address-cells = <1>;
#size-cells = <0>;
port@1 {
port@5 {
reg = <5>;
funnel_in0_in_snoc: endpoint {
remote-endpoint =
@@ -1210,7 +1242,7 @@
};
};
port@2 {
port@6 {
reg = <6>;
funnel_in0_in_funnel_qatb: endpoint {
remote-endpoint =
@@ -1218,7 +1250,7 @@
};
};
port@3 {
port@7 {
reg = <7>;
funnel_in0_in_stm: endpoint {
remote-endpoint =
@@ -1285,7 +1317,7 @@
};
};
port@5 {
port@6 {
reg = <6>;
funnel_in1_in_funnel_apss1: endpoint {
remote-endpoint =
@@ -1321,7 +1353,7 @@
#address-cells = <1>;
#size-cells = <0>;
port@1 {
port@0 {
reg = <0>;
funnel_merg_in_funnel_in0: endpoint {
remote-endpoint =
@@ -1329,7 +1361,7 @@
};
};
port@2 {
port@1 {
reg = <1>;
funnel_merg_in_funnel_in1: endpoint {
remote-endpoint =
@@ -1366,7 +1398,7 @@
#address-cells = <1>;
#size-cells = <0>;
port@1 {
port@0 {
reg = <0>;
tmc_etf_in_funnel_merg: endpoint {
remote-endpoint =
@@ -1402,7 +1434,7 @@
#address-cells = <1>;
#size-cells = <0>;
port@1 {
port@0 {
reg = <0>;
replicator_qdss_in_tmc_etf: endpoint {
remote-endpoint =
@@ -1432,6 +1464,7 @@
ranges;
qcom,mem_support;
usb_bam_support;
dma-coherent;
arm,buffer-size = <0x400000>;
arm,scatter-gather;
@@ -1463,8 +1496,8 @@
};
cti_cortex_M3: cti@8B30000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8B30000 0x1000>;
reg-names = "cti-base";
@@ -1475,8 +1508,8 @@
};
cti_apss_cti0: cti@98E0000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x98E0000 0x1000>;
reg-names = "cti-base";
@@ -1487,8 +1520,8 @@
};
cti_apss_cti1: cti@98F0000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x98F0000 0x1000>;
reg-names = "cti-base";
@@ -1499,8 +1532,8 @@
};
cti_wcss_cti0: cti@89A4000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x89A4000 0x1000>;
reg-names = "cti-base";
status = "disabled";
@@ -1511,8 +1544,8 @@
};
cti_wcss_cti1: cti@89A5000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x89A5000 0x1000>;
reg-names = "cti-base";
status = "disabled";
@@ -1523,8 +1556,8 @@
};
cti_wcss_cti2: cti@89A6000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x89A6000 0x1000>;
reg-names = "cti-base";
status = "disabled";
@@ -1535,8 +1568,8 @@
};
cti_lpass_q6: cti@8A21000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8A21000 0x1000>;
reg-names = "cti-base";
@@ -1548,8 +1581,8 @@
};
cti_turing_q6: cti@8867000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8867000 0x1000>;
reg-names = "cti-base";
@@ -1560,8 +1593,8 @@
};
cti_mss_q6: cti@8833000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8833000 0x1000>;
reg-names = "cti-base";
@@ -1572,8 +1605,8 @@
};
cti_isdb_gpu: cti@8941000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8941000 0x1000>;
reg-names = "cti-base";
status = "disabled";
@@ -1584,8 +1617,8 @@
};
cti_mapss: cti@8A02000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8A02000 0x1000>;
reg-names = "cti-base";
@@ -1596,8 +1629,8 @@
};
cti_dlct_cti0: cti@8B59000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8B59000 0x1000>;
reg-names = "cti-base";
@@ -1608,8 +1641,8 @@
};
cti_dlct_cti1: cti@8B5A000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8B5A000 0x1000>;
reg-names = "cti-base";
@@ -1620,8 +1653,8 @@
};
cti_dlct_cti2: cti@8B5B000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8B5B000 0x1000>;
reg-names = "cti-base";
@@ -1632,8 +1665,8 @@
};
cti_dlct_cti3: cti@8B5C000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8B5C000 0x1000>;
reg-names = "cti-base";
@@ -1644,8 +1677,8 @@
};
cti0: cti@8010000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8010000 0x1000>;
reg-names = "cti-base";
@@ -1656,8 +1689,8 @@
};
cti1: cti@8011000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8011000 0x1000>;
reg-names = "cti-base";
@@ -1668,8 +1701,8 @@
};
cti10: cti@801a000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x801a000 0x1000>;
reg-names = "cti-base";
@@ -1680,8 +1713,8 @@
};
cti11: cti@801b000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x801b000 0x1000>;
reg-names = "cti-base";
@@ -1692,8 +1725,8 @@
};
cti12: cti@801c000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x801c000 0x1000>;
reg-names = "cti-base";
@@ -1704,8 +1737,8 @@
};
cti13: cti@801d000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x801d000 0x1000>;
reg-names = "cti-base";
@@ -1716,8 +1749,8 @@
};
cti14: cti@801e000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x801e000 0x1000>;
reg-names = "cti-base";
@@ -1728,8 +1761,8 @@
};
cti15: cti@801f000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x801f000 0x1000>;
reg-names = "cti-base";
@@ -1740,8 +1773,8 @@
};
cti2: cti@8012000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8012000 0x1000>;
reg-names = "cti-base";
@@ -1752,8 +1785,8 @@
};
cti3: cti@8013000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8013000 0x1000>;
reg-names = "cti-base";
@@ -1764,8 +1797,8 @@
};
cti4: cti@8014000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8014000 0x1000>;
reg-names = "cti-base";
@@ -1776,8 +1809,8 @@
};
cti5: cti@8015000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8015000 0x1000>;
reg-names = "cti-base";
@@ -1788,8 +1821,8 @@
};
cti6: cti@8016000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8016000 0x1000>;
reg-names = "cti-base";
@@ -1800,8 +1833,8 @@
};
cti7: cti@8017000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8017000 0x1000>;
reg-names = "cti-base";
@@ -1812,8 +1845,8 @@
};
cti8: cti@8018000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8018000 0x1000>;
reg-names = "cti-base";
@@ -1824,8 +1857,8 @@
};
cti9: cti@8019000 {
compatible = "arm,primecell";
arm,primecell-periphid = <0x000bb966>;
compatible = "arm,coresight-cti", "arm,primecell";
arm,primecell-periphid = <0x000bb922>;
reg = <0x8019000 0x1000>;
reg-names = "cti-base";