Skip to content

L
linux
Commit ca02f96b authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Andy Gross
Browse files
Options

ARM: dts: qcom: Update coresight bindings for hardware ports 

Switch to the new hardware port bindings for coresight

Cc: Andy Gross <andy.gross@linaro.org>
Cc: David Brown <david.brown@linaro.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
parent 703e699d
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 79 deletions
arch/arm/boot/dts/qcom-apq8064.dtsi
View file @ ca02f96b
...@@ -1611,10 +1611,11 @@ etb@1a01000 { ...@@ -1611,10 +1611,11 @@ etb@1a01000 {
clocks = <&rpmcc RPM_QDSS_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
port { in-ports {
etb_in: endpoint { port {
slave-mode; etb_in: endpoint {
remote-endpoint = <&replicator_out0>; remote-endpoint = <&replicator_out0>;
};
}; };
}; };
}; };
...@@ -1626,10 +1627,11 @@ tpiu@1a03000 { ...@@ -1626,10 +1627,11 @@ tpiu@1a03000 {
clocks = <&rpmcc RPM_QDSS_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
port { in-ports {
tpiu_in: endpoint { port {
slave-mode; tpiu_in: endpoint {
remote-endpoint = <&replicator_out1>; remote-endpoint = <&replicator_out1>;
};
}; };
}; };
}; };
...@@ -1640,7 +1642,7 @@ replicator { ...@@ -1640,7 +1642,7 @@ replicator {
clocks = <&rpmcc RPM_QDSS_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
ports { out-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -1656,10 +1658,11 @@ replicator_out1: endpoint { ...@@ -1656,10 +1658,11 @@ replicator_out1: endpoint {
remote-endpoint = <&tpiu_in>; remote-endpoint = <&tpiu_in>;
}; };
}; };
port@2 { };
reg = <0>;
in-ports {
port {
replicator_in: endpoint { replicator_in: endpoint {
slave-mode;
remote-endpoint = <&funnel_out>; remote-endpoint = <&funnel_out>;
}; };
}; };
...@@ -1673,7 +1676,7 @@ funnel@1a04000 { ...@@ -1673,7 +1676,7 @@ funnel@1a04000 {
clocks = <&rpmcc RPM_QDSS_CLK>; clocks = <&rpmcc RPM_QDSS_CLK>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
ports { in-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -1687,33 +1690,31 @@ ports { ...@@ -1687,33 +1690,31 @@ ports {
port@0 { port@0 {
reg = <0>; reg = <0>;
funnel_in0: endpoint { funnel_in0: endpoint {
slave-mode;
remote-endpoint = <&etm0_out>; remote-endpoint = <&etm0_out>;
}; };
}; };
port@1 { port@1 {
reg = <1>; reg = <1>;
funnel_in1: endpoint { funnel_in1: endpoint {
slave-mode;
remote-endpoint = <&etm1_out>; remote-endpoint = <&etm1_out>;
}; };
}; };
port@4 { port@4 {
reg = <4>; reg = <4>;
funnel_in4: endpoint { funnel_in4: endpoint {
slave-mode;
remote-endpoint = <&etm2_out>; remote-endpoint = <&etm2_out>;
}; };
}; };
port@5 { port@5 {
reg = <5>; reg = <5>;
funnel_in5: endpoint { funnel_in5: endpoint {
slave-mode;
remote-endpoint = <&etm3_out>; remote-endpoint = <&etm3_out>;
}; };
}; };
port@8 { };
reg = <0>;
out-ports {
port {
funnel_out: endpoint { funnel_out: endpoint {
remote-endpoint = <&replicator_in>; remote-endpoint = <&replicator_in>;
}; };
...@@ -1730,9 +1731,11 @@ etm@1a1c000 { ...@@ -1730,9 +1731,11 @@ etm@1a1c000 {
cpu = <&CPU0>; cpu = <&CPU0>;
port { out-ports {
etm0_out: endpoint { port {
remote-endpoint = <&funnel_in0>; etm0_out: endpoint {
remote-endpoint = <&funnel_in0>;
};
}; };
}; };
}; };
...@@ -1746,9 +1749,11 @@ etm@1a1d000 { ...@@ -1746,9 +1749,11 @@ etm@1a1d000 {
cpu = <&CPU1>; cpu = <&CPU1>;
port { out-ports {
etm1_out: endpoint { port {
remote-endpoint = <&funnel_in1>; etm1_out: endpoint {
remote-endpoint = <&funnel_in1>;
};
}; };
}; };
}; };
...@@ -1762,9 +1767,11 @@ etm@1a1e000 { ...@@ -1762,9 +1767,11 @@ etm@1a1e000 {
cpu = <&CPU2>; cpu = <&CPU2>;
port { out-ports {
etm2_out: endpoint { port {
remote-endpoint = <&funnel_in4>; etm2_out: endpoint {
remote-endpoint = <&funnel_in4>;
};
}; };
}; };
}; };
...@@ -1778,9 +1785,11 @@ etm@1a1f000 { ...@@ -1778,9 +1785,11 @@ etm@1a1f000 {
cpu = <&CPU3>; cpu = <&CPU3>;
port { out-ports {
etm3_out: endpoint { port {
remote-endpoint = <&funnel_in5>; etm3_out: endpoint {
remote-endpoint = <&funnel_in5>;
};
}; };
}; };
}; };
......
arch/arm/boot/dts/qcom-msm8974.dtsi
View file @ ca02f96b
...@@ -794,10 +794,11 @@ etr@fc322000 { ...@@ -794,10 +794,11 @@ etr@fc322000 {
clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>; clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
clock-names = "apb_pclk", "atclk"; clock-names = "apb_pclk", "atclk";
port { in-ports {
etr_in: endpoint { port {
slave-mode; etr_in: endpoint {
remote-endpoint = <&replicator_out0>; remote-endpoint = <&replicator_out0>;
};
}; };
}; };
}; };
...@@ -809,10 +810,11 @@ tpiu@fc318000 { ...@@ -809,10 +810,11 @@ tpiu@fc318000 {
clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>; clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
clock-names = "apb_pclk", "atclk"; clock-names = "apb_pclk", "atclk";
port { in-ports {
tpiu_in: endpoint { port {
slave-mode; tpiu_in: endpoint {
remote-endpoint = <&replicator_out1>; remote-endpoint = <&replicator_out1>;
};
}; };
}; };
}; };
...@@ -824,7 +826,7 @@ replicator@fc31c000 { ...@@ -824,7 +826,7 @@ replicator@fc31c000 {
clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>; clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
clock-names = "apb_pclk", "atclk"; clock-names = "apb_pclk", "atclk";
ports { out-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -840,10 +842,11 @@ replicator_out1: endpoint { ...@@ -840,10 +842,11 @@ replicator_out1: endpoint {
remote-endpoint = <&tpiu_in>; remote-endpoint = <&tpiu_in>;
}; };
}; };
port@2 { };
reg = <0>;
in-ports {
port {
replicator_in: endpoint { replicator_in: endpoint {
slave-mode;
remote-endpoint = <&etf_out>; remote-endpoint = <&etf_out>;
}; };
}; };
...@@ -857,20 +860,17 @@ etf@fc307000 { ...@@ -857,20 +860,17 @@ etf@fc307000 {
clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>; clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
clock-names = "apb_pclk", "atclk"; clock-names = "apb_pclk", "atclk";
ports { out-ports {
#address-cells = <1>; port {
#size-cells = <0>;
port@0 {
reg = <0>;
etf_out: endpoint { etf_out: endpoint {
remote-endpoint = <&replicator_in>; remote-endpoint = <&replicator_in>;
}; };
}; };
port@1 { };
reg = <0>;
in-ports {
port {
etf_in: endpoint { etf_in: endpoint {
slave-mode;
remote-endpoint = <&merger_out>; remote-endpoint = <&merger_out>;
}; };
}; };
...@@ -884,7 +884,7 @@ funnel@fc31b000 { ...@@ -884,7 +884,7 @@ funnel@fc31b000 {
clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>; clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
clock-names = "apb_pclk", "atclk"; clock-names = "apb_pclk", "atclk";
ports { in-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -897,12 +897,13 @@ ports { ...@@ -897,12 +897,13 @@ ports {
port@1 { port@1 {
reg = <1>; reg = <1>;
merger_in1: endpoint { merger_in1: endpoint {
slave-mode;
remote-endpoint = <&funnel1_out>; remote-endpoint = <&funnel1_out>;
}; };
}; };
port@8 { };
reg = <0>;
out-ports {
port {
merger_out: endpoint { merger_out: endpoint {
remote-endpoint = <&etf_in>; remote-endpoint = <&etf_in>;
}; };
...@@ -917,7 +918,7 @@ funnel@fc31a000 { ...@@ -917,7 +918,7 @@ funnel@fc31a000 {
clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>; clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
clock-names = "apb_pclk", "atclk"; clock-names = "apb_pclk", "atclk";
ports { in-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -934,12 +935,13 @@ ports { ...@@ -934,12 +935,13 @@ ports {
port@5 { port@5 {
reg = <5>; reg = <5>;
funnel1_in5: endpoint { funnel1_in5: endpoint {
slave-mode;
remote-endpoint = <&kpss_out>; remote-endpoint = <&kpss_out>;
}; };
}; };
port@8 { };
reg = <0>;
out-ports {
port {
funnel1_out: endpoint { funnel1_out: endpoint {
remote-endpoint = <&merger_in1>; remote-endpoint = <&merger_in1>;
}; };
...@@ -954,40 +956,38 @@ funnel@fc345000 { /* KPSS funnel only 4 inputs are used */ ...@@ -954,40 +956,38 @@ funnel@fc345000 { /* KPSS funnel only 4 inputs are used */
clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>; clocks = <&rpmcc RPM_SMD_QDSS_CLK>, <&rpmcc RPM_SMD_QDSS_A_CLK>;
clock-names = "apb_pclk", "atclk"; clock-names = "apb_pclk", "atclk";
ports { in-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
port@0 { port@0 {
reg = <0>; reg = <0>;
kpss_in0: endpoint { kpss_in0: endpoint {
slave-mode;
remote-endpoint = <&etm0_out>; remote-endpoint = <&etm0_out>;
}; };
}; };
port@1 { port@1 {
reg = <1>; reg = <1>;
kpss_in1: endpoint { kpss_in1: endpoint {
slave-mode;
remote-endpoint = <&etm1_out>; remote-endpoint = <&etm1_out>;
}; };
}; };
port@2 { port@2 {
reg = <2>; reg = <2>;
kpss_in2: endpoint { kpss_in2: endpoint {
slave-mode;
remote-endpoint = <&etm2_out>; remote-endpoint = <&etm2_out>;
}; };
}; };
port@3 { port@3 {
reg = <3>; reg = <3>;
kpss_in3: endpoint { kpss_in3: endpoint {
slave-mode;
remote-endpoint = <&etm3_out>; remote-endpoint = <&etm3_out>;
}; };
}; };
port@8 { };
reg = <0>;
out-ports {
port {
kpss_out: endpoint { kpss_out: endpoint {
remote-endpoint = <&funnel1_in5>; remote-endpoint = <&funnel1_in5>;
}; };
...@@ -1004,9 +1004,11 @@ etm@fc33c000 { ...@@ -1004,9 +1004,11 @@ etm@fc33c000 {
cpu = <&CPU0>; cpu = <&CPU0>;
port { out-ports {
etm0_out: endpoint { port {
remote-endpoint = <&kpss_in0>; etm0_out: endpoint {
remote-endpoint = <&kpss_in0>;
};
}; };
}; };
}; };
...@@ -1020,9 +1022,11 @@ etm@fc33d000 { ...@@ -1020,9 +1022,11 @@ etm@fc33d000 {
cpu = <&CPU1>; cpu = <&CPU1>;
port { out-ports {
etm1_out: endpoint { port {
remote-endpoint = <&kpss_in1>; etm1_out: endpoint {
remote-endpoint = <&kpss_in1>;
};
}; };
}; };
}; };
...@@ -1036,9 +1040,11 @@ etm@fc33e000 { ...@@ -1036,9 +1040,11 @@ etm@fc33e000 {
cpu = <&CPU2>; cpu = <&CPU2>;
port { out-ports {
etm2_out: endpoint { port {
remote-endpoint = <&kpss_in2>; etm2_out: endpoint {
remote-endpoint = <&kpss_in2>;
};
}; };
}; };
}; };
...@@ -1052,9 +1058,11 @@ etm@fc33f000 { ...@@ -1052,9 +1058,11 @@ etm@fc33f000 {
cpu = <&CPU3>; cpu = <&CPU3>;
port { out-ports {
etm3_out: endpoint { port {
remote-endpoint = <&kpss_in3>; etm3_out: endpoint {
remote-endpoint = <&kpss_in3>;
};
}; };
}; };
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7