Skip to content

Commit 19ac17c

Browse files
committed
arm64: dts: juno: refactor CoreSight support on Juno r0
Currently the Coresight components are supported only on Juno r0 variant. In preparation to add support to Juno r1/r2 variants, this patch refactors the existing coresight device nodes so that r1/r2 support can be added easily. It also cleans up some of the device node names which were previously named so as they were confused as the labels rather than the node names. Reviewed-and-tested-by: Mathieu Poirier <[email protected]> Signed-off-by: Sudeep Holla <[email protected]>
1 parent d29e849 commit 19ac17c

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

arch/arm64/boot/dts/arm/juno-base.dtsi

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
* The actual size is just 4K though 64K is reserved. Access to the
8787
* unmapped reserved region results in a DECERR response.
8888
*/
89-
etf@20010000 {
89+
etf@20010000 { /* etf0 */
9090
compatible = "arm,coresight-tmc", "arm,primecell";
9191
reg = <0 0x20010000 0 0x1000>;
9292

@@ -100,7 +100,7 @@
100100
/* input port */
101101
port@0 {
102102
reg = <0>;
103-
etf_in_port: endpoint {
103+
etf0_in_port: endpoint {
104104
slave-mode;
105105
remote-endpoint = <&main_funnel_out_port>;
106106
};
@@ -109,8 +109,7 @@
109109
/* output port */
110110
port@1 {
111111
reg = <0>;
112-
etf_out_port: endpoint {
113-
remote-endpoint = <&replicator_in_port0>;
112+
etf0_out_port: endpoint {
114113
};
115114
};
116115
};
@@ -131,7 +130,8 @@
131130
};
132131
};
133132

134-
main-funnel@20040000 {
133+
/* main funnel on Juno r0, cssys0 funnel on Juno r1/r2 as per TRM*/
134+
main_funnel: funnel@20040000 {
135135
compatible = "arm,coresight-funnel", "arm,primecell";
136136
reg = <0 0x20040000 0 0x1000>;
137137

@@ -142,13 +142,15 @@
142142
#address-cells = <1>;
143143
#size-cells = <0>;
144144

145+
/* output port */
145146
port@0 {
146147
reg = <0>;
147148
main_funnel_out_port: endpoint {
148-
remote-endpoint = <&etf_in_port>;
149+
remote-endpoint = <&etf0_in_port>;
149150
};
150151
};
151152

153+
/* input ports */
152154
port@1 {
153155
reg = <0>;
154156
main_funnel_in_port0: endpoint {
@@ -164,7 +166,6 @@
164166
remote-endpoint = <&cluster1_funnel_out_port>;
165167
};
166168
};
167-
168169
};
169170
};
170171

@@ -198,7 +199,7 @@
198199
};
199200
};
200201

201-
cluster0-funnel@220c0000 {
202+
funnel@220c0000 { /* cluster0 funnel */
202203
compatible = "arm,coresight-funnel", "arm,primecell";
203204
reg = <0 0x220c0000 0 0x1000>;
204205

@@ -262,7 +263,7 @@
262263
};
263264
};
264265

265-
cluster1-funnel@230c0000 {
266+
funnel@230c0000 { /* cluster1 funnel */
266267
compatible = "arm,coresight-funnel", "arm,primecell";
267268
reg = <0 0x230c0000 0 0x1000>;
268269

@@ -385,7 +386,6 @@
385386
reg = <0>;
386387
replicator_in_port0: endpoint {
387388
slave-mode;
388-
remote-endpoint = <&etf_out_port>;
389389
};
390390
};
391391
};

arch/arm64/boot/dts/arm/juno.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,3 +202,11 @@
202202
&etm5 {
203203
cpu = <&A53_3>;
204204
};
205+
206+
&etf0_out_port {
207+
remote-endpoint = <&replicator_in_port0>;
208+
};
209+
210+
&replicator_in_port0 {
211+
remote-endpoint = <&etf0_out_port>;
212+
};

0 commit comments

Comments
 (0)