kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
..
..
@@ -12,6 +12,8 @@
12
12
 #include <dt-bindings/gpio/gpio.h>
13
13
 #include <dt-bindings/interrupt-controller/irq.h>
14
14
 #include <dt-bindings/interrupt-controller/arm-gic.h>
15
+#include <dt-bindings/power/meson-gxbb-power.h>
16
+#include <dt-bindings/thermal/thermal.h>
15
17
 
16
18
 / {
17
19
 	interrupt-parent = <&gic>;
..
..
@@ -50,9 +52,31 @@
50
52
 		linux,cma {
51
53
 			compatible = "shared-dma-pool";
52
54
 			reusable;
53
-			size = <0x0 0xbc00000>;
55
+			size = <0x0 0x10000000>;
54
56
 			alignment = <0x0 0x400000>;
55
57
 			linux,cma-default;
58
+		};
59
+	};
60
+
61
+	chosen {
62
+		#address-cells = <2>;
63
+		#size-cells = <2>;
64
+		ranges;
65
+
66
+		simplefb_cvbs: framebuffer-cvbs {
67
+			compatible = "amlogic,simple-framebuffer",
68
+				     "simple-framebuffer";
69
+			amlogic,pipeline = "vpu-cvbs";
70
+			power-domains = <&pwrc PWRC_GXBB_VPU_ID>;
71
+			status = "disabled";
72
+		};
73
+
74
+		simplefb_hdmi: framebuffer-hdmi {
75
+			compatible = "amlogic,simple-framebuffer",
76
+				     "simple-framebuffer";
77
+			amlogic,pipeline = "vpu-hdmi";
78
+			power-domains = <&pwrc PWRC_GXBB_VPU_ID>;
79
+			status = "disabled";
56
80
 		};
57
81
 	};
58
82
 
..
..
@@ -62,42 +86,93 @@
62
86
 
63
87
 		cpu0: cpu@0 {
64
88
 			device_type = "cpu";
65
-			compatible = "arm,cortex-a53", "arm,armv8";
89
+			compatible = "arm,cortex-a53";
66
90
 			reg = <0x0 0x0>;
67
91
 			enable-method = "psci";
68
92
 			next-level-cache = <&l2>;
69
93
 			clocks = <&scpi_dvfs 0>;
94
+			#cooling-cells = <2>;
70
95
 		};
71
96
 
72
97
 		cpu1: cpu@1 {
73
98
 			device_type = "cpu";
74
-			compatible = "arm,cortex-a53", "arm,armv8";
99
+			compatible = "arm,cortex-a53";
75
100
 			reg = <0x0 0x1>;
76
101
 			enable-method = "psci";
77
102
 			next-level-cache = <&l2>;
78
103
 			clocks = <&scpi_dvfs 0>;
104
+			#cooling-cells = <2>;
79
105
 		};
80
106
 
81
107
 		cpu2: cpu@2 {
82
108
 			device_type = "cpu";
83
-			compatible = "arm,cortex-a53", "arm,armv8";
109
+			compatible = "arm,cortex-a53";
84
110
 			reg = <0x0 0x2>;
85
111
 			enable-method = "psci";
86
112
 			next-level-cache = <&l2>;
87
113
 			clocks = <&scpi_dvfs 0>;
114
+			#cooling-cells = <2>;
88
115
 		};
89
116
 
90
117
 		cpu3: cpu@3 {
91
118
 			device_type = "cpu";
92
-			compatible = "arm,cortex-a53", "arm,armv8";
119
+			compatible = "arm,cortex-a53";
93
120
 			reg = <0x0 0x3>;
94
121
 			enable-method = "psci";
95
122
 			next-level-cache = <&l2>;
96
123
 			clocks = <&scpi_dvfs 0>;
124
+			#cooling-cells = <2>;
97
125
 		};
98
126
 
99
127
 		l2: l2-cache0 {
100
128
 			compatible = "cache";
129
+		};
130
+	};
131
+
132
+	thermal-zones {
133
+		cpu-thermal {
134
+			polling-delay-passive = <250>; /* milliseconds */
135
+			polling-delay = <1000>; /* milliseconds */
136
+
137
+			thermal-sensors = <&scpi_sensors 0>;
138
+
139
+			trips {
140
+				cpu_passive: cpu-passive {
141
+					temperature = <80000>; /* millicelsius */
142
+					hysteresis = <2000>; /* millicelsius */
143
+					type = "passive";
144
+				};
145
+
146
+				cpu_hot: cpu-hot {
147
+					temperature = <90000>; /* millicelsius */
148
+					hysteresis = <2000>; /* millicelsius */
149
+					type = "hot";
150
+				};
151
+
152
+				cpu_critical: cpu-critical {
153
+					temperature = <110000>; /* millicelsius */
154
+					hysteresis = <2000>; /* millicelsius */
155
+					type = "critical";
156
+				};
157
+			};
158
+
159
+			cpu_cooling_maps: cooling-maps {
160
+				map0 {
161
+					trip = <&cpu_passive>;
162
+					cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
163
+							 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
164
+							 <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
165
+							 <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
166
+				};
167
+
168
+				map1 {
169
+					trip = <&cpu_hot>;
170
+					cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
171
+							 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
172
+							 <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
173
+							 <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
174
+				};
175
+			};
101
176
 		};
102
177
 	};
103
178
 
..
..
@@ -145,6 +220,7 @@
145
220
 		#address-cells = <1>;
146
221
 		#size-cells = <1>;
147
222
 		read-only;
223
+		secure-monitor = <&sm>;
148
224
 
149
225
 		sn: sn@14 {
150
226
 			reg = <0x14 0x10>;
..
..
@@ -204,9 +280,20 @@
204
280
 			};
205
281
 
206
282
 			reset: reset-controller@4404 {
207
-				compatible = "amlogic,meson-gx-reset", "amlogic,meson-gxbb-reset";
283
+				compatible = "amlogic,meson-gxbb-reset";
208
284
 				reg = <0x0 0x04404 0x0 0x9c>;
209
285
 				#reset-cells = <1>;
286
+			};
287
+
288
+			aiu: audio-controller@5400 {
289
+				compatible = "amlogic,aiu";
290
+				#sound-dai-cells = <2>;
291
+				sound-name-prefix = "AIU";
292
+				reg = <0x0 0x5400 0x0 0x2ac>;
293
+				interrupts = <GIC_SPI 48 IRQ_TYPE_EDGE_RISING>,
294
+					     <GIC_SPI 50 IRQ_TYPE_EDGE_RISING>;
295
+				interrupt-names = "i2s", "spdif";
296
+				status = "disabled";
210
297
 			};
211
298
 
212
299
 			uart_A: serial@84c0 {
..
..
@@ -224,7 +311,7 @@
224
311
 			};
225
312
 
226
313
 			i2c_A: i2c@8500 {
227
-				compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c";
314
+				compatible = "amlogic,meson-gxbb-i2c";
228
315
 				reg = <0x0 0x08500 0x0 0x20>;
229
316
 				interrupts = <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>;
230
317
 				#address-cells = <1>;
..
..
@@ -268,8 +355,13 @@
268
355
 				status = "disabled";
269
356
 			};
270
357
 
358
+			clock-measure@8758 {
359
+				compatible = "amlogic,meson-gx-clk-measure";
360
+				reg = <0x0 0x8758 0x0 0x10>;
361
+			};
362
+
271
363
 			i2c_B: i2c@87c0 {
272
-				compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c";
364
+				compatible = "amlogic,meson-gxbb-i2c";
273
365
 				reg = <0x0 0x087c0 0x0 0x20>;
274
366
 				interrupts = <GIC_SPI 214 IRQ_TYPE_EDGE_RISING>;
275
367
 				#address-cells = <1>;
..
..
@@ -278,7 +370,7 @@
278
370
 			};
279
371
 
280
372
 			i2c_C: i2c@87e0 {
281
-				compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c";
373
+				compatible = "amlogic,meson-gxbb-i2c";
282
374
 				reg = <0x0 0x087e0 0x0 0x20>;
283
375
 				interrupts = <GIC_SPI 215 IRQ_TYPE_EDGE_RISING>;
284
376
 				#address-cells = <1>;
..
..
@@ -296,7 +388,7 @@
296
388
 			};
297
389
 
298
390
 			spifc: spi@8c80 {
299
-				compatible = "amlogic,meson-gx-spifc", "amlogic,meson-gxbb-spifc";
391
+				compatible = "amlogic,meson-gxbb-spifc";
300
392
 				reg = <0x0 0x08c80 0x0 0x80>;
301
393
 				#address-cells = <1>;
302
394
 				#size-cells = <0>;
..
..
@@ -304,7 +396,7 @@
304
396
 			};
305
397
 
306
398
 			watchdog@98d0 {
307
-				compatible = "amlogic,meson-gx-wdt", "amlogic,meson-gxbb-wdt";
399
+				compatible = "amlogic,meson-gxbb-wdt";
308
400
 				reg = <0x0 0x098d0 0x0 0x10>;
309
401
 				clocks = <&xtal>;
310
402
 			};
..
..
@@ -324,20 +416,20 @@
324
416
 		};
325
417
 
326
418
 		sram: sram@c8000000 {
327
-			compatible = "amlogic,meson-gx-sram", "amlogic,meson-gxbb-sram", "mmio-sram";
419
+			compatible = "mmio-sram";
328
420
 			reg = <0x0 0xc8000000 0x0 0x14000>;
329
421
 
330
422
 			#address-cells = <1>;
331
423
 			#size-cells = <1>;
332
424
 			ranges = <0 0x0 0xc8000000 0x14000>;
333
425
 
334
-			cpu_scp_lpri: scp-shmem@0 {
335
-				compatible = "amlogic,meson-gx-scp-shmem", "amlogic,meson-gxbb-scp-shmem";
426
+			cpu_scp_lpri: scp-sram@0 {
427
+				compatible = "amlogic,meson-gxbb-scp-shmem";
336
428
 				reg = <0x13000 0x400>;
337
429
 			};
338
430
 
339
-			cpu_scp_hpri: scp-shmem@200 {
340
-				compatible = "amlogic,meson-gx-scp-shmem", "amlogic,meson-gxbb-scp-shmem";
431
+			cpu_scp_hpri: scp-sram@200 {
432
+				compatible = "amlogic,meson-gxbb-scp-shmem";
341
433
 				reg = <0x13400 0x400>;
342
434
 			};
343
435
 		};
..
..
@@ -350,14 +442,8 @@
350
442
 			ranges = <0x0 0x0 0x0 0xc8100000 0x0 0x100000>;
351
443
 
352
444
 			sysctrl_AO: sys-ctrl@0 {
353
-				compatible = "amlogic,meson-gx-ao-sysctrl", "syscon", "simple-mfd";
445
+				compatible = "amlogic,meson-gx-ao-sysctrl", "simple-mfd", "syscon";
354
446
 				reg =  <0x0 0x0 0x0 0x100>;
355
-
356
-				pwrc_vpu: power-controller-vpu {
357
-					compatible = "amlogic,meson-gx-pwrc-vpu";
358
-					#power-domain-cells = <0>;
359
-					amlogic,hhi-sysctrl = <&sysctrl>;
360
-				};
361
447
 
362
448
 				clkc_AO: clock-controller {
363
449
 					compatible = "amlogic,meson-gx-aoclkc";
..
..
@@ -370,6 +456,7 @@
370
456
 				compatible = "amlogic,meson-gx-ao-cec";
371
457
 				reg = <0x0 0x00100 0x0 0x14>;
372
458
 				interrupts = <GIC_SPI 199 IRQ_TYPE_EDGE_RISING>;
459
+				status = "disabled";
373
460
 			};
374
461
 
375
462
 			sec_AO: ao-secure@140 {
..
..
@@ -393,7 +480,7 @@
393
480
 			};
394
481
 
395
482
 			i2c_AO: i2c@500 {
396
-				compatible = "amlogic,meson-gx-i2c", "amlogic,meson-gxbb-i2c";
483
+				compatible = "amlogic,meson-gxbb-i2c";
397
484
 				reg = <0x0 0x500 0x0 0x20>;
398
485
 				interrupts = <GIC_SPI 195 IRQ_TYPE_EDGE_RISING>;
399
486
 				#address-cells = <1>;
..
..
@@ -416,7 +503,21 @@
416
503
 			};
417
504
 		};
418
505
 
419
-		periphs: periphs@c8834000 {
506
+		vdec: video-codec@c8820000 {
507
+			compatible = "amlogic,gx-vdec";
508
+			reg = <0x0 0xc8820000 0x0 0x10000>,
509
+			      <0x0 0xc110a580 0x0 0xe4>;
510
+			reg-names = "dos", "esparser";
511
+
512
+			interrupts = <GIC_SPI 44 IRQ_TYPE_EDGE_RISING>,
513
+				     <GIC_SPI 32 IRQ_TYPE_EDGE_RISING>;
514
+			interrupt-names = "vdec", "esparser";
515
+
516
+			amlogic,ao-sysctrl = <&sysctrl_AO>;
517
+			amlogic,canvas = <&canvas>;
518
+		};
519
+
520
+		periphs: bus@c8834000 {
420
521
 			compatible = "simple-bus";
421
522
 			reg = <0x0 0xc8834000 0x0 0x2000>;
422
523
 			#address-cells = <2>;
..
..
@@ -429,6 +530,19 @@
429
530
 			};
430
531
 		};
431
532
 
533
+		dmcbus: bus@c8838000 {
534
+			compatible = "simple-bus";
535
+			reg = <0x0 0xc8838000 0x0 0x400>;
536
+			#address-cells = <2>;
537
+			#size-cells = <2>;
538
+			ranges = <0x0 0x0 0x0 0xc8838000 0x0 0x400>;
539
+
540
+			canvas: video-lut@48 {
541
+				compatible = "amlogic,canvas";
542
+				reg = <0x0 0x48 0x0 0x14>;
543
+			};
544
+		};
545
+
432
546
 		hiubus: bus@c883c000 {
433
547
 			compatible = "simple-bus";
434
548
 			reg = <0x0 0xc883c000 0x0 0x2000>;
..
..
@@ -437,12 +551,18 @@
437
551
 			ranges = <0x0 0x0 0x0 0xc883c000 0x0 0x2000>;
438
552
 
439
553
 			sysctrl: system-controller@0 {
440
-				compatible = "amlogic,meson-gx-hhi-sysctrl", "syscon", "simple-mfd";
554
+				compatible = "amlogic,meson-gx-hhi-sysctrl", "simple-mfd", "syscon";
441
555
 				reg = <0 0 0 0x400>;
556
+
557
+				pwrc: power-controller {
558
+					compatible = "amlogic,meson-gxbb-pwrc";
559
+					#power-domain-cells = <1>;
560
+					amlogic,ao-sysctrl = <&sysctrl_AO>;
561
+				};
442
562
 			};
443
563
 
444
564
 			mailbox: mailbox@404 {
445
-				compatible = "amlogic,meson-gx-mhu", "amlogic,meson-gxbb-mhu";
565
+				compatible = "amlogic,meson-gxbb-mhu";
446
566
 				reg = <0 0x404 0 0x4c>;
447
567
 				interrupts = <GIC_SPI 208 IRQ_TYPE_EDGE_RISING>,
448
568
 					     <GIC_SPI 209 IRQ_TYPE_EDGE_RISING>,
..
..
@@ -452,11 +572,16 @@
452
572
 		};
453
573
 
454
574
 		ethmac: ethernet@c9410000 {
455
-			compatible = "amlogic,meson-gx-dwmac", "amlogic,meson-gxbb-dwmac", "snps,dwmac";
456
-			reg = <0x0 0xc9410000 0x0 0x10000
457
-			       0x0 0xc8834540 0x0 0x4>;
458
-			interrupts = <GIC_SPI 8 IRQ_TYPE_EDGE_RISING>;
575
+			compatible = "amlogic,meson-gxbb-dwmac",
576
+				     "snps,dwmac-3.70a",
577
+				     "snps,dwmac";
578
+			reg = <0x0 0xc9410000 0x0 0x10000>,
579
+			      <0x0 0xc8834540 0x0 0x4>;
580
+			interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
459
581
 			interrupt-names = "macirq";
582
+			rx-fifo-depth = <4096>;
583
+			tx-fifo-depth = <2048>;
584
+			power-domains = <&pwrc PWRC_GXBB_ETHERNET_MEM_ID>;
460
585
 			status = "disabled";
461
586
 		};
462
587
 
..
..
@@ -492,12 +617,12 @@
492
617
 		vpu: vpu@d0100000 {
493
618
 			compatible = "amlogic,meson-gx-vpu";
494
619
 			reg = <0x0 0xd0100000 0x0 0x100000>,
495
-			      <0x0 0xc883c000 0x0 0x1000>,
496
-			      <0x0 0xc8838000 0x0 0x1000>;
497
-			reg-names = "vpu", "hhi", "dmc";
620
+			      <0x0 0xc883c000 0x0 0x1000>;
621
+			reg-names = "vpu", "hhi";
498
622
 			interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;
499
623
 			#address-cells = <1>;
500
624
 			#size-cells = <0>;
625
+			amlogic,canvas = <&canvas>;
501
626
 
502
627
 			/* CVBS VDAC output port */
503
628
 			cvbs_vdac_port: port@0 {
..
..
@@ -520,6 +645,8 @@
520
645
 			interrupts = <GIC_SPI 57 IRQ_TYPE_EDGE_RISING>;
521
646
 			#address-cells = <1>;
522
647
 			#size-cells = <0>;
648
+			#sound-dai-cells = <0>;
649
+			sound-name-prefix = "HDMITX";
523
650
 			status = "disabled";
524
651
 
525
652
 			/* VPU VENC Input */