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

hc

2024-09-20 a36159eec6ca17402b0e146b86efaf76568dc353

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -34,15 +34,6 @@
34
34
 		vin-supply = <&vcc3v3_sys>;
35
35
 	};
36
36
 
37
-	vcc3v3_vga: vcc3v3-vga {
38
-		compatible = "regulator-fixed";
39
-		regulator-name = "vcc3v3_vga";
40
-		regulator-always-on;
41
-		regulator-boot-on;
42
-		gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
43
-		enable-active-high;
44
-		vin-supply = <&vcc3v3_sys>;
45
-	};
46
37
 
47
38
 	pcie30_avdd0v9: pcie30-avdd0v9 {
48
39
 		compatible = "regulator-fixed";
..
..
@@ -69,7 +60,9 @@
69
60
 		regulator-name = "vcc3v3_pcie";
70
61
 		regulator-min-microvolt = <3300000>;
71
62
 		regulator-max-microvolt = <3300000>;
63
+		regulator-always-on;
72
64
 		enable-active-high;
65
+		regulator-boot-on;
73
66
 		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
74
67
 		startup-delay-us = <5000>;
75
68
 		vin-supply = <&dc_12v>;
..
..
@@ -96,6 +89,24 @@
96
89
 		regulator-boot-on;
97
90
     	};
98
91
 #endif
92
+
93
+		leds: leds {
94
+		compatible = "gpio-leds";
95
+		sig_led: sig_led {
96
+			gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;
97
+			default-state = "on";
98
+		};
99
+	};
100
+	
101
+		leds: leds {
102
+		compatible = "gpio-leds";	
103
+		err_led: err_led {
104
+			gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
105
+			default-state = "on";
106
+		};
107
+	};
108
+
109
+
99
110
 	ndj_io_init {
100
111
          	compatible = "nk_io_control";	
101
112
 			pinctrl-names = "default";
..
..
@@ -113,8 +124,18 @@
113
124
 				gpio_function = <0>;
114
125
 			};
115
126
 			
116
-			hub_host2_rst {
117
-				gpio_num = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;  //HUB_RST_GPIO4_D2_3V3
127
+			vcc_3.3v {
128
+				gpio_num = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
129
+				gpio_function = <0>;
130
+			};
131
+			
132
+			ax88772_rst {
133
+				gpio_num = <&gpio3 RK_PB5 GPIO_ACTIVE_HIGH>;  //AX88772_RST_GPIO3_B5_3V3
134
+				gpio_function = <3>;
135
+			};
136
+			
137
+			ax88631_rst {
138
+				gpio_num = <&gpio3 RK_PB6 GPIO_ACTIVE_HIGH>;  //AX88772_RST_GPIO3_B6_3V3
118
139
 				gpio_function = <3>;
119
140
 			};
120
141
 			
..
..
@@ -143,22 +164,15 @@
143
164
 				gpio_function = <0>;
144
165
 			};
145
166
 			
146
-			hp_en {
147
-				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
167
+			//gpio99 {
168
+			//	gpio_num = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
169
+			//	gpio_function = <1>;
170
+			//};
171
+			
172
+			wifi_power_en {
173
+				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
148
174
 				gpio_function = <0>;
149
175
 			};
150
-			
151
-			usb_ogt {
152
-				gpio_num = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; //OTG_EN_OC_GPIO0_C2
153
-				gpio_function = <0>;
154
-			};
155
-			
156
-			m2_wifi_pwr {
157
-				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;//WIFI_PWREN_GPIO3_C6_1V8
158
-				gpio_function = <0>;
159
-			};
160
-			
161
-			 
162
176
 	#if 0		
163
177
 			do1 {
164
178
 				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
..
..
@@ -225,8 +239,9 @@
225
239
 				compatible = "simple-panel";
226
240
 				backlight = <&backlight>;
227
241
 				power-supply = <&vcc3v3_lcd0_n>;
228
-				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4				
229
-				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_PWBLK_H_GPIO0_B7
242
+				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
243
+				reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
244
+				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
230
245
 				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
231
246
 				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
232
247
 				bpc = <8>;
..
..
@@ -256,7 +271,7 @@
256
271
 					pixelclk-active = <0>;			
257
272
 					};
258
273
 				};
259
-				port {
274
+				ports {
260
275
 					panel_in_lvds: endpoint {
261
276
 					remote-endpoint = <&lvds_out>;
262
277
 						};
..
..
@@ -348,6 +363,10 @@
348
363
  * video_phy1 needs to be enabled
349
364
  * when dsi1 is enabled
350
365
  */
366
+ 
367
+&video_phy1 {
368
+	status = "disabled";
369
+}; 
351
370
 &dsi1 {
352
371
 	status = "disabled";
353
372
 };
..
..
@@ -361,39 +380,31 @@
361
380
 };
362
381
 
363
382
 &dsi1_panel {
364
-	power-supply = <&vcc3v3_lcd1_n>;
383
+//	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
384
+    vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
385
+    reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
386
+    vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
387
+    pinctrl-names = "default";
388
+    pinctrl-0 = <&lcd1_rst_gpio>;
365
389
 };
390
+
391
+&route_dsi1 {
392
+	status = "disabled";
393
+	connect = <&vp1_out_dsi1>;
394
+};
395
+
396
+
397
+/*
398
+*  edp_start
399
+*/
366
400
 
367
401
 &edp {
368
-	//hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;	
369
402
     force-hpd;
370
-    status = "okay";
371
-};
372
-
373
-&lvds {
374
-    status = "disabled";
375
-    ports {
376
-        port@1 {
377
-            reg = <1>;
378
-            lvds_out: endpoint {
379
-                remote-endpoint = <&panel_in_lvds>;
380
-            };
381
-        };
382
-   
383
-	};
384
-};
385
-
386
-&route_lvds{
387
-	 status = "disabled";
388
-	 connect = <&vp2_out_lvds>;
389
-};
390
-
391
-&lvds_in_vp2 {
392
403
 	status = "disabled";
393
404
 };
394
405
 
395
406
 &edp_phy {
396
-	status = "okay";
407
+	status = "disabled";
397
408
 };
398
409
 
399
410
 &edp_in_vp0 {
..
..
@@ -401,15 +412,39 @@
401
412
 };
402
413
 
403
414
 &edp_in_vp1 {
404
-    status = "okay";
415
+    status = "disabled";
405
416
 
406
417
 };
407
418
 
408
419
 &route_edp {
409
-    status = "okay";
420
+    status = "disabled";
410
421
     connect = <&vp1_out_edp>;
411
422
 };
412
423
 
424
+&route_edp {
425
+	status = "disabled";
426
+};
427
+
428
+&lvds {
429
+	status = "disabled";
430
+	ports {
431
+		port@1 {
432
+			reg = <1>;
433
+			lvds_out:endpoint {
434
+				remote-endpoint = <&panel_in_lvds>;
435
+			};
436
+		};
437
+	};
438
+};
439
+
440
+&route_lvds{
441
+	status = "okay";
442
+	connect = <&vp1_out_lvds>;
443
+};
444
+
445
+&lvds_in_vp1 {
446
+	status = "disabled";
447
+};
413
448
 
414
449
 /*
415
450
 *  edp_end
..
..
@@ -625,20 +660,14 @@
625
660
 	};
626
661
 };
627
662
 
628
-&video_phy0 {
629
-	status = "okay";
630
-};
631
663
 
632
-&video_phy1 {
664
+
665
+&pcie30phy {
633
666
 	status = "disabled";
634
667
 };
635
668
 
636
-&pcie30phy {
637
-	status = "okay";
638
-};
639
-
640
-&pcie3x2 {
641
-	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
669
+&pcie2x1 {
670
+	reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
642
671
 	vpcie3v3-supply = <&vcc3v3_pcie>;
643
672
 	status = "okay";
644
673
 };
..
..
@@ -693,15 +722,21 @@
693
722
 							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
694
723
 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
695
724
 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
725
+							<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
726
+							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
727
+							<3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
696
728
 							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
697
-							<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //12
698
-							<0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,  //13
699
-							<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,  //16
700
-							<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,  //17
701
-							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
702
-							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
703
-							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
704
-							<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3
729
+							<0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B0_u_3V3  DO1 8
730
+							<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B3_u_3V3  DO2 11
731
+							<0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B4_u_3V3  DO3 12
732
+							<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B5_u_3V3  DO4 13
733
+							<0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B6_u_3V3  DO5 14
734
+							
735
+							<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C0_d_3V3  DI1 16
736
+							<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C1_d_3V3  DI2 17
737
+							<0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C2_d_3V3  DI3 18
738
+							<0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C3_d_3V3  DI4 19
739
+							<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C5_d_3V3  DI5 21
705
740
 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
706
741
 		};
707
742
 	};
..
..
@@ -767,15 +802,6 @@
767
802
 	pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>;
768
803
 };
769
804
 
770
-&vcc3v3_lcd0_n {
771
-	gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; 
772
-	enable-active-high;
773
-};
774
-
775
-&vcc3v3_lcd1_n {
776
-	gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; //MIPI_3V3EN_GPIO3_A3_d_3V3
777
-	enable-active-high;
778
-};
779
805
 
780
806
 &wireless_wlan {
781
807
 	pinctrl-names = "default";
..
..
@@ -795,7 +821,7 @@
795
821
 	BT,reset_gpio    = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
796
822
     BT,wake_gpio     = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
797
823
     BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
798
-	status = "okay";
824
+	status = "disabled";
799
825
 };
800
826
 
801
827
 &uart0 {
..
..
@@ -814,7 +840,7 @@
814
840
 };
815
841
 
816
842
 &uart4 {
817
-	status = "okay";
843
+	status = "disabled";
818
844
 	pinctrl-0 = <&uart4m1_xfer>;
819
845
 };
820
846
 
..
..
@@ -823,11 +849,17 @@
823
849
 	pinctrl-0 = <&uart5m1_xfer>;
824
850
 };
825
851
 
852
+
826
853
 &uart7 {
827
-	status = "disabled";
854
+	status = "okay";
828
855
 	pinctrl-0 = <&uart7m1_xfer>;
829
856
 };
830
857
 
858
+&uart8 {
859
+	status = "disabled";
860
+	pinctrl-0 = <&uart8m1_xfer>;
861
+};
862
+
831
863
 &uart9 {
832
864
 	status = "disabled";
833
865
 	pinctrl-0 = <&uart9m1_xfer>;