update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm/boot/dts/at91rm9200.dtsi
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * at91rm9200.dtsi - Device Tree Include file for AT91RM9200 family SoC
3
4
  *
..
..
@@ -6,17 +7,16 @@
6
7
  *                2012 Joachim Eastwood <manabian@gmail.com>
7
8
  *
8
9
  * Based on at91sam9260.dtsi
9
- *
10
- * Licensed under GPLv2 or later.
11
10
  */
12
11
 
13
-#include "skeleton.dtsi"
14
12
 #include <dt-bindings/pinctrl/at91.h>
15
13
 #include <dt-bindings/interrupt-controller/irq.h>
16
14
 #include <dt-bindings/gpio/gpio.h>
17
15
 #include <dt-bindings/clock/at91.h>
18
16
 
19
17
 / {
18
+	#address-cells = <1>;
19
+	#size-cells = <1>;
20
20
 	model = "Atmel AT91RM9200 family SoC";
21
21
 	compatible = "atmel,at91rm9200";
22
22
 	interrupt-parent = <&aic>;
..
..
@@ -39,16 +39,18 @@
39
39
 		ssc2 = &ssc2;
40
40
 	};
41
41
 	cpus {
42
-		#address-cells = <0>;
42
+		#address-cells = <1>;
43
43
 		#size-cells = <0>;
44
44
 
45
-		cpu {
45
+		cpu@0 {
46
46
 			compatible = "arm,arm920t";
47
47
 			device_type = "cpu";
48
+			reg = <0>;
48
49
 		};
49
50
 	};
50
51
 
51
-	memory {
52
+	memory@20000000 {
53
+		device_type = "memory";
52
54
 		reg = <0x20000000 0x04000000>;
53
55
 	};
54
56
 
..
..
@@ -69,6 +71,9 @@
69
71
 	sram: sram@200000 {
70
72
 		compatible = "mmio-sram";
71
73
 		reg = <0x00200000 0x4000>;
74
+		#address-cells = <1>;
75
+		#size-cells = <1>;
76
+		ranges = <0 0x00200000 0x4000>;
72
77
 	};
73
78
 
74
79
 	ahb {
..
..
@@ -100,259 +105,9 @@
100
105
 				compatible = "atmel,at91rm9200-pmc", "syscon";
101
106
 				reg = <0xfffffc00 0x100>;
102
107
 				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
103
-				interrupt-controller;
104
-				#address-cells = <1>;
105
-				#size-cells = <0>;
106
-				#interrupt-cells = <1>;
107
-
108
-				main_osc: main_osc {
109
-					compatible = "atmel,at91rm9200-clk-main-osc";
110
-					#clock-cells = <0>;
111
-					interrupts-extended = <&pmc AT91_PMC_MOSCS>;
112
-					clocks = <&main_xtal>;
113
-				};
114
-
115
-				main: mainck {
116
-					compatible = "atmel,at91rm9200-clk-main";
117
-					#clock-cells = <0>;
118
-					clocks = <&main_osc>;
119
-				};
120
-
121
-				plla: pllack {
122
-					compatible = "atmel,at91rm9200-clk-pll";
123
-					#clock-cells = <0>;
124
-					interrupts-extended = <&pmc AT91_PMC_LOCKA>;
125
-					clocks = <&main>;
126
-					reg = <0>;
127
-					atmel,clk-input-range = <1000000 32000000>;
128
-					#atmel,pll-clk-output-range-cells = <3>;
129
-					atmel,pll-clk-output-ranges = <80000000 160000000 0>,
130
-								<150000000 180000000 2>;
131
-				};
132
-
133
-				pllb: pllbck {
134
-					compatible = "atmel,at91rm9200-clk-pll";
135
-					#clock-cells = <0>;
136
-					interrupts-extended = <&pmc AT91_PMC_LOCKB>;
137
-					clocks = <&main>;
138
-					reg = <1>;
139
-					atmel,clk-input-range = <1000000 32000000>;
140
-					#atmel,pll-clk-output-range-cells = <3>;
141
-					atmel,pll-clk-output-ranges = <80000000 160000000 0>,
142
-								<150000000 180000000 2>;
143
-				};
144
-
145
-				mck: masterck {
146
-					compatible = "atmel,at91rm9200-clk-master";
147
-					#clock-cells = <0>;
148
-					interrupts-extended = <&pmc AT91_PMC_MCKRDY>;
149
-					clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
150
-					atmel,clk-output-range = <0 80000000>;
151
-					atmel,clk-divisors = <1 2 3 4>;
152
-				};
153
-
154
-				usb: usbck {
155
-					compatible = "atmel,at91rm9200-clk-usb";
156
-					#clock-cells = <0>;
157
-					atmel,clk-divisors = <1 2 0 0>;
158
-					clocks = <&pllb>;
159
-				};
160
-
161
-				prog: progck {
162
-					compatible = "atmel,at91rm9200-clk-programmable";
163
-					#address-cells = <1>;
164
-					#size-cells = <0>;
165
-					interrupt-parent = <&pmc>;
166
-					clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
167
-
168
-					prog0: prog0 {
169
-						#clock-cells = <0>;
170
-						reg = <0>;
171
-						interrupts = <AT91_PMC_PCKRDY(0)>;
172
-					};
173
-
174
-					prog1: prog1 {
175
-						#clock-cells = <0>;
176
-						reg = <1>;
177
-						interrupts = <AT91_PMC_PCKRDY(1)>;
178
-					};
179
-
180
-					prog2: prog2 {
181
-						#clock-cells = <0>;
182
-						reg = <2>;
183
-						interrupts = <AT91_PMC_PCKRDY(2)>;
184
-					};
185
-
186
-					prog3: prog3 {
187
-						#clock-cells = <0>;
188
-						reg = <3>;
189
-						interrupts = <AT91_PMC_PCKRDY(3)>;
190
-					};
191
-				};
192
-
193
-				systemck {
194
-					compatible = "atmel,at91rm9200-clk-system";
195
-					#address-cells = <1>;
196
-					#size-cells = <0>;
197
-
198
-					udpck: udpck {
199
-						#clock-cells = <0>;
200
-						reg = <2>;
201
-						clocks = <&usb>;
202
-					};
203
-
204
-					uhpck: uhpck {
205
-						#clock-cells = <0>;
206
-						reg = <4>;
207
-						clocks = <&usb>;
208
-					};
209
-
210
-					pck0: pck0 {
211
-						#clock-cells = <0>;
212
-						reg = <8>;
213
-						clocks = <&prog0>;
214
-					};
215
-
216
-					pck1: pck1 {
217
-						#clock-cells = <0>;
218
-						reg = <9>;
219
-						clocks = <&prog1>;
220
-					};
221
-
222
-					pck2: pck2 {
223
-						#clock-cells = <0>;
224
-						reg = <10>;
225
-						clocks = <&prog2>;
226
-					};
227
-
228
-					pck3: pck3 {
229
-						#clock-cells = <0>;
230
-						reg = <11>;
231
-						clocks = <&prog3>;
232
-					};
233
-				};
234
-
235
-				periphck {
236
-					compatible = "atmel,at91rm9200-clk-peripheral";
237
-					#address-cells = <1>;
238
-					#size-cells = <0>;
239
-					clocks = <&mck>;
240
-
241
-					pioA_clk: pioA_clk {
242
-						#clock-cells = <0>;
243
-						reg = <2>;
244
-					};
245
-
246
-					pioB_clk: pioB_clk {
247
-						#clock-cells = <0>;
248
-						reg = <3>;
249
-					};
250
-
251
-					pioC_clk: pioC_clk {
252
-						#clock-cells = <0>;
253
-						reg = <4>;
254
-					};
255
-
256
-					pioD_clk: pioD_clk {
257
-						#clock-cells = <0>;
258
-						reg = <5>;
259
-					};
260
-
261
-					usart0_clk: usart0_clk {
262
-						#clock-cells = <0>;
263
-						reg = <6>;
264
-					};
265
-
266
-					usart1_clk: usart1_clk {
267
-						#clock-cells = <0>;
268
-						reg = <7>;
269
-					};
270
-
271
-					usart2_clk: usart2_clk {
272
-						#clock-cells = <0>;
273
-						reg = <8>;
274
-					};
275
-
276
-					usart3_clk: usart3_clk {
277
-						#clock-cells = <0>;
278
-						reg = <9>;
279
-					};
280
-
281
-					mci0_clk: mci0_clk {
282
-						#clock-cells = <0>;
283
-						reg = <10>;
284
-					};
285
-
286
-					udc_clk: udc_clk {
287
-						#clock-cells = <0>;
288
-						reg = <11>;
289
-					};
290
-
291
-					twi0_clk: twi0_clk {
292
-						reg = <12>;
293
-						#clock-cells = <0>;
294
-					};
295
-
296
-					spi0_clk: spi0_clk {
297
-						#clock-cells = <0>;
298
-						reg = <13>;
299
-					};
300
-
301
-					ssc0_clk: ssc0_clk {
302
-						#clock-cells = <0>;
303
-						reg = <14>;
304
-					};
305
-
306
-					ssc1_clk: ssc1_clk {
307
-						#clock-cells = <0>;
308
-						reg = <15>;
309
-					};
310
-
311
-					ssc2_clk: ssc2_clk {
312
-						#clock-cells = <0>;
313
-						reg = <16>;
314
-					};
315
-
316
-					tc0_clk: tc0_clk {
317
-						#clock-cells = <0>;
318
-						reg = <17>;
319
-					};
320
-
321
-					tc1_clk: tc1_clk {
322
-						#clock-cells = <0>;
323
-						reg = <18>;
324
-					};
325
-
326
-					tc2_clk: tc2_clk {
327
-						#clock-cells = <0>;
328
-						reg = <19>;
329
-					};
330
-
331
-					tc3_clk: tc3_clk {
332
-						#clock-cells = <0>;
333
-						reg = <20>;
334
-					};
335
-
336
-					tc4_clk: tc4_clk {
337
-						#clock-cells = <0>;
338
-						reg = <21>;
339
-					};
340
-
341
-					tc5_clk: tc5_clk {
342
-						#clock-cells = <0>;
343
-						reg = <22>;
344
-					};
345
-
346
-					ohci_clk: ohci_clk {
347
-						#clock-cells = <0>;
348
-						reg = <23>;
349
-					};
350
-
351
-					macb0_clk: macb0_clk {
352
-						#clock-cells = <0>;
353
-						reg = <24>;
354
-					};
355
-				};
108
+				#clock-cells = <2>;
109
+				clocks = <&slow_xtal>, <&main_xtal>;
110
+				clock-names = "slow_xtal", "main_xtal";
356
111
 			};
357
112
 
358
113
 			st: timer@fffffd00 {
..
..
@@ -382,7 +137,7 @@
382
137
 				interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0
383
138
 					      18 IRQ_TYPE_LEVEL_HIGH 0
384
139
 					      19 IRQ_TYPE_LEVEL_HIGH 0>;
385
-				clocks = <&tc0_clk>, <&tc1_clk>, <&tc2_clk>, <&slow_xtal>;
140
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 17>, <&pmc PMC_TYPE_PERIPHERAL 18>, <&pmc PMC_TYPE_PERIPHERAL 19>, <&slow_xtal>;
386
141
 				clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk";
387
142
 			};
388
143
 
..
..
@@ -394,7 +149,7 @@
394
149
 				interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0
395
150
 					      21 IRQ_TYPE_LEVEL_HIGH 0
396
151
 					      22 IRQ_TYPE_LEVEL_HIGH 0>;
397
-				clocks = <&tc3_clk>, <&tc4_clk>, <&tc5_clk>, <&slow_xtal>;
152
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 20>, <&pmc PMC_TYPE_PERIPHERAL 21>, <&pmc PMC_TYPE_PERIPHERAL 22>, <&slow_xtal>;
398
153
 				clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk";
399
154
 			};
400
155
 
..
..
@@ -404,7 +159,7 @@
404
159
 				interrupts = <12 IRQ_TYPE_LEVEL_HIGH 6>;
405
160
 				pinctrl-names = "default";
406
161
 				pinctrl-0 = <&pinctrl_twi>;
407
-				clocks = <&twi0_clk>;
162
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 12>;
408
163
 				#address-cells = <1>;
409
164
 				#size-cells = <0>;
410
165
 				status = "disabled";
..
..
@@ -414,11 +169,10 @@
414
169
 				compatible = "atmel,hsmci";
415
170
 				reg = <0xfffb4000 0x4000>;
416
171
 				interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
417
-				clocks = <&mci0_clk>;
172
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 10>;
418
173
 				clock-names = "mci_clk";
419
174
 				#address-cells = <1>;
420
175
 				#size-cells = <0>;
421
-				pinctrl-names = "default";
422
176
 				status = "disabled";
423
177
 			};
424
178
 
..
..
@@ -428,7 +182,7 @@
428
182
 				interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
429
183
 				pinctrl-names = "default";
430
184
 				pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
431
-				clocks = <&ssc0_clk>;
185
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
432
186
 				clock-names = "pclk";
433
187
 				status = "disabled";
434
188
 			};
..
..
@@ -439,7 +193,7 @@
439
193
 				interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>;
440
194
 				pinctrl-names = "default";
441
195
 				pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
442
-				clocks = <&ssc1_clk>;
196
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 15>;
443
197
 				clock-names = "pclk";
444
198
 				status = "disabled";
445
199
 			};
..
..
@@ -450,7 +204,7 @@
450
204
 				interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
451
205
 				pinctrl-names = "default";
452
206
 				pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>;
453
-				clocks = <&ssc2_clk>;
207
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 16>;
454
208
 				clock-names = "pclk";
455
209
 				status = "disabled";
456
210
 			};
..
..
@@ -462,7 +216,7 @@
462
216
 				phy-mode = "rmii";
463
217
 				pinctrl-names = "default";
464
218
 				pinctrl-0 = <&pinctrl_macb_rmii>;
465
-				clocks = <&macb0_clk>;
219
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 24>;
466
220
 				clock-names = "ether_clk";
467
221
 				status = "disabled";
468
222
 			};
..
..
@@ -802,7 +556,7 @@
802
556
 					gpio-controller;
803
557
 					interrupt-controller;
804
558
 					#interrupt-cells = <2>;
805
-					clocks = <&pioA_clk>;
559
+					clocks = <&pmc PMC_TYPE_PERIPHERAL 2>;
806
560
 				};
807
561
 
808
562
 				pioB: gpio@fffff600 {
..
..
@@ -813,7 +567,7 @@
813
567
 					gpio-controller;
814
568
 					interrupt-controller;
815
569
 					#interrupt-cells = <2>;
816
-					clocks = <&pioB_clk>;
570
+					clocks = <&pmc PMC_TYPE_PERIPHERAL 3>;
817
571
 				};
818
572
 
819
573
 				pioC: gpio@fffff800 {
..
..
@@ -824,7 +578,7 @@
824
578
 					gpio-controller;
825
579
 					interrupt-controller;
826
580
 					#interrupt-cells = <2>;
827
-					clocks = <&pioC_clk>;
581
+					clocks = <&pmc PMC_TYPE_PERIPHERAL 4>;
828
582
 				};
829
583
 
830
584
 				pioD: gpio@fffffa00 {
..
..
@@ -835,7 +589,7 @@
835
589
 					gpio-controller;
836
590
 					interrupt-controller;
837
591
 					#interrupt-cells = <2>;
838
-					clocks = <&pioD_clk>;
592
+					clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
839
593
 				};
840
594
 			};
841
595
 
..
..
@@ -845,7 +599,7 @@
845
599
 				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
846
600
 				pinctrl-names = "default";
847
601
 				pinctrl-0 = <&pinctrl_dbgu>;
848
-				clocks = <&mck>;
602
+				clocks = <&pmc PMC_TYPE_CORE PMC_MCK>;
849
603
 				clock-names = "usart";
850
604
 				status = "disabled";
851
605
 			};
..
..
@@ -858,7 +612,7 @@
858
612
 				atmel,use-dma-tx;
859
613
 				pinctrl-names = "default";
860
614
 				pinctrl-0 = <&pinctrl_uart0>;
861
-				clocks = <&usart0_clk>;
615
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 6>;
862
616
 				clock-names = "usart";
863
617
 				status = "disabled";
864
618
 			};
..
..
@@ -871,7 +625,7 @@
871
625
 				atmel,use-dma-tx;
872
626
 				pinctrl-names = "default";
873
627
 				pinctrl-0 = <&pinctrl_uart1>;
874
-				clocks = <&usart1_clk>;
628
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 7>;
875
629
 				clock-names = "usart";
876
630
 				status = "disabled";
877
631
 			};
..
..
@@ -884,7 +638,7 @@
884
638
 				atmel,use-dma-tx;
885
639
 				pinctrl-names = "default";
886
640
 				pinctrl-0 = <&pinctrl_uart2>;
887
-				clocks = <&usart2_clk>;
641
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 8>;
888
642
 				clock-names = "usart";
889
643
 				status = "disabled";
890
644
 			};
..
..
@@ -897,7 +651,7 @@
897
651
 				atmel,use-dma-tx;
898
652
 				pinctrl-names = "default";
899
653
 				pinctrl-0 = <&pinctrl_uart3>;
900
-				clocks = <&usart3_clk>;
654
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;
901
655
 				clock-names = "usart";
902
656
 				status = "disabled";
903
657
 			};
..
..
@@ -906,7 +660,7 @@
906
660
 				compatible = "atmel,at91rm9200-udc";
907
661
 				reg = <0xfffb0000 0x4000>;
908
662
 				interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;
909
-				clocks = <&udc_clk>, <&udpck>;
663
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 11>, <&pmc PMC_TYPE_SYSTEM 1>;
910
664
 				clock-names = "pclk", "hclk";
911
665
 				status = "disabled";
912
666
 			};
..
..
@@ -919,7 +673,7 @@
919
673
 				interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
920
674
 				pinctrl-names = "default";
921
675
 				pinctrl-0 = <&pinctrl_spi0>;
922
-				clocks = <&spi0_clk>;
676
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;
923
677
 				clock-names = "spi_clk";
924
678
 				status = "disabled";
925
679
 			};
..
..
@@ -946,7 +700,7 @@
946
700
 			compatible = "atmel,at91rm9200-ohci", "usb-ohci";
947
701
 			reg = <0x00300000 0x100000>;
948
702
 			interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;
949
-			clocks = <&ohci_clk>, <&ohci_clk>, <&uhpck>;
703
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 23>, <&pmc PMC_TYPE_PERIPHERAL 23>, <&pmc PMC_TYPE_SYSTEM 4>;
950
704
 			clock-names = "ohci_clk", "hclk", "uhpck";
951
705
 			status = "disabled";
952
706
 		};