forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2 
 kernel/arch/arm/boot/dts/hip04.dtsi
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23  * Hisilicon Ltd. HiP04 SoC
34  *
....@@ -5,10 +6,6 @@
56  * Copyright (C) 2013-2014 Linaro Ltd.
67  *
78  * Author: Haojian Zhuang <haojian.zhuang@linaro.org>
8
- *
9
- * This program is free software; you can redistribute it and/or modify
10
- * it under the terms of the GNU General Public License version 2 as
11
- * published by the Free Software Foundation.
129  */
1310 
1411 / {
....@@ -216,7 +213,7 @@
216213 		};
217214 
218215 		sysctrl: sysctrl {
219
-			compatible = "hisilicon,sysctrl";
216
+			compatible = "hisilicon,sysctrl", "syscon";
220217 			reg = <0x3e00000 0x00100000>;
221218 		};
222219 
....@@ -229,8 +226,8 @@
229226 			compatible = "arm,sp804", "arm,primecell";
230227 			reg = <0x3000000 0x1000>;
231228 			interrupts = <0 224 4>;
232
-			clocks = <&clk_50m>, <&clk_50m>;
233
-			clock-names = "apb_pclk";
229
+			clocks = <&clk_50m>, <&clk_50m>, <&clk_50m>;
230
+			clock-names = "timer0clk", "timer1clk", "apb_pclk";
234231 		};
235232 
236233 		arm-pmu {
....@@ -277,10 +274,11 @@
277274 
278275 		clocks = <&clk_375m>;
279276 		clock-names = "apb_pclk";
280
-		port {
281
-			etb0_in_port: endpoint@0 {
282
-				slave-mode;
283
-				remote-endpoint = <&replicator0_out_port0>;
277
+		in-ports {
278
+			port {
279
+				etb0_in_port: endpoint@0 {
280
+					remote-endpoint = <&replicator0_out_port0>;
281
+				};
284282 			};
285283 		};
286284 	};
....@@ -291,10 +289,11 @@
291289 
292290 		clocks = <&clk_375m>;
293291 		clock-names = "apb_pclk";
294
-		port {
295
-			etb1_in_port: endpoint@0 {
296
-				slave-mode;
297
-				remote-endpoint = <&replicator1_out_port0>;
292
+		in-ports {
293
+			port {
294
+				etb1_in_port: endpoint@0 {
295
+					remote-endpoint = <&replicator1_out_port0>;
296
+				};
298297 			};
299298 		};
300299 	};
....@@ -305,10 +304,11 @@
305304 
306305 		clocks = <&clk_375m>;
307306 		clock-names = "apb_pclk";
308
-		port {
309
-			etb2_in_port: endpoint@0 {
310
-				slave-mode;
311
-				remote-endpoint = <&replicator2_out_port0>;
307
+		in-ports {
308
+			port {
309
+				etb2_in_port: endpoint@0 {
310
+					remote-endpoint = <&replicator2_out_port0>;
311
+				};
312312 			};
313313 		};
314314 	};
....@@ -319,10 +319,11 @@
319319 
320320 		clocks = <&clk_375m>;
321321 		clock-names = "apb_pclk";
322
-		port {
323
-			etb3_in_port: endpoint@0 {
324
-				slave-mode;
325
-				remote-endpoint = <&replicator3_out_port0>;
322
+		in-ports {
323
+			port {
324
+				etb3_in_port: endpoint@0 {
325
+					remote-endpoint = <&replicator3_out_port0>;
326
+				};
326327 			};
327328 		};
328329 	};
....@@ -333,10 +334,11 @@
333334 
334335 		clocks = <&clk_375m>;
335336 		clock-names = "apb_pclk";
336
-		port {
337
-			tpiu_in_port: endpoint@0 {
338
-				slave-mode;
339
-				remote-endpoint = <&funnel4_out_port0>;
337
+		in-ports {
338
+			port {
339
+				tpiu_in_port: endpoint@0 {
340
+					remote-endpoint = <&funnel4_out_port0>;
341
+				};
340342 			};
341343 		};
342344 	};
....@@ -345,9 +347,9 @@
345347 		/* non-configurable replicators don't show up on the
346348 		 * AMBA bus.  As such no need to add "arm,primecell".
347349 		 */
348
-		compatible = "arm,coresight-replicator";
350
+		compatible = "arm,coresight-static-replicator";
349351 
350
-		ports {
352
+		out-ports {
351353 			#address-cells = <1>;
352354 			#size-cells = <0>;
353355 
....@@ -365,12 +367,11 @@
365367 					remote-endpoint = <&funnel4_in_port0>;
366368 				};
367369 			};
370
+		};
368371 
369
-			/* replicator input port */
370
-			port@2 {
371
-				reg = <0>;
372
+		in-ports {
373
+			port {
372374 				replicator0_in_port0: endpoint {
373
-					slave-mode;
374375 					remote-endpoint = <&funnel0_out_port0>;
375376 				};
376377 			};
....@@ -381,9 +382,9 @@
381382 		/* non-configurable replicators don't show up on the
382383 		 * AMBA bus.  As such no need to add "arm,primecell".
383384 		 */
384
-		compatible = "arm,coresight-replicator";
385
+		compatible = "arm,coresight-static-replicator";
385386 
386
-		ports {
387
+		out-ports {
387388 			#address-cells = <1>;
388389 			#size-cells = <0>;
389390 
....@@ -401,12 +402,11 @@
401402 					remote-endpoint = <&funnel4_in_port1>;
402403 				};
403404 			};
405
+		};
404406 
405
-			/* replicator input port */
406
-			port@2 {
407
-				reg = <0>;
407
+		in-ports {
408
+			port {
408409 				replicator1_in_port0: endpoint {
409
-					slave-mode;
410410 					remote-endpoint = <&funnel1_out_port0>;
411411 				};
412412 			};
....@@ -417,13 +417,12 @@
417417 		/* non-configurable replicators don't show up on the
418418 		 * AMBA bus.  As such no need to add "arm,primecell".
419419 		 */
420
-		compatible = "arm,coresight-replicator";
420
+		compatible = "arm,coresight-static-replicator";
421421 
422
-		ports {
422
+		out-ports {
423423 			#address-cells = <1>;
424424 			#size-cells = <0>;
425425 
426
-			/* replicator output ports */
427426 			port@0 {
428427 				reg = <0>;
429428 				replicator2_out_port0: endpoint {
....@@ -437,12 +436,11 @@
437436 					remote-endpoint = <&funnel4_in_port2>;
438437 				};
439438 			};
439
+		};
440440 
441
-			/* replicator input port */
442
-			port@2 {
443
-				reg = <0>;
441
+		in-ports {
442
+			port {
444443 				replicator2_in_port0: endpoint {
445
-					slave-mode;
446444 					remote-endpoint = <&funnel2_out_port0>;
447445 				};
448446 			};
....@@ -453,13 +451,12 @@
453451 		/* non-configurable replicators don't show up on the
454452 		 * AMBA bus.  As such no need to add "arm,primecell".
455453 		 */
456
-		compatible = "arm,coresight-replicator";
454
+		compatible = "arm,coresight-static-replicator";
457455 
458
-		ports {
456
+		out-ports {
459457 			#address-cells = <1>;
460458 			#size-cells = <0>;
461459 
462
-			/* replicator output ports */
463460 			port@0 {
464461 				reg = <0>;
465462 				replicator3_out_port0: endpoint {
....@@ -473,12 +470,11 @@
473470 					remote-endpoint = <&funnel4_in_port3>;
474471 				};
475472 			};
473
+		};
476474 
477
-			/* replicator input port */
478
-			port@2 {
479
-				reg = <0>;
475
+		in-ports {
476
+			port {
480477 				replicator3_in_port0: endpoint {
481
-					slave-mode;
482478 					remote-endpoint = <&funnel3_out_port0>;
483479 				};
484480 			};
....@@ -486,53 +482,48 @@
486482 	};
487483 
488484 	funnel@0,e3c41000 {
489
-		compatible = "arm,coresight-funnel", "arm,primecell";
485
+		compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
490486 		reg = <0 0xe3c41000 0 0x1000>;
491487 
492488 		clocks = <&clk_375m>;
493489 		clock-names = "apb_pclk";
494
-		ports {
495
-			#address-cells = <1>;
496
-			#size-cells = <0>;
497
-
498
-			/* funnel output port */
499
-			port@0 {
500
-				reg = <0>;
490
+		out-ports {
491
+			port {
501492 				funnel0_out_port0: endpoint {
502493 					remote-endpoint =
503494 						<&replicator0_in_port0>;
504495 				};
505496 			};
497
+		};
506498 
507
-			/* funnel input ports */
508
-			port@1 {
499
+		in-ports {
500
+			#address-cells = <1>;
501
+			#size-cells = <0>;
502
+
503
+			port@0 {
509504 				reg = <0>;
510505 				funnel0_in_port0: endpoint {
511
-					slave-mode;
512506 					remote-endpoint = <&ptm0_out_port>;
513507 				};
514508 			};
515509 
516
-			port@2 {
510
+			port@1 {
517511 				reg = <1>;
518512 				funnel0_in_port1: endpoint {
519
-					slave-mode;
520513 					remote-endpoint = <&ptm1_out_port>;
521514 				};
522515 			};
523516 
524
-			port@3 {
517
+			port@2 {
525518 				reg = <2>;
526519 				funnel0_in_port2: endpoint {
527
-					slave-mode;
528520 					remote-endpoint = <&ptm2_out_port>;
529521 				};
530522 			};
531523 
532
-			port@4 {
524
+			port@3 {
533525 				reg = <3>;
534526 				funnel0_in_port3: endpoint {
535
-					slave-mode;
536527 					remote-endpoint = <&ptm3_out_port>;
537528 				};
538529 			};
....@@ -540,53 +531,48 @@
540531 	};
541532 
542533 	funnel@0,e3c81000 {
543
-		compatible = "arm,coresight-funnel", "arm,primecell";
534
+		compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
544535 		reg = <0 0xe3c81000 0 0x1000>;
545536 
546537 		clocks = <&clk_375m>;
547538 		clock-names = "apb_pclk";
548
-		ports {
549
-			#address-cells = <1>;
550
-			#size-cells = <0>;
551
-
552
-			/* funnel output port */
553
-			port@0 {
554
-				reg = <0>;
539
+		out-ports {
540
+			port {
555541 				funnel1_out_port0: endpoint {
556542 					remote-endpoint =
557543 						<&replicator1_in_port0>;
558544 				};
559545 			};
546
+		};
560547 
561
-			/* funnel input ports */
562
-			port@1 {
548
+		in-ports {
549
+			#address-cells = <1>;
550
+			#size-cells = <0>;
551
+
552
+			port@0 {
563553 				reg = <0>;
564554 				funnel1_in_port0: endpoint {
565
-					slave-mode;
566555 					remote-endpoint = <&ptm4_out_port>;
567556 				};
568557 			};
569558 
570
-			port@2 {
559
+			port@1 {
571560 				reg = <1>;
572561 				funnel1_in_port1: endpoint {
573
-					slave-mode;
574562 					remote-endpoint = <&ptm5_out_port>;
575563 				};
576564 			};
577565 
578
-			port@3 {
566
+			port@2 {
579567 				reg = <2>;
580568 				funnel1_in_port2: endpoint {
581
-					slave-mode;
582569 					remote-endpoint = <&ptm6_out_port>;
583570 				};
584571 			};
585572 
586
-			port@4 {
573
+			port@3 {
587574 				reg = <3>;
588575 				funnel1_in_port3: endpoint {
589
-					slave-mode;
590576 					remote-endpoint = <&ptm7_out_port>;
591577 				};
592578 			};
....@@ -594,53 +580,48 @@
594580 	};
595581 
596582 	funnel@0,e3cc1000 {
597
-		compatible = "arm,coresight-funnel", "arm,primecell";
583
+		compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
598584 		reg = <0 0xe3cc1000 0 0x1000>;
599585 
600586 		clocks = <&clk_375m>;
601587 		clock-names = "apb_pclk";
602
-		ports {
603
-			#address-cells = <1>;
604
-			#size-cells = <0>;
605
-
606
-			/* funnel output port */
607
-			port@0 {
608
-				reg = <0>;
588
+		out-ports {
589
+			port {
609590 				funnel2_out_port0: endpoint {
610591 					remote-endpoint =
611592 						<&replicator2_in_port0>;
612593 				};
613594 			};
595
+		};
614596 
615
-			/* funnel input ports */
616
-			port@1 {
597
+		in-ports {
598
+			#address-cells = <1>;
599
+			#size-cells = <0>;
600
+
601
+			port@0 {
617602 				reg = <0>;
618603 				funnel2_in_port0: endpoint {
619
-					slave-mode;
620604 					remote-endpoint = <&ptm8_out_port>;
621605 				};
622606 			};
623607 
624
-			port@2 {
608
+			port@1 {
625609 				reg = <1>;
626610 				funnel2_in_port1: endpoint {
627
-					slave-mode;
628611 					remote-endpoint = <&ptm9_out_port>;
629612 				};
630613 			};
631614 
632
-			port@3 {
615
+			port@2 {
633616 				reg = <2>;
634617 				funnel2_in_port2: endpoint {
635
-					slave-mode;
636618 					remote-endpoint = <&ptm10_out_port>;
637619 				};
638620 			};
639621 
640
-			port@4 {
622
+			port@3 {
641623 				reg = <3>;
642624 				funnel2_in_port3: endpoint {
643
-					slave-mode;
644625 					remote-endpoint = <&ptm11_out_port>;
645626 				};
646627 			};
....@@ -648,53 +629,48 @@
648629 	};
649630 
650631 	funnel@0,e3d01000 {
651
-		compatible = "arm,coresight-funnel", "arm,primecell";
632
+		compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
652633 		reg = <0 0xe3d01000 0 0x1000>;
653634 
654635 		clocks = <&clk_375m>;
655636 		clock-names = "apb_pclk";
656
-		ports {
657
-			#address-cells = <1>;
658
-			#size-cells = <0>;
659
-
660
-			/* funnel output port */
661
-			port@0 {
662
-				reg = <0>;
637
+		out-ports {
638
+			port {
663639 				funnel3_out_port0: endpoint {
664640 					remote-endpoint =
665641 						<&replicator3_in_port0>;
666642 				};
667643 			};
644
+		};
668645 
669
-			/* funnel input ports */
670
-			port@1 {
646
+		in-ports {
647
+			#address-cells = <1>;
648
+			#size-cells = <0>;
649
+
650
+			port@0 {
671651 				reg = <0>;
672652 				funnel3_in_port0: endpoint {
673
-					slave-mode;
674653 					remote-endpoint = <&ptm12_out_port>;
675654 				};
676655 			};
677656 
678
-			port@2 {
657
+			port@1 {
679658 				reg = <1>;
680659 				funnel3_in_port1: endpoint {
681
-					slave-mode;
682660 					remote-endpoint = <&ptm13_out_port>;
683661 				};
684662 			};
685663 
686
-			port@3 {
664
+			port@2 {
687665 				reg = <2>;
688666 				funnel3_in_port2: endpoint {
689
-					slave-mode;
690667 					remote-endpoint = <&ptm14_out_port>;
691668 				};
692669 			};
693670 
694
-			port@4 {
671
+			port@3 {
695672 				reg = <3>;
696673 				funnel3_in_port3: endpoint {
697
-					slave-mode;
698674 					remote-endpoint = <&ptm15_out_port>;
699675 				};
700676 			};
....@@ -702,55 +678,50 @@
702678 	};
703679 
704680 	funnel@0,e3c04000 {
705
-		compatible = "arm,coresight-funnel", "arm,primecell";
681
+		compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
706682 		reg = <0 0xe3c04000 0 0x1000>;
707683 
708684 		clocks = <&clk_375m>;
709685 		clock-names = "apb_pclk";
710
-		ports {
711
-			#address-cells = <1>;
712
-			#size-cells = <0>;
713
-
714
-			/* funnel output port */
715
-			port@0 {
716
-				reg = <0>;
686
+		out-ports {
687
+			port {
717688 				funnel4_out_port0: endpoint {
718689 					remote-endpoint = <&tpiu_in_port>;
719690 				};
720691 			};
692
+		};
721693 
722
-			/* funnel input ports */
723
-			port@1 {
694
+		in-ports {
695
+			#address-cells = <1>;
696
+			#size-cells = <0>;
697
+
698
+			port@0 {
724699 				reg = <0>;
725700 				funnel4_in_port0: endpoint {
726
-					slave-mode;
727701 					remote-endpoint =
728702 						<&replicator0_out_port1>;
729703 				};
730704 			};
731705 
732
-			port@2 {
706
+			port@1 {
733707 				reg = <1>;
734708 				funnel4_in_port1: endpoint {
735
-					slave-mode;
736709 					remote-endpoint =
737710 						<&replicator1_out_port1>;
738711 				};
739712 			};
740713 
741
-			port@3 {
714
+			port@2 {
742715 				reg = <2>;
743716 				funnel4_in_port2: endpoint {
744
-					slave-mode;
745717 					remote-endpoint =
746718 						<&replicator2_out_port1>;
747719 				};
748720 			};
749721 
750
-			port@4 {
722
+			port@3 {
751723 				reg = <3>;
752724 				funnel4_in_port3: endpoint {
753
-					slave-mode;
754725 					remote-endpoint =
755726 						<&replicator3_out_port1>;
756727 				};
....@@ -765,9 +736,11 @@
765736 		clocks = <&clk_375m>;
766737 		clock-names = "apb_pclk";
767738 		cpu = <&CPU0>;
768
-		port {
769
-			ptm0_out_port: endpoint {
770
-				remote-endpoint = <&funnel0_in_port0>;
739
+		out-ports {
740
+			port {
741
+				ptm0_out_port: endpoint {
742
+					remote-endpoint = <&funnel0_in_port0>;
743
+				};
771744 			};
772745 		};
773746 	};
....@@ -779,9 +752,11 @@
779752 		clocks = <&clk_375m>;
780753 		clock-names = "apb_pclk";
781754 		cpu = <&CPU1>;
782
-		port {
783
-			ptm1_out_port: endpoint {
784
-				remote-endpoint = <&funnel0_in_port1>;
755
+		out-ports {
756
+			port {
757
+				ptm1_out_port: endpoint {
758
+					remote-endpoint = <&funnel0_in_port1>;
759
+				};
785760 			};
786761 		};
787762 	};
....@@ -793,9 +768,11 @@
793768 		clocks = <&clk_375m>;
794769 		clock-names = "apb_pclk";
795770 		cpu = <&CPU2>;
796
-		port {
797
-			ptm2_out_port: endpoint {
798
-				remote-endpoint = <&funnel0_in_port2>;
771
+		out-ports {
772
+			port {
773
+				ptm2_out_port: endpoint {
774
+					remote-endpoint = <&funnel0_in_port2>;
775
+				};
799776 			};
800777 		};
801778 	};
....@@ -807,9 +784,11 @@
807784 		clocks = <&clk_375m>;
808785 		clock-names = "apb_pclk";
809786 		cpu = <&CPU3>;
810
-		port {
811
-			ptm3_out_port: endpoint {
812
-				remote-endpoint = <&funnel0_in_port3>;
787
+		out-ports {
788
+			port {
789
+				ptm3_out_port: endpoint {
790
+					remote-endpoint = <&funnel0_in_port3>;
791
+				};
813792 			};
814793 		};
815794 	};
....@@ -821,9 +800,11 @@
821800 		clocks = <&clk_375m>;
822801 		clock-names = "apb_pclk";
823802 		cpu = <&CPU4>;
824
-		port {
825
-			ptm4_out_port: endpoint {
826
-				remote-endpoint = <&funnel1_in_port0>;
803
+		out-ports {
804
+			port {
805
+				ptm4_out_port: endpoint {
806
+					remote-endpoint = <&funnel1_in_port0>;
807
+				};
827808 			};
828809 		};
829810 	};
....@@ -835,9 +816,11 @@
835816 		clocks = <&clk_375m>;
836817 		clock-names = "apb_pclk";
837818 		cpu = <&CPU5>;
838
-		port {
839
-			ptm5_out_port: endpoint {
840
-				remote-endpoint = <&funnel1_in_port1>;
819
+		out-ports {
820
+			port {
821
+				ptm5_out_port: endpoint {
822
+					remote-endpoint = <&funnel1_in_port1>;
823
+				};
841824 			};
842825 		};
843826 	};
....@@ -849,9 +832,11 @@
849832 		clocks = <&clk_375m>;
850833 		clock-names = "apb_pclk";
851834 		cpu = <&CPU6>;
852
-		port {
853
-			ptm6_out_port: endpoint {
854
-				remote-endpoint = <&funnel1_in_port2>;
835
+		out-ports {
836
+			port {
837
+				ptm6_out_port: endpoint {
838
+					remote-endpoint = <&funnel1_in_port2>;
839
+				};
855840 			};
856841 		};
857842 	};
....@@ -863,9 +848,11 @@
863848 		clocks = <&clk_375m>;
864849 		clock-names = "apb_pclk";
865850 		cpu = <&CPU7>;
866
-		port {
867
-			ptm7_out_port: endpoint {
868
-				remote-endpoint = <&funnel1_in_port3>;
851
+		out-ports {
852
+			port {
853
+				ptm7_out_port: endpoint {
854
+					remote-endpoint = <&funnel1_in_port3>;
855
+				};
869856 			};
870857 		};
871858 	};
....@@ -877,9 +864,11 @@
877864 		clocks = <&clk_375m>;
878865 		clock-names = "apb_pclk";
879866 		cpu = <&CPU8>;
880
-		port {
881
-			ptm8_out_port: endpoint {
882
-				remote-endpoint = <&funnel2_in_port0>;
867
+		out-ports {
868
+			port {
869
+				ptm8_out_port: endpoint {
870
+					remote-endpoint = <&funnel2_in_port0>;
871
+				};
883872 			};
884873 		};
885874 	};
....@@ -890,9 +879,11 @@
890879 		clocks = <&clk_375m>;
891880 		clock-names = "apb_pclk";
892881 		cpu = <&CPU9>;
893
-		port {
894
-			ptm9_out_port: endpoint {
895
-				remote-endpoint = <&funnel2_in_port1>;
882
+		out-ports {
883
+			port {
884
+				ptm9_out_port: endpoint {
885
+					remote-endpoint = <&funnel2_in_port1>;
886
+				};
896887 			};
897888 		};
898889 	};
....@@ -904,9 +895,11 @@
904895 		clocks = <&clk_375m>;
905896 		clock-names = "apb_pclk";
906897 		cpu = <&CPU10>;
907
-		port {
908
-			ptm10_out_port: endpoint {
909
-				remote-endpoint = <&funnel2_in_port2>;
898
+		out-ports {
899
+			port {
900
+				ptm10_out_port: endpoint {
901
+					remote-endpoint = <&funnel2_in_port2>;
902
+				};
910903 			};
911904 		};
912905 	};
....@@ -918,9 +911,11 @@
918911 		clocks = <&clk_375m>;
919912 		clock-names = "apb_pclk";
920913 		cpu = <&CPU11>;
921
-		port {
922
-			ptm11_out_port: endpoint {
923
-				remote-endpoint = <&funnel2_in_port3>;
914
+		out-ports {
915
+			port {
916
+				ptm11_out_port: endpoint {
917
+					remote-endpoint = <&funnel2_in_port3>;
918
+				};
924919 			};
925920 		};
926921 	};
....@@ -932,9 +927,11 @@
932927 		clocks = <&clk_375m>;
933928 		clock-names = "apb_pclk";
934929 		cpu = <&CPU12>;
935
-		port {
936
-			ptm12_out_port: endpoint {
937
-				remote-endpoint = <&funnel3_in_port0>;
930
+		out-ports {
931
+			port {
932
+				ptm12_out_port: endpoint {
933
+					remote-endpoint = <&funnel3_in_port0>;
934
+				};
938935 			};
939936 		};
940937 	};
....@@ -946,9 +943,11 @@
946943 		clocks = <&clk_375m>;
947944 		clock-names = "apb_pclk";
948945 		cpu = <&CPU13>;
949
-		port {
950
-			ptm13_out_port: endpoint {
951
-				remote-endpoint = <&funnel3_in_port1>;
946
+		out-ports {
947
+			port {
948
+				ptm13_out_port: endpoint {
949
+					remote-endpoint = <&funnel3_in_port1>;
950
+				};
952951 			};
953952 		};
954953 	};
....@@ -960,9 +959,11 @@
960959 		clocks = <&clk_375m>;
961960 		clock-names = "apb_pclk";
962961 		cpu = <&CPU14>;
963
-		port {
964
-			ptm14_out_port: endpoint {
965
-				remote-endpoint = <&funnel3_in_port2>;
962
+		out-ports {
963
+			port {
964
+				ptm14_out_port: endpoint {
965
+					remote-endpoint = <&funnel3_in_port2>;
966
+				};
966967 			};
967968 		};
968969 	};
....@@ -974,9 +975,11 @@
974975 		clocks = <&clk_375m>;
975976 		clock-names = "apb_pclk";
976977 		cpu = <&CPU15>;
977
-		port {
978
-			ptm15_out_port: endpoint {
979
-				remote-endpoint = <&funnel3_in_port3>;
978
+		out-ports {
979
+			port {
980
+				ptm15_out_port: endpoint {
981
+					remote-endpoint = <&funnel3_in_port3>;
982
+				};
980983 			};
981984 		};
982985 	};