重命名 AX88772C_eeprom/asix.c 为 asix_mac.c

hc

2024-09-20 a36159eec6ca17402b0e146b86efaf76568dc353

 kernel/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
..
..
@@ -8,8 +8,6 @@
8
8
 #include <dt-bindings/gpio/gpio.h>
9
9
 #include <dt-bindings/gpio/uniphier-gpio.h>
10
10
 
11
-/memreserve/ 0x80000000 0x02000000;
12
-
13
11
 / {
14
12
 	compatible = "socionext,uniphier-ld11";
15
13
 	#address-cells = <2>;
..
..
@@ -33,7 +31,7 @@
33
31
 
34
32
 		cpu0: cpu@0 {
35
33
 			device_type = "cpu";
36
-			compatible = "arm,cortex-a53", "arm,armv8";
34
+			compatible = "arm,cortex-a53";
37
35
 			reg = <0 0x000>;
38
36
 			clocks = <&sys_clk 33>;
39
37
 			enable-method = "psci";
..
..
@@ -42,7 +40,7 @@
42
40
 
43
41
 		cpu1: cpu@1 {
44
42
 			device_type = "cpu";
45
-			compatible = "arm,cortex-a53", "arm,armv8";
43
+			compatible = "arm,cortex-a53";
46
44
 			reg = <0 0x001>;
47
45
 			clocks = <&sys_clk 33>;
48
46
 			enable-method = "psci";
..
..
@@ -110,11 +108,48 @@
110
108
 			     <1 10 4>;
111
109
 	};
112
110
 
111
+	reserved-memory {
112
+		#address-cells = <2>;
113
+		#size-cells = <2>;
114
+		ranges;
115
+
116
+		secure-memory@81000000 {
117
+			reg = <0x0 0x81000000 0x0 0x01000000>;
118
+			no-map;
119
+		};
120
+	};
121
+
113
122
 	soc@0 {
114
123
 		compatible = "simple-bus";
115
124
 		#address-cells = <1>;
116
125
 		#size-cells = <1>;
117
126
 		ranges = <0 0 0 0xffffffff>;
127
+
128
+		spi0: spi@54006000 {
129
+			compatible = "socionext,uniphier-scssi";
130
+			status = "disabled";
131
+			reg = <0x54006000 0x100>;
132
+			#address-cells = <1>;
133
+			#size-cells = <0>;
134
+			interrupts = <0 39 4>;
135
+			pinctrl-names = "default";
136
+			pinctrl-0 = <&pinctrl_spi0>;
137
+			clocks = <&peri_clk 11>;
138
+			resets = <&peri_rst 11>;
139
+		};
140
+
141
+		spi1: spi@54006100 {
142
+			compatible = "socionext,uniphier-scssi";
143
+			status = "disabled";
144
+			reg = <0x54006100 0x100>;
145
+			#address-cells = <1>;
146
+			#size-cells = <0>;
147
+			interrupts = <0 216 4>;
148
+			pinctrl-names = "default";
149
+			pinctrl-0 = <&pinctrl_spi1>;
150
+			clocks = <&peri_clk 12>;
151
+			resets = <&peri_rst 12>;
152
+		};
118
153
 
119
154
 		serial0: serial@54006800 {
120
155
 			compatible = "socionext,uniphier-uart";
..
..
@@ -402,7 +437,7 @@
402
437
 			};
403
438
 		};
404
439
 
405
-		emmc: sdhc@5a000000 {
440
+		emmc: mmc@5a000000 {
406
441
 			compatible = "socionext,uniphier-sd4hc", "cdns,sd4hc";
407
442
 			reg = <0x5a000000 0x400>;
408
443
 			interrupts = <0 78 4>;
..
..
@@ -432,6 +467,8 @@
432
467
 				 <&mio_clk 12>;
433
468
 			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
434
469
 				 <&mio_rst 12>;
470
+			phy-names = "usb";
471
+			phys = <&usb_phy0>;
435
472
 			has-transaction-translator;
436
473
 		};
437
474
 
..
..
@@ -446,6 +483,8 @@
446
483
 				 <&mio_clk 13>;
447
484
 			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
448
485
 				 <&mio_rst 13>;
486
+			phy-names = "usb";
487
+			phys = <&usb_phy1>;
449
488
 			has-transaction-translator;
450
489
 		};
451
490
 
..
..
@@ -460,6 +499,8 @@
460
499
 				 <&mio_clk 14>;
461
500
 			resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
462
501
 				 <&mio_rst 14>;
502
+			phy-names = "usb";
503
+			phys = <&usb_phy2>;
463
504
 			has-transaction-translator;
464
505
 		};
465
506
 
..
..
@@ -488,6 +529,27 @@
488
529
 			pinctrl: pinctrl {
489
530
 				compatible = "socionext,uniphier-ld11-pinctrl";
490
531
 			};
532
+
533
+			usb-phy {
534
+				compatible = "socionext,uniphier-ld11-usb2-phy";
535
+				#address-cells = <1>;
536
+				#size-cells = <0>;
537
+
538
+				usb_phy0: phy@0 {
539
+					reg = <0>;
540
+					#phy-cells = <0>;
541
+				};
542
+
543
+				usb_phy1: phy@1 {
544
+					reg = <1>;
545
+					#phy-cells = <0>;
546
+				};
547
+
548
+				usb_phy2: phy@2 {
549
+					reg = <2>;
550
+					#phy-cells = <0>;
551
+				};
552
+			};
491
553
 		};
492
554
 
493
555
 		soc-glue@5f900000 {
..
..
@@ -508,7 +570,15 @@
508
570
 			};
509
571
 		};
510
572
 
511
-		aidet: aidet@5fc20000 {
573
+		xdmac: dma-controller@5fc10000 {
574
+			compatible = "socionext,uniphier-xdmac";
575
+			reg = <0x5fc10000 0x5300>;
576
+			interrupts = <0 188 4>;
577
+			dma-channels = <16>;
578
+			#dma-cells = <2>;
579
+		};
580
+
581
+		aidet: interrupt-controller@5fc20000 {
512
582
 			compatible = "socionext,uniphier-ld11-aidet";
513
583
 			reg = <0x5fc20000 0x200>;
514
584
 			interrupt-controller;
..
..
@@ -563,16 +633,20 @@
563
633
 			};
564
634
 		};
565
635
 
566
-		nand: nand@68000000 {
636
+		nand: nand-controller@68000000 {
567
637
 			compatible = "socionext,uniphier-denali-nand-v5b";
568
638
 			status = "disabled";
569
639
 			reg-names = "nand_data", "denali_reg";
570
640
 			reg = <0x68000000 0x20>, <0x68100000 0x1000>;
641
+			#address-cells = <1>;
642
+			#size-cells = <0>;
571
643
 			interrupts = <0 65 4>;
572
644
 			pinctrl-names = "default";
573
645
 			pinctrl-0 = <&pinctrl_nand>;
574
-			clocks = <&sys_clk 2>;
575
-			resets = <&sys_rst 2>;
646
+			clock-names = "nand", "nand_x", "ecc";
647
+			clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;
648
+			reset-names = "nand", "reg";
649
+			resets = <&sys_rst 2>, <&sys_rst 2>;
576
650
 		};
577
651
 	};
578
652
 };