change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/arch/arm/boot/dts/arm-realview-pb11mp.dts
..
..
@@ -23,9 +23,10 @@
23
23
 /dts-v1/;
24
24
 #include <dt-bindings/interrupt-controller/irq.h>
25
25
 #include <dt-bindings/gpio/gpio.h>
26
-#include "skeleton.dtsi"
27
26
 
28
27
 / {
28
+	#address-cells = <1>;
29
+	#size-cells = <1>;
29
30
 	model = "ARM RealView PB11MPcore";
30
31
 	compatible = "arm,realview-pb11mp";
31
32
 
..
..
@@ -39,6 +40,7 @@
39
40
 	};
40
41
 
41
42
 	memory {
43
+		device_type = "memory";
42
44
 		/*
43
45
 		 * The PB11MPCore has 512 MiB memory @ 0x70000000
44
46
 		 * and the first 256 are also remapped @ 0x00000000
..
..
@@ -90,7 +92,7 @@
90
92
 		      <0x1f000100 0x100>;
91
93
 	};
92
94
 
93
-	L2: l2-cache {
95
+	L2: cache-controller {
94
96
 		compatible = "arm,l220-cache";
95
97
 		reg = <0x1f002000 0x1000>;
96
98
 		interrupt-parent = <&intc_tc11mp>;
..
..
@@ -233,6 +235,9 @@
233
235
 		compatible = "arm,versatile-flash", "cfi-flash";
234
236
 		reg = <0x40000000 0x04000000>;
235
237
 		bank-width = <4>;
238
+		partitions {
239
+			compatible = "arm,arm-firmware-suite";
240
+		};
236
241
 	};
237
242
 
238
243
 	flash1@44000000 {
..
..
@@ -240,6 +245,9 @@
240
245
 		compatible = "arm,versatile-flash", "cfi-flash";
241
246
 		reg = <0x44000000 0x04000000>;
242
247
 		bank-width = <4>;
248
+		partitions {
249
+			compatible = "arm,arm-firmware-suite";
250
+		};
243
251
 	};
244
252
 
245
253
 	bridge {
..
..
@@ -538,7 +546,7 @@
538
546
 			interrupt-parent = <&intc_pb11mp>;
539
547
 			interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>;
540
548
 			clocks = <&wdogclk>, <&pclk>;
541
-			clock-names = "wdogclk", "apb_pclk";
549
+			clock-names = "wdog_clk", "apb_pclk";
542
550
 			status = "disabled";
543
551
 		};
544
552
 
..
..
@@ -548,7 +556,7 @@
548
556
 			interrupt-parent = <&intc_pb11mp>;
549
557
 			interrupts = <0 0 IRQ_TYPE_LEVEL_HIGH>;
550
558
 			clocks = <&wdogclk>, <&pclk>;
551
-			clock-names = "wdogclk", "apb_pclk";
559
+			clock-names = "wdog_clk", "apb_pclk";
552
560
 		};
553
561
 
554
562
 		timer01: timer@10011000 {
..
..
@@ -560,8 +568,8 @@
560
568
 			clocks = <&sp810_syscon 0>,
561
569
 			         <&sp810_syscon 1>,
562
570
 				 <&pclk>;
563
-			clock-names = "timerclk0",
564
-				    "timerclk1",
571
+			clock-names = "timer0clk",
572
+				    "timer1clk",
565
573
 				    "apb_pclk";
566
574
 		};
567
575
 
..
..
@@ -574,8 +582,8 @@
574
582
 			clocks = <&sp810_syscon 2>,
575
583
 			         <&sp810_syscon 3>,
576
584
 				 <&pclk>;
577
-			clock-names = "timerclk2",
578
-				    "timerclk3",
585
+			clock-names = "timer0clk",
586
+				    "timer1clk",
579
587
 				    "apb_pclk";
580
588
 		};
581
589
 
..
..
@@ -637,16 +645,16 @@
637
645
 		timer45: timer@10018000 {
638
646
 			compatible = "arm,sp804", "arm,primecell";
639
647
 			reg = <0x10018000 0x1000>;
640
-			clocks = <&timclk>, <&pclk>;
641
-			clock-names = "timer", "apb_pclk";
648
+			clocks = <&timclk>, <&timclk>, <&pclk>;
649
+			clock-names = "timer0clk", "timer1clk", "apb_pclk";
642
650
 			status = "disabled";
643
651
 		};
644
652
 
645
653
 		timer67: timer@10019000 {
646
654
 			compatible = "arm,sp804", "arm,primecell";
647
655
 			reg = <0x10019000 0x1000>;
648
-			clocks = <&timclk>, <&pclk>;
649
-			clock-names = "timer", "apb_pclk";
656
+			clocks = <&timclk>, <&timclk>, <&pclk>;
657
+			clock-names = "timer0clk", "timer1clk", "apb_pclk";
650
658
 			status = "disabled";
651
659
 		};
652
660