Commit 11c99479 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'vexpress-updates-4.20' of...

Merge tag 'vexpress-updates-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/dt

ARMv7 Vexpress updates for v4.20

Single patch to use updated coresight graph bindings thereby removing
loads of dtc warnings

* tag 'vexpress-updates-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  ARM: dts: vexpress/TC2: Update entries to match latest coresight bindings
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f1977a9b 14356965
...@@ -393,13 +393,14 @@ etb@20010000 { ...@@ -393,13 +393,14 @@ etb@20010000 {
clocks = <&oscclk6a>; clocks = <&oscclk6a>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
in-ports {
port { port {
etb_in_port: endpoint { etb_in_port: endpoint {
slave-mode;
remote-endpoint = <&replicator_out_port0>; remote-endpoint = <&replicator_out_port0>;
}; };
}; };
}; };
};
tpiu@20030000 { tpiu@20030000 {
compatible = "arm,coresight-tpiu", "arm,primecell"; compatible = "arm,coresight-tpiu", "arm,primecell";
...@@ -407,13 +408,14 @@ tpiu@20030000 { ...@@ -407,13 +408,14 @@ tpiu@20030000 {
clocks = <&oscclk6a>; clocks = <&oscclk6a>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
in-ports {
port { port {
tpiu_in_port: endpoint { tpiu_in_port: endpoint {
slave-mode;
remote-endpoint = <&replicator_out_port1>; remote-endpoint = <&replicator_out_port1>;
}; };
}; };
}; };
};
replicator { replicator {
/* non-configurable replicators don't show up on the /* non-configurable replicators don't show up on the
...@@ -421,11 +423,10 @@ replicator { ...@@ -421,11 +423,10 @@ replicator {
*/ */
compatible = "arm,coresight-replicator"; compatible = "arm,coresight-replicator";
ports { out-ports {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
/* replicator output ports */
port@0 { port@0 {
reg = <0>; reg = <0>;
replicator_out_port0: endpoint { replicator_out_port0: endpoint {
...@@ -439,12 +440,11 @@ replicator_out_port1: endpoint { ...@@ -439,12 +440,11 @@ replicator_out_port1: endpoint {
remote-endpoint = <&tpiu_in_port>; remote-endpoint = <&tpiu_in_port>;
}; };
}; };
};
/* replicator input port */ in-ports {
port@2 { port {
reg = <0>;
replicator_in_port0: endpoint { replicator_in_port0: endpoint {
slave-mode;
remote-endpoint = <&funnel_out_port0>; remote-endpoint = <&funnel_out_port0>;
}; };
}; };
...@@ -457,40 +457,36 @@ funnel@20040000 { ...@@ -457,40 +457,36 @@ funnel@20040000 {
clocks = <&oscclk6a>; clocks = <&oscclk6a>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
ports { out-ports {
#address-cells = <1>; port {
#size-cells = <0>;
/* funnel output port */
port@0 {
reg = <0>;
funnel_out_port0: endpoint { funnel_out_port0: endpoint {
remote-endpoint = remote-endpoint =
<&replicator_in_port0>; <&replicator_in_port0>;
}; };
}; };
};
/* funnel input ports */ 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 = <&ptm0_out_port>; remote-endpoint = <&ptm0_out_port>;
}; };
}; };
port@2 { port@1 {
reg = <1>; reg = <1>;
funnel_in_port1: endpoint { funnel_in_port1: endpoint {
slave-mode;
remote-endpoint = <&ptm1_out_port>; remote-endpoint = <&ptm1_out_port>;
}; };
}; };
port@3 { port@2 {
reg = <2>; reg = <2>;
funnel_in_port2: endpoint { funnel_in_port2: endpoint {
slave-mode;
remote-endpoint = <&etm0_out_port>; remote-endpoint = <&etm0_out_port>;
}; };
}; };
...@@ -500,7 +496,6 @@ funnel_in_port2: endpoint { ...@@ -500,7 +496,6 @@ funnel_in_port2: endpoint {
port@4 { port@4 {
reg = <4>; reg = <4>;
funnel_in_port4: endpoint { funnel_in_port4: endpoint {
slave-mode;
remote-endpoint = <&etm1_out_port>; remote-endpoint = <&etm1_out_port>;
}; };
}; };
...@@ -508,7 +503,6 @@ funnel_in_port4: endpoint { ...@@ -508,7 +503,6 @@ funnel_in_port4: endpoint {
port@5 { port@5 {
reg = <5>; reg = <5>;
funnel_in_port5: endpoint { funnel_in_port5: endpoint {
slave-mode;
remote-endpoint = <&etm2_out_port>; remote-endpoint = <&etm2_out_port>;
}; };
}; };
...@@ -522,12 +516,14 @@ ptm@2201c000 { ...@@ -522,12 +516,14 @@ ptm@2201c000 {
cpu = <&cpu0>; cpu = <&cpu0>;
clocks = <&oscclk6a>; clocks = <&oscclk6a>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
ptm0_out_port: endpoint { ptm0_out_port: endpoint {
remote-endpoint = <&funnel_in_port0>; remote-endpoint = <&funnel_in_port0>;
}; };
}; };
}; };
};
ptm@2201d000 { ptm@2201d000 {
compatible = "arm,coresight-etm3x", "arm,primecell"; compatible = "arm,coresight-etm3x", "arm,primecell";
...@@ -536,12 +532,14 @@ ptm@2201d000 { ...@@ -536,12 +532,14 @@ ptm@2201d000 {
cpu = <&cpu1>; cpu = <&cpu1>;
clocks = <&oscclk6a>; clocks = <&oscclk6a>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
ptm1_out_port: endpoint { ptm1_out_port: endpoint {
remote-endpoint = <&funnel_in_port1>; remote-endpoint = <&funnel_in_port1>;
}; };
}; };
}; };
};
etm@2203c000 { etm@2203c000 {
compatible = "arm,coresight-etm3x", "arm,primecell"; compatible = "arm,coresight-etm3x", "arm,primecell";
...@@ -550,12 +548,14 @@ etm@2203c000 { ...@@ -550,12 +548,14 @@ etm@2203c000 {
cpu = <&cpu2>; cpu = <&cpu2>;
clocks = <&oscclk6a>; clocks = <&oscclk6a>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm0_out_port: endpoint { etm0_out_port: endpoint {
remote-endpoint = <&funnel_in_port2>; remote-endpoint = <&funnel_in_port2>;
}; };
}; };
}; };
};
etm@2203d000 { etm@2203d000 {
compatible = "arm,coresight-etm3x", "arm,primecell"; compatible = "arm,coresight-etm3x", "arm,primecell";
...@@ -564,12 +564,14 @@ etm@2203d000 { ...@@ -564,12 +564,14 @@ etm@2203d000 {
cpu = <&cpu3>; cpu = <&cpu3>;
clocks = <&oscclk6a>; clocks = <&oscclk6a>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm1_out_port: endpoint { etm1_out_port: endpoint {
remote-endpoint = <&funnel_in_port4>; remote-endpoint = <&funnel_in_port4>;
}; };
}; };
}; };
};
etm@2203e000 { etm@2203e000 {
compatible = "arm,coresight-etm3x", "arm,primecell"; compatible = "arm,coresight-etm3x", "arm,primecell";
...@@ -578,12 +580,14 @@ etm@2203e000 { ...@@ -578,12 +580,14 @@ etm@2203e000 {
cpu = <&cpu4>; cpu = <&cpu4>;
clocks = <&oscclk6a>; clocks = <&oscclk6a>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
out-ports {
port { port {
etm2_out_port: endpoint { etm2_out_port: endpoint {
remote-endpoint = <&funnel_in_port5>; remote-endpoint = <&funnel_in_port5>;
}; };
}; };
}; };
};
smb: smb@8000000 { smb: smb@8000000 {
compatible = "simple-bus"; compatible = "simple-bus";
......
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