aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/arm64/boot/dts/arm/juno-base.dtsi161
-rw-r--r--arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi52
-rw-r--r--arch/arm64/boot/dts/arm/juno.dts13
3 files changed, 105 insertions, 121 deletions
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi
index ce56a4acda4f..a418193603df 100644
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -115,22 +115,17 @@
115 clocks = <&soc_smc50mhz>; 115 clocks = <&soc_smc50mhz>;
116 clock-names = "apb_pclk"; 116 clock-names = "apb_pclk";
117 power-domains = <&scpi_devpd 0>; 117 power-domains = <&scpi_devpd 0>;
118 ports {
119 #address-cells = <1>;
120 #size-cells = <0>;
121 118
122 /* input port */ 119 in-ports {
123 port@0 { 120 port {
124 reg = <0>;
125 etf0_in_port: endpoint { 121 etf0_in_port: endpoint {
126 slave-mode;
127 remote-endpoint = <&main_funnel_out_port>; 122 remote-endpoint = <&main_funnel_out_port>;
128 }; 123 };
129 }; 124 };
125 };
130 126
131 /* output port */ 127 out-ports {
132 port@1 { 128 port {
133 reg = <0>;
134 etf0_out_port: endpoint { 129 etf0_out_port: endpoint {
135 }; 130 };
136 }; 131 };
@@ -144,10 +139,11 @@
144 clocks = <&soc_smc50mhz>; 139 clocks = <&soc_smc50mhz>;
145 clock-names = "apb_pclk"; 140 clock-names = "apb_pclk";
146 power-domains = <&scpi_devpd 0>; 141 power-domains = <&scpi_devpd 0>;
147 port { 142 in-ports {
148 tpiu_in_port: endpoint { 143 port {
149 slave-mode; 144 tpiu_in_port: endpoint {
150 remote-endpoint = <&replicator_out_port0>; 145 remote-endpoint = <&replicator_out_port0>;
146 };
151 }; 147 };
152 }; 148 };
153 }; 149 };
@@ -160,31 +156,29 @@
160 clocks = <&soc_smc50mhz>; 156 clocks = <&soc_smc50mhz>;
161 clock-names = "apb_pclk"; 157 clock-names = "apb_pclk";
162 power-domains = <&scpi_devpd 0>; 158 power-domains = <&scpi_devpd 0>;
163 ports {
164 #address-cells = <1>;
165 #size-cells = <0>;
166 159
167 /* output port */ 160 out-ports {
168 port@0 { 161 port {
169 reg = <0>;
170 main_funnel_out_port: endpoint { 162 main_funnel_out_port: endpoint {
171 remote-endpoint = <&etf0_in_port>; 163 remote-endpoint = <&etf0_in_port>;
172 }; 164 };
173 }; 165 };
166 };
174 167
175 /* input ports */ 168 main_funnel_in_ports: in-ports {
176 port@1 { 169 #address-cells = <1>;
170 #size-cells = <0>;
171
172 port@0 {
177 reg = <0>; 173 reg = <0>;
178 main_funnel_in_port0: endpoint { 174 main_funnel_in_port0: endpoint {
179 slave-mode;
180 remote-endpoint = <&cluster0_funnel_out_port>; 175 remote-endpoint = <&cluster0_funnel_out_port>;
181 }; 176 };
182 }; 177 };
183 178
184 port@2 { 179 port@1 {
185 reg = <1>; 180 reg = <1>;
186 main_funnel_in_port1: endpoint { 181 main_funnel_in_port1: endpoint {
187 slave-mode;
188 remote-endpoint = <&cluster1_funnel_out_port>; 182 remote-endpoint = <&cluster1_funnel_out_port>;
189 }; 183 };
190 }; 184 };
@@ -199,10 +193,11 @@
199 clocks = <&soc_smc50mhz>; 193 clocks = <&soc_smc50mhz>;
200 clock-names = "apb_pclk"; 194 clock-names = "apb_pclk";
201 power-domains = <&scpi_devpd 0>; 195 power-domains = <&scpi_devpd 0>;
202 port { 196 in-ports {
203 etr_in_port: endpoint { 197 port {
204 slave-mode; 198 etr_in_port: endpoint {
205 remote-endpoint = <&replicator_out_port1>; 199 remote-endpoint = <&replicator_out_port1>;
200 };
206 }; 201 };
207 }; 202 };
208 }; 203 };
@@ -216,8 +211,10 @@
216 clocks = <&soc_smc50mhz>; 211 clocks = <&soc_smc50mhz>;
217 clock-names = "apb_pclk"; 212 clock-names = "apb_pclk";
218 power-domains = <&scpi_devpd 0>; 213 power-domains = <&scpi_devpd 0>;
219 port { 214 out-ports {
220 stm_out_port: endpoint { 215 port {
216 stm_out_port: endpoint {
217 };
221 }; 218 };
222 }; 219 };
223 }; 220 };
@@ -238,9 +235,11 @@
238 clocks = <&soc_smc50mhz>; 235 clocks = <&soc_smc50mhz>;
239 clock-names = "apb_pclk"; 236 clock-names = "apb_pclk";
240 power-domains = <&scpi_devpd 0>; 237 power-domains = <&scpi_devpd 0>;
241 port { 238 out-ports {
242 cluster0_etm0_out_port: endpoint { 239 port {
243 remote-endpoint = <&cluster0_funnel_in_port0>; 240 cluster0_etm0_out_port: endpoint {
241 remote-endpoint = <&cluster0_funnel_in_port0>;
242 };
244 }; 243 };
245 }; 244 };
246 }; 245 };
@@ -252,29 +251,28 @@
252 clocks = <&soc_smc50mhz>; 251 clocks = <&soc_smc50mhz>;
253 clock-names = "apb_pclk"; 252 clock-names = "apb_pclk";
254 power-domains = <&scpi_devpd 0>; 253 power-domains = <&scpi_devpd 0>;
255 ports { 254 out-ports {
256 #address-cells = <1>; 255 port {
257 #size-cells = <0>;
258
259 port@0 {
260 reg = <0>;
261 cluster0_funnel_out_port: endpoint { 256 cluster0_funnel_out_port: endpoint {
262 remote-endpoint = <&main_funnel_in_port0>; 257 remote-endpoint = <&main_funnel_in_port0>;
263 }; 258 };
264 }; 259 };
260 };
265 261
266 port@1 { 262 in-ports {
263 #address-cells = <1>;
264 #size-cells = <0>;
265
266 port@0 {
267 reg = <0>; 267 reg = <0>;
268 cluster0_funnel_in_port0: endpoint { 268 cluster0_funnel_in_port0: endpoint {
269 slave-mode;
270 remote-endpoint = <&cluster0_etm0_out_port>; 269 remote-endpoint = <&cluster0_etm0_out_port>;
271 }; 270 };
272 }; 271 };
273 272
274 port@2 { 273 port@1 {
275 reg = <1>; 274 reg = <1>;
276 cluster0_funnel_in_port1: endpoint { 275 cluster0_funnel_in_port1: endpoint {
277 slave-mode;
278 remote-endpoint = <&cluster0_etm1_out_port>; 276 remote-endpoint = <&cluster0_etm1_out_port>;
279 }; 277 };
280 }; 278 };
@@ -297,9 +295,11 @@
297 clocks = <&soc_smc50mhz>; 295 clocks = <&soc_smc50mhz>;
298 clock-names = "apb_pclk"; 296 clock-names = "apb_pclk";
299 power-domains = <&scpi_devpd 0>; 297 power-domains = <&scpi_devpd 0>;
300 port { 298 out-ports {
301 cluster0_etm1_out_port: endpoint { 299 port {
302 remote-endpoint = <&cluster0_funnel_in_port1>; 300 cluster0_etm1_out_port: endpoint {
301 remote-endpoint = <&cluster0_funnel_in_port1>;
302 };
303 }; 303 };
304 }; 304 };
305 }; 305 };
@@ -320,9 +320,11 @@
320 clocks = <&soc_smc50mhz>; 320 clocks = <&soc_smc50mhz>;
321 clock-names = "apb_pclk"; 321 clock-names = "apb_pclk";
322 power-domains = <&scpi_devpd 0>; 322 power-domains = <&scpi_devpd 0>;
323 port { 323 out-ports {
324 cluster1_etm0_out_port: endpoint { 324 port {
325 remote-endpoint = <&cluster1_funnel_in_port0>; 325 cluster1_etm0_out_port: endpoint {
326 remote-endpoint = <&cluster1_funnel_in_port0>;
327 };
326 }; 328 };
327 }; 329 };
328 }; 330 };
@@ -334,43 +336,40 @@
334 clocks = <&soc_smc50mhz>; 336 clocks = <&soc_smc50mhz>;
335 clock-names = "apb_pclk"; 337 clock-names = "apb_pclk";
336 power-domains = <&scpi_devpd 0>; 338 power-domains = <&scpi_devpd 0>;
337 ports { 339 out-ports {
338 #address-cells = <1>; 340 port {
339 #size-cells = <0>;
340
341 port@0 {
342 reg = <0>;
343 cluster1_funnel_out_port: endpoint { 341 cluster1_funnel_out_port: endpoint {
344 remote-endpoint = <&main_funnel_in_port1>; 342 remote-endpoint = <&main_funnel_in_port1>;
345 }; 343 };
346 }; 344 };
345 };
347 346
348 port@1 { 347 in-ports {
348 #address-cells = <1>;
349 #size-cells = <0>;
350
351 port@0 {
349 reg = <0>; 352 reg = <0>;
350 cluster1_funnel_in_port0: endpoint { 353 cluster1_funnel_in_port0: endpoint {
351 slave-mode;
352 remote-endpoint = <&cluster1_etm0_out_port>; 354 remote-endpoint = <&cluster1_etm0_out_port>;
353 }; 355 };
354 }; 356 };
355 357
356 port@2 { 358 port@1 {
357 reg = <1>; 359 reg = <1>;
358 cluster1_funnel_in_port1: endpoint { 360 cluster1_funnel_in_port1: endpoint {
359 slave-mode;
360 remote-endpoint = <&cluster1_etm1_out_port>; 361 remote-endpoint = <&cluster1_etm1_out_port>;
361 }; 362 };
362 }; 363 };
363 port@3 { 364 port@2 {
364 reg = <2>; 365 reg = <2>;
365 cluster1_funnel_in_port2: endpoint { 366 cluster1_funnel_in_port2: endpoint {
366 slave-mode;
367 remote-endpoint = <&cluster1_etm2_out_port>; 367 remote-endpoint = <&cluster1_etm2_out_port>;
368 }; 368 };
369 }; 369 };
370 port@4 { 370 port@3 {
371 reg = <3>; 371 reg = <3>;
372 cluster1_funnel_in_port3: endpoint { 372 cluster1_funnel_in_port3: endpoint {
373 slave-mode;
374 remote-endpoint = <&cluster1_etm3_out_port>; 373 remote-endpoint = <&cluster1_etm3_out_port>;
375 }; 374 };
376 }; 375 };
@@ -393,9 +392,11 @@
393 clocks = <&soc_smc50mhz>; 392 clocks = <&soc_smc50mhz>;
394 clock-names = "apb_pclk"; 393 clock-names = "apb_pclk";
395 power-domains = <&scpi_devpd 0>; 394 power-domains = <&scpi_devpd 0>;
396 port { 395 out-ports {
397 cluster1_etm1_out_port: endpoint { 396 port {
398 remote-endpoint = <&cluster1_funnel_in_port1>; 397 cluster1_etm1_out_port: endpoint {
398 remote-endpoint = <&cluster1_funnel_in_port1>;
399 };
399 }; 400 };
400 }; 401 };
401 }; 402 };
@@ -416,9 +417,11 @@
416 clocks = <&soc_smc50mhz>; 417 clocks = <&soc_smc50mhz>;
417 clock-names = "apb_pclk"; 418 clock-names = "apb_pclk";
418 power-domains = <&scpi_devpd 0>; 419 power-domains = <&scpi_devpd 0>;
419 port { 420 out-ports {
420 cluster1_etm2_out_port: endpoint { 421 port {
421 remote-endpoint = <&cluster1_funnel_in_port2>; 422 cluster1_etm2_out_port: endpoint {
423 remote-endpoint = <&cluster1_funnel_in_port2>;
424 };
422 }; 425 };
423 }; 426 };
424 }; 427 };
@@ -439,9 +442,11 @@
439 clocks = <&soc_smc50mhz>; 442 clocks = <&soc_smc50mhz>;
440 clock-names = "apb_pclk"; 443 clock-names = "apb_pclk";
441 power-domains = <&scpi_devpd 0>; 444 power-domains = <&scpi_devpd 0>;
442 port { 445 out-ports {
443 cluster1_etm3_out_port: endpoint { 446 port {
444 remote-endpoint = <&cluster1_funnel_in_port3>; 447 cluster1_etm3_out_port: endpoint {
448 remote-endpoint = <&cluster1_funnel_in_port3>;
449 };
445 }; 450 };
446 }; 451 };
447 }; 452 };
@@ -454,7 +459,7 @@
454 clock-names = "apb_pclk"; 459 clock-names = "apb_pclk";
455 power-domains = <&scpi_devpd 0>; 460 power-domains = <&scpi_devpd 0>;
456 461
457 ports { 462 out-ports {
458 #address-cells = <1>; 463 #address-cells = <1>;
459 #size-cells = <0>; 464 #size-cells = <0>;
460 465
@@ -472,12 +477,10 @@
472 remote-endpoint = <&etr_in_port>; 477 remote-endpoint = <&etr_in_port>;
473 }; 478 };
474 }; 479 };
475 480 };
476 /* replicator input port */ 481 in-ports {
477 port@2 { 482 port {
478 reg = <0>;
479 replicator_in_port0: endpoint { 483 replicator_in_port0: endpoint {
480 slave-mode;
481 }; 484 };
482 }; 485 };
483 }; 486 };
diff --git a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
index 0c43fb3525eb..cf285152deab 100644
--- a/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-cs-r1r2.dtsi
@@ -7,23 +7,16 @@
7 clocks = <&soc_smc50mhz>; 7 clocks = <&soc_smc50mhz>;
8 clock-names = "apb_pclk"; 8 clock-names = "apb_pclk";
9 power-domains = <&scpi_devpd 0>; 9 power-domains = <&scpi_devpd 0>;
10 ports { 10 out-ports {
11 #address-cells = <1>; 11 port {
12 #size-cells = <0>;
13
14 /* output port */
15 port@0 {
16 reg = <0>;
17 csys1_funnel_out_port: endpoint { 12 csys1_funnel_out_port: endpoint {
18 remote-endpoint = <&etf1_in_port>; 13 remote-endpoint = <&etf1_in_port>;
19 }; 14 };
20 }; 15 };
21 16 };
22 /* input port */ 17 in-ports {
23 port@1 { 18 port {
24 reg = <0>;
25 csys1_funnel_in_port0: endpoint { 19 csys1_funnel_in_port0: endpoint {
26 slave-mode;
27 }; 20 };
28 }; 21 };
29 22
@@ -37,22 +30,15 @@
37 clocks = <&soc_smc50mhz>; 30 clocks = <&soc_smc50mhz>;
38 clock-names = "apb_pclk"; 31 clock-names = "apb_pclk";
39 power-domains = <&scpi_devpd 0>; 32 power-domains = <&scpi_devpd 0>;
40 ports { 33 in-ports {
41 #address-cells = <1>; 34 port {
42 #size-cells = <0>;
43
44 /* input port */
45 port@0 {
46 reg = <0>;
47 etf1_in_port: endpoint { 35 etf1_in_port: endpoint {
48 slave-mode;
49 remote-endpoint = <&csys1_funnel_out_port>; 36 remote-endpoint = <&csys1_funnel_out_port>;
50 }; 37 };
51 }; 38 };
52 39 };
53 /* output port */ 40 out-ports {
54 port@1 { 41 port {
55 reg = <0>;
56 etf1_out_port: endpoint { 42 etf1_out_port: endpoint {
57 remote-endpoint = <&csys2_funnel_in_port1>; 43 remote-endpoint = <&csys2_funnel_in_port1>;
58 }; 44 };
@@ -67,20 +53,18 @@
67 clocks = <&soc_smc50mhz>; 53 clocks = <&soc_smc50mhz>;
68 clock-names = "apb_pclk"; 54 clock-names = "apb_pclk";
69 power-domains = <&scpi_devpd 0>; 55 power-domains = <&scpi_devpd 0>;
70 ports { 56 out-ports {
71 #address-cells = <1>; 57 port {
72 #size-cells = <0>;
73
74 /* output port */
75 port@0 {
76 reg = <0>;
77 csys2_funnel_out_port: endpoint { 58 csys2_funnel_out_port: endpoint {
78 remote-endpoint = <&replicator_in_port0>; 59 remote-endpoint = <&replicator_in_port0>;
79 }; 60 };
80 }; 61 };
62 };
81 63
82 /* input ports */ 64 in-ports {
83 port@1 { 65 #address-cells = <1>;
66 #size-cells = <0>;
67 port@0 {
84 reg = <0>; 68 reg = <0>;
85 csys2_funnel_in_port0: endpoint { 69 csys2_funnel_in_port0: endpoint {
86 slave-mode; 70 slave-mode;
@@ -88,7 +72,7 @@
88 }; 72 };
89 }; 73 };
90 74
91 port@2 { 75 port@1 {
92 reg = <1>; 76 reg = <1>;
93 csys2_funnel_in_port1: endpoint { 77 csys2_funnel_in_port1: endpoint {
94 slave-mode; 78 slave-mode;
diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts
index 1fb5c5a0f32e..08d4ba1716c3 100644
--- a/arch/arm64/boot/dts/arm/juno.dts
+++ b/arch/arm64/boot/dts/arm/juno.dts
@@ -257,14 +257,11 @@
257 remote-endpoint = <&main_funnel_in_port2>; 257 remote-endpoint = <&main_funnel_in_port2>;
258}; 258};
259 259
260&main_funnel { 260&main_funnel_in_ports {
261 ports { 261 port@2 {
262 port@3 { 262 reg = <2>;
263 reg = <2>; 263 main_funnel_in_port2: endpoint {
264 main_funnel_in_port2: endpoint { 264 remote-endpoint = <&stm_out_port>;
265 slave-mode;
266 remote-endpoint = <&stm_out_port>;
267 };
268 }; 265 };
269 }; 266 };
270}; 267};
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-22 18:17:10 -0400