Skip to content

L
linux
Commit 1a9e7796 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Chunyan Zhang
Browse files
Options

arm64: dts: sc9836/sc9860: Update coresight bindings for hardware ports 

Switch to the new coresight bindings for hw ports

Cc: orsonzhai@gmail.com
Cc: zhang.lyra@gmail.com
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarChunyan Zhang <chunyan.zhang@unisoc.com>
parent 65102238
Show whitespace changes
Inline Side-by-side
Showing with 151 additions and 142 deletions
arch/arm64/boot/dts/sprd/sc9836.dtsi
View file @ 1a9e7796
...@@ -50,68 +50,64 @@ etf@10003000 { ...@@ -50,68 +50,64 @@ etf@10003000 {
reg = <0 0x10003000 0 0x1000>; reg = <0 0x10003000 0 0x1000>;
clocks = <&clk26mhz>; clocks = <&clk26mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
in-ports {
port { port {
etf_in: endpoint { etf_in: endpoint {
slave-mode;
remote-endpoint = <&funnel_out_port0>; remote-endpoint = <&funnel_out_port0>;
}; };
}; };
}; };
};
funnel@10001000 { funnel@10001000 {
compatible = "arm,coresight-funnel", "arm,primecell"; compatible = "arm,coresight-funnel", "arm,primecell";
reg = <0 0x10001000 0 0x1000>; reg = <0 0x10001000 0 0x1000>;
clocks = <&clk26mhz>; clocks = <&clk26mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
ports {
#address-cells = <1>;
#size-cells = <0>;
/* funnel output port */ out-ports {
port@0 { port {
reg = <0>;
funnel_out_port0: endpoint { funnel_out_port0: endpoint {
remote-endpoint = <&etf_in>; remote-endpoint = <&etf_in>;
}; };
}; };
};
/* funnel input port 0-4 */ in-ports {
port@1 { #address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>; reg = <0>;
funnel_in_port0: endpoint { funnel_in_port0: endpoint {
slave-mode;
remote-endpoint = <&etm0_out>; remote-endpoint = <&etm0_out>;
}; };
}; };
port@2 { port@1 {
reg = <1>; reg = <1>;
funnel_in_port1: endpoint { funnel_in_port1: endpoint {
slave-mode;
remote-endpoint = <&etm1_out>; remote-endpoint = <&etm1_out>;
}; };
}; };
port@3 { port@2 {
reg = <2>; reg = <2>;
funnel_in_port2: endpoint { funnel_in_port2: endpoint {
slave-mode;
remote-endpoint = <&etm2_out>; remote-endpoint = <&etm2_out>;
}; };
}; };
port@4 { port@3 {
reg = <3>; reg = <3>;
funnel_in_port3: endpoint { funnel_in_port3: endpoint {
slave-mode;
remote-endpoint = <&etm3_out>; remote-endpoint = <&etm3_out>;
}; };
}; };
port@5 { port@4 {
reg = <4>; reg = <4>;
funnel_in_port4: endpoint { funnel_in_port4: endpoint {
slave-mode;
remote-endpoint = <&stm_out>; remote-endpoint = <&stm_out>;
}; };
}; };
...@@ -126,12 +122,14 @@ etm@10440000 { ...@@ -126,12 +122,14 @@ etm@10440000 {
cpu = <&cpu0>; cpu = <&cpu0>;
clocks = <&clk26mhz>; clocks = <&clk26mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm0_out: endpoint { etm0_out: endpoint {
remote-endpoint = <&funnel_in_port0>; remote-endpoint = <&funnel_in_port0>;
}; };
}; };
}; };
};
etm@10540000 { etm@10540000 {
compatible = "arm,coresight-etm4x", "arm,primecell"; compatible = "arm,coresight-etm4x", "arm,primecell";
...@@ -140,12 +138,14 @@ etm@10540000 { ...@@ -140,12 +138,14 @@ etm@10540000 {
cpu = <&cpu1>; cpu = <&cpu1>;
clocks = <&clk26mhz>; clocks = <&clk26mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm1_out: endpoint { etm1_out: endpoint {
remote-endpoint = <&funnel_in_port1>; remote-endpoint = <&funnel_in_port1>;
}; };
}; };
}; };
};
etm@10640000 { etm@10640000 {
compatible = "arm,coresight-etm4x", "arm,primecell"; compatible = "arm,coresight-etm4x", "arm,primecell";
...@@ -154,12 +154,14 @@ etm@10640000 { ...@@ -154,12 +154,14 @@ etm@10640000 {
cpu = <&cpu2>; cpu = <&cpu2>;
clocks = <&clk26mhz>; clocks = <&clk26mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm2_out: endpoint { etm2_out: endpoint {
remote-endpoint = <&funnel_in_port2>; remote-endpoint = <&funnel_in_port2>;
}; };
}; };
}; };
};
etm@10740000 { etm@10740000 {
compatible = "arm,coresight-etm4x", "arm,primecell"; compatible = "arm,coresight-etm4x", "arm,primecell";
...@@ -168,12 +170,14 @@ etm@10740000 { ...@@ -168,12 +170,14 @@ etm@10740000 {
cpu = <&cpu3>; cpu = <&cpu3>;
clocks = <&clk26mhz>; clocks = <&clk26mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm3_out: endpoint { etm3_out: endpoint {
remote-endpoint = <&funnel_in_port3>; remote-endpoint = <&funnel_in_port3>;
}; };
}; };
}; };
};
stm@10006000 { stm@10006000 {
compatible = "arm,coresight-stm", "arm,primecell"; compatible = "arm,coresight-stm", "arm,primecell";
...@@ -182,12 +186,14 @@ stm@10006000 { ...@@ -182,12 +186,14 @@ stm@10006000 {
reg-names = "stm-base", "stm-stimulus-base"; reg-names = "stm-base", "stm-stimulus-base";
clocks = <&clk26mhz>; clocks = <&clk26mhz>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
stm_out: endpoint { stm_out: endpoint {
remote-endpoint = <&funnel_in_port4>; remote-endpoint = <&funnel_in_port4>;
}; };
}; };
}; };
};
gic: interrupt-controller@12001000 { gic: interrupt-controller@12001000 {
compatible = "arm,gic-400"; compatible = "arm,gic-400";
......
arch/arm64/boot/dts/sprd/sc9860.dtsi
View file @ 1a9e7796
...@@ -304,30 +304,29 @@ funnel@10001000 { /* SoC Funnel */ ...@@ -304,30 +304,29 @@ funnel@10001000 { /* SoC Funnel */
reg = <0 0x10001000 0 0x1000>; reg = <0 0x10001000 0 0x1000>;
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
ports { out-ports {
#address-cells = <1>; port {
#size-cells = <0>;
port@0 {
reg = <0>;
soc_funnel_out_port: endpoint { soc_funnel_out_port: endpoint {
remote-endpoint = <&etb_in>; remote-endpoint = <&etb_in>;
}; };
}; };
};
port@1 { in-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>; reg = <0>;
soc_funnel_in_port0: endpoint { soc_funnel_in_port0: endpoint {
slave-mode;
remote-endpoint = remote-endpoint =
<&main_funnel_out_port>; <&main_funnel_out_port>;
}; };
}; };
port@2 { port@4 {
reg = <4>; reg = <4>;
soc_funnel_in_port1: endpoint { soc_funnel_in_port1: endpoint {
slave-mode;
remote-endpoint = remote-endpoint =
<&stm_out_port>; <&stm_out_port>;
}; };
...@@ -340,14 +339,15 @@ etb@10003000 { ...@@ -340,14 +339,15 @@ etb@10003000 {
reg = <0 0x10003000 0 0x1000>; reg = <0 0x10003000 0 0x1000>;
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etb_in: endpoint { etb_in: endpoint {
slave-mode;
remote-endpoint = remote-endpoint =
<&soc_funnel_out_port>; <&soc_funnel_out_port>;
}; };
}; };
}; };
};
stm@10006000 { stm@10006000 {
compatible = "arm,coresight-stm", "arm,primecell"; compatible = "arm,coresight-stm", "arm,primecell";
...@@ -356,6 +356,7 @@ stm@10006000 { ...@@ -356,6 +356,7 @@ stm@10006000 {
reg-names = "stm-base", "stm-stimulus-base"; reg-names = "stm-base", "stm-stimulus-base";
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
stm_out_port: endpoint { stm_out_port: endpoint {
remote-endpoint = remote-endpoint =
...@@ -363,44 +364,43 @@ stm_out_port: endpoint { ...@@ -363,44 +364,43 @@ stm_out_port: endpoint {
}; };
}; };
}; };
};
funnel@11001000 { /* Cluster0 Funnel */ funnel@11001000 { /* Cluster0 Funnel */
compatible = "arm,coresight-funnel", "arm,primecell"; compatible = "arm,coresight-funnel", "arm,primecell";
reg = <0 0x11001000 0 0x1000>; reg = <0 0x11001000 0 0x1000>;
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
ports { out-ports {
#address-cells = <1>; port {
#size-cells = <0>;
port@0 {
reg = <0>;
cluster0_funnel_out_port: endpoint { cluster0_funnel_out_port: endpoint {
remote-endpoint = remote-endpoint =
<&cluster0_etf_in>; <&cluster0_etf_in>;
}; };
}; };
};
port@1 { in-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>; reg = <0>;
cluster0_funnel_in_port0: endpoint { cluster0_funnel_in_port0: endpoint {
slave-mode;
remote-endpoint = <&etm0_out>; remote-endpoint = <&etm0_out>;
}; };
}; };
port@2 { port@1 {
reg = <1>; reg = <1>;
cluster0_funnel_in_port1: endpoint { cluster0_funnel_in_port1: endpoint {
slave-mode;
remote-endpoint = <&etm1_out>; remote-endpoint = <&etm1_out>;
}; };
}; };
port@3 { port@2 {
reg = <2>; reg = <2>;
cluster0_funnel_in_port2: endpoint { cluster0_funnel_in_port2: endpoint {
slave-mode;
remote-endpoint = <&etm2_out>; remote-endpoint = <&etm2_out>;
}; };
}; };
...@@ -408,7 +408,6 @@ cluster0_funnel_in_port2: endpoint { ...@@ -408,7 +408,6 @@ cluster0_funnel_in_port2: endpoint {
port@4 { port@4 {
reg = <4>; reg = <4>;
cluster0_funnel_in_port3: endpoint { cluster0_funnel_in_port3: endpoint {
slave-mode;
remote-endpoint = <&etm3_out>; remote-endpoint = <&etm3_out>;
}; };
}; };
...@@ -420,46 +419,43 @@ funnel@11002000 { /* Cluster1 Funnel */ ...@@ -420,46 +419,43 @@ funnel@11002000 { /* Cluster1 Funnel */
reg = <0 0x11002000 0 0x1000>; reg = <0 0x11002000 0 0x1000>;
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
ports { out-ports {
#address-cells = <1>; port {
#size-cells = <0>;
port@0 {
reg = <0>;
cluster1_funnel_out_port: endpoint { cluster1_funnel_out_port: endpoint {
remote-endpoint = remote-endpoint =
<&cluster1_etf_in>; <&cluster1_etf_in>;
}; };
}; };
};
port@1 { in-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>; reg = <0>;
cluster1_funnel_in_port0: endpoint { cluster1_funnel_in_port0: endpoint {
slave-mode;
remote-endpoint = <&etm4_out>; remote-endpoint = <&etm4_out>;
}; };
}; };
port@2 { port@1 {
reg = <1>; reg = <1>;
cluster1_funnel_in_port1: endpoint { cluster1_funnel_in_port1: endpoint {
slave-mode;
remote-endpoint = <&etm5_out>; remote-endpoint = <&etm5_out>;
}; };
}; };
port@3 { port@2 {
reg = <2>; reg = <2>;
cluster1_funnel_in_port2: endpoint { cluster1_funnel_in_port2: endpoint {
slave-mode;
remote-endpoint = <&etm6_out>; remote-endpoint = <&etm6_out>;
}; };
}; };
port@4 { port@3 {
reg = <3>; reg = <3>;
cluster1_funnel_in_port3: endpoint { cluster1_funnel_in_port3: endpoint {
slave-mode;
remote-endpoint = <&etm7_out>; remote-endpoint = <&etm7_out>;
}; };
}; };
...@@ -472,22 +468,18 @@ etf@11003000 { /* ETF on Cluster0 */ ...@@ -472,22 +468,18 @@ etf@11003000 { /* ETF on Cluster0 */
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
ports { out-ports {
#address-cells = <1>; port {
#size-cells = <0>;
port@0 {
reg = <0>;
cluster0_etf_out: endpoint { cluster0_etf_out: endpoint {
remote-endpoint = remote-endpoint =
<&main_funnel_in_port0>; <&main_funnel_in_port0>;
}; };
}; };
};
port@1 { in-ports {
reg = <0>; port {
cluster0_etf_in: endpoint { cluster0_etf_in: endpoint {
slave-mode;
remote-endpoint = remote-endpoint =
<&cluster0_funnel_out_port>; <&cluster0_funnel_out_port>;
}; };
...@@ -501,22 +493,18 @@ etf@11004000 { /* ETF on Cluster1 */ ...@@ -501,22 +493,18 @@ etf@11004000 { /* ETF on Cluster1 */
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
ports { out-ports {
#address-cells = <1>; port {
#size-cells = <0>;
port@0 {
reg = <0>;
cluster1_etf_out: endpoint { cluster1_etf_out: endpoint {
remote-endpoint = remote-endpoint =
<&main_funnel_in_port1>; <&main_funnel_in_port1>;
}; };
}; };
};
port@1 { in-ports {
reg = <0>; port {
cluster1_etf_in: endpoint { cluster1_etf_in: endpoint {
slave-mode;
remote-endpoint = remote-endpoint =
<&cluster1_funnel_out_port>; <&cluster1_funnel_out_port>;
}; };
...@@ -530,31 +518,30 @@ funnel@11005000 { /* Main Funnel */ ...@@ -530,31 +518,30 @@ funnel@11005000 { /* Main Funnel */
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
ports { out-ports {
#address-cells = <1>; port {
#size-cells = <0>;
port@0 {
reg = <0>;
main_funnel_out_port: endpoint { main_funnel_out_port: endpoint {
remote-endpoint = remote-endpoint =
<&soc_funnel_in_port0>; <&soc_funnel_in_port0>;
}; };
}; };
};
port@1 { in-ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>; reg = <0>;
main_funnel_in_port0: endpoint { main_funnel_in_port0: endpoint {
slave-mode;
remote-endpoint = remote-endpoint =
<&cluster0_etf_out>; <&cluster0_etf_out>;
}; };
}; };
port@2 { port@1 {
reg = <1>; reg = <1>;
main_funnel_in_port1: endpoint { main_funnel_in_port1: endpoint {
slave-mode;
remote-endpoint = remote-endpoint =
<&cluster1_etf_out>; <&cluster1_etf_out>;
}; };
...@@ -569,6 +556,7 @@ etm@11440000 { ...@@ -569,6 +556,7 @@ etm@11440000 {
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm0_out: endpoint { etm0_out: endpoint {
remote-endpoint = remote-endpoint =
...@@ -576,6 +564,7 @@ etm0_out: endpoint { ...@@ -576,6 +564,7 @@ etm0_out: endpoint {
}; };
}; };
}; };
};
etm@11540000 { etm@11540000 {
compatible = "arm,coresight-etm4x", "arm,primecell"; compatible = "arm,coresight-etm4x", "arm,primecell";
...@@ -584,6 +573,7 @@ etm@11540000 { ...@@ -584,6 +573,7 @@ etm@11540000 {
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm1_out: endpoint { etm1_out: endpoint {
remote-endpoint = remote-endpoint =
...@@ -591,6 +581,7 @@ etm1_out: endpoint { ...@@ -591,6 +581,7 @@ etm1_out: endpoint {
}; };
}; };
}; };
};
etm@11640000 { etm@11640000 {
compatible = "arm,coresight-etm4x", "arm,primecell"; compatible = "arm,coresight-etm4x", "arm,primecell";
...@@ -599,6 +590,7 @@ etm@11640000 { ...@@ -599,6 +590,7 @@ etm@11640000 {
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm2_out: endpoint { etm2_out: endpoint {
remote-endpoint = remote-endpoint =
...@@ -606,6 +598,7 @@ etm2_out: endpoint { ...@@ -606,6 +598,7 @@ etm2_out: endpoint {
}; };
}; };
}; };
};
etm@11740000 { etm@11740000 {
compatible = "arm,coresight-etm4x", "arm,primecell"; compatible = "arm,coresight-etm4x", "arm,primecell";
...@@ -614,6 +607,7 @@ etm@11740000 { ...@@ -614,6 +607,7 @@ etm@11740000 {
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm3_out: endpoint { etm3_out: endpoint {
remote-endpoint = remote-endpoint =
...@@ -621,6 +615,7 @@ etm3_out: endpoint { ...@@ -621,6 +615,7 @@ etm3_out: endpoint {
}; };
}; };
}; };
};
etm@11840000 { etm@11840000 {
compatible = "arm,coresight-etm4x", "arm,primecell"; compatible = "arm,coresight-etm4x", "arm,primecell";
...@@ -629,6 +624,7 @@ etm@11840000 { ...@@ -629,6 +624,7 @@ etm@11840000 {
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm4_out: endpoint { etm4_out: endpoint {
remote-endpoint = remote-endpoint =
...@@ -636,6 +632,7 @@ etm4_out: endpoint { ...@@ -636,6 +632,7 @@ etm4_out: endpoint {
}; };
}; };
}; };
};
etm@11940000 { etm@11940000 {
compatible = "arm,coresight-etm4x", "arm,primecell"; compatible = "arm,coresight-etm4x", "arm,primecell";
...@@ -644,6 +641,7 @@ etm@11940000 { ...@@ -644,6 +641,7 @@ etm@11940000 {
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm5_out: endpoint { etm5_out: endpoint {
remote-endpoint = remote-endpoint =
...@@ -651,6 +649,7 @@ etm5_out: endpoint { ...@@ -651,6 +649,7 @@ etm5_out: endpoint {
}; };
}; };
}; };
};
etm@11a40000 { etm@11a40000 {
compatible = "arm,coresight-etm4x", "arm,primecell"; compatible = "arm,coresight-etm4x", "arm,primecell";
...@@ -659,6 +658,7 @@ etm@11a40000 { ...@@ -659,6 +658,7 @@ etm@11a40000 {
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm6_out: endpoint { etm6_out: endpoint {
remote-endpoint = remote-endpoint =
...@@ -666,6 +666,7 @@ etm6_out: endpoint { ...@@ -666,6 +666,7 @@ etm6_out: endpoint {
}; };
}; };
}; };
};
etm@11b40000 { etm@11b40000 {
compatible = "arm,coresight-etm4x", "arm,primecell"; compatible = "arm,coresight-etm4x", "arm,primecell";
...@@ -674,6 +675,7 @@ etm@11b40000 { ...@@ -674,6 +675,7 @@ etm@11b40000 {
clocks = <&ext_26m>; clocks = <&ext_26m>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm7_out: endpoint { etm7_out: endpoint {
remote-endpoint = remote-endpoint =
...@@ -681,6 +683,7 @@ etm7_out: endpoint { ...@@ -681,6 +683,7 @@ etm7_out: endpoint {
}; };
}; };
}; };
};
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
......
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