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

hc

2024-09-20 a36159eec6ca17402b0e146b86efaf76568dc353

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -89,6 +89,24 @@
89
89
 		regulator-boot-on;
90
90
     	};
91
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
+
92
110
 	ndj_io_init {
93
111
          	compatible = "nk_io_control";	
94
112
 			pinctrl-names = "default";
..
..
@@ -106,8 +124,18 @@
106
124
 				gpio_function = <0>;
107
125
 			};
108
126
 			
109
-			hub_host2_rst {
110
-				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
111
139
 				gpio_function = <3>;
112
140
 			};
113
141
 			
..
..
@@ -136,10 +164,10 @@
136
164
 				gpio_function = <0>;
137
165
 			};
138
166
 			
139
-			hp_en {
140
-				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
141
-				gpio_function = <0>;
142
-			};
167
+			//gpio99 {
168
+			//	gpio_num = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
169
+			//	gpio_function = <1>;
170
+			//};
143
171
 			
144
172
 			wifi_power_en {
145
173
 				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
..
..
@@ -226,8 +254,8 @@
226
254
 				nodka-lvds = <15>;
227
255
 
228
256
 				display-timings {
229
-                native-mode = <&timing0>;
230
-                timing0: timing0 {
257
+                native-mode = <&timing>;
258
+                timing: timing {
231
259
 					clock-frequency = <72500000>;
232
260
 					hactive = <1280>;
233
261
 					vactive = <800>;
..
..
@@ -244,8 +272,8 @@
244
272
 					};
245
273
 				};
246
274
 				ports {
247
-					panel_in: endpoint {
248
-					remote-endpoint = <&edp_out>;
275
+					panel_in_lvds: endpoint {
276
+					remote-endpoint = <&lvds_out>;
249
277
 						};
250
278
 					};   
251
279
 				};
..
..
@@ -337,7 +365,7 @@
337
365
  */
338
366
  
339
367
 &video_phy1 {
340
-	status = "okay";
368
+	status = "disabled";
341
369
 }; 
342
370
 &dsi1 {
343
371
 	status = "disabled";
..
..
@@ -348,11 +376,11 @@
348
376
 };
349
377
 
350
378
 &dsi1_in_vp1 {
351
-	status = "okay";
379
+	status = "disabled";
352
380
 };
353
381
 
354
382
 &dsi1_panel {
355
-	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
383
+//	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
356
384
     vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
357
385
     reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
358
386
     vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
..
..
@@ -372,20 +400,11 @@
372
400
 
373
401
 &edp {
374
402
     force-hpd;
375
-    status = "okay";
376
-    ports {
377
-        port@1 {
378
-            reg = <1>;
379
-            edp_out: endpoint {
380
-                remote-endpoint = <&panel_in>;
381
-            };
382
-        };
383
-    };
403
+	status = "disabled";
384
404
 };
385
405
 
386
406
 &edp_phy {
387
-  status = "okay";
388
-
407
+	status = "disabled";
389
408
 };
390
409
 
391
410
 &edp_in_vp0 {
..
..
@@ -393,18 +412,40 @@
393
412
 };
394
413
 
395
414
 &edp_in_vp1 {
396
-    status = "okay";
415
+    status = "disabled";
397
416
 
398
417
 };
399
418
 
400
419
 &route_edp {
401
-    status = "okay";
420
+    status = "disabled";
402
421
     connect = <&vp1_out_edp>;
403
422
 };
404
423
 
405
424
 &route_edp {
406
-	status = "okay";
425
+	status = "disabled";
407
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
+};
448
+
408
449
 /*
409
450
 *  edp_end
410
451
 */
..
..
@@ -449,7 +490,7 @@
449
490
 	phy-mode = "rgmii";
450
491
 	clock_in_out = "output";
451
492
 
452
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
493
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
453
494
 	snps,reset-active-low;
454
495
 	/* Reset time is 20ms, 100ms for rtl8211f */
455
496
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -469,7 +510,9 @@
469
510
 	rx_delay = <0x2f>;
470
511
 
471
512
 	phy-handle = <&rgmii_phy0>;
513
+	
472
514
 	status = "disabled";
515
+	
473
516
 };
474
517
 
475
518
 &gmac1 {
..
..
@@ -503,9 +546,7 @@
503
546
  * power-supply should switche to vcc3v3_lcd1_n
504
547
  * when mipi panel is connected to dsi1.
505
548
  */
506
-&gt1x {
507
-	power-supply = <&vcc3v3_lcd0_n>;
508
-};
549
+
509
550
 
510
551
 &i2c3 {
511
552
 	status = "okay";
..
..
@@ -524,7 +565,7 @@
524
565
 };
525
566
 
526
567
 &i2c4 {
527
-	status = "okay";
568
+	status = "disabled";
528
569
 	gc8034: gc8034@37 {
529
570
 		compatible = "galaxycore,gc8034";
530
571
 		status = "okay";
..
..
@@ -536,7 +577,6 @@
536
577
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
537
578
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
538
579
 		rockchip,grf = <&grf>;
539
-		power-domains = <&power RK3568_PD_VI>;
540
580
 		rockchip,camera-module-index = <0>;
541
581
 		rockchip,camera-module-facing = "back";
542
582
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -570,7 +610,7 @@
570
610
 		};
571
611
 	};
572
612
 	ov5695: ov5695@36 {
573
-		status = "okay";
613
+		status = "disabled";
574
614
 		compatible = "ovti,ov5695";
575
615
 		reg = <0x36>;
576
616
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -623,7 +663,7 @@
623
663
 
624
664
 
625
665
 &pcie30phy {
626
-	status = "okay";
666
+	status = "disabled";
627
667
 };
628
668
 
629
669
 &pcie2x1 {
..
..
@@ -674,7 +714,7 @@
674
714
 							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
675
715
 							<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
676
716
 							<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
677
-							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, 
717
+							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
678
718
 							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
679
719
 							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
680
720
 							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -682,11 +722,21 @@
682
722
 							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
683
723
 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
684
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>,
685
728
 							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
686
-							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
687
-							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
688
-							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
689
-							<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
690
740
 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
691
741
 		};
692
742
 	};
..
..
@@ -713,8 +763,6 @@
713
763
 		};
714
764
 	};
715
765
 };
716
-
717
-
718
766
 
719
767
 
720
768
 
..
..
@@ -754,15 +802,6 @@
754
802
 	pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>;
755
803
 };
756
804
 
757
-&vcc3v3_lcd0_n {
758
-	gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; 
759
-	enable-active-high;
760
-};
761
-
762
-&vcc3v3_lcd1_n {
763
-	gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; //MIPI_3V3EN_GPIO3_A3_d_3V3
764
-	enable-active-high;
765
-};
766
805
 
767
806
 &wireless_wlan {
768
807
 	pinctrl-names = "default";
..
..
@@ -782,17 +821,17 @@
782
821
 	BT,reset_gpio    = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
783
822
     BT,wake_gpio     = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
784
823
     BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
785
-	status = "okay";
824
+	status = "disabled";
786
825
 };
787
826
 
788
827
 &uart0 {
789
-	status = "okay";
828
+	status = "disabled";
790
829
 };
791
830
 
792
831
 &uart1 {	
793
832
 	pinctrl-names = "default";	
794
833
 	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
795
-	status = "okay";		
834
+	status = "disabled";		
796
835
 };
797
836
 
798
837
 &uart3 {
..
..
@@ -801,7 +840,7 @@
801
840
 };
802
841
 
803
842
 &uart4 {
804
-	status = "okay";
843
+	status = "disabled";
805
844
 	pinctrl-0 = <&uart4m1_xfer>;
806
845
 };
807
846
 
..
..
@@ -810,12 +849,18 @@
810
849
 	pinctrl-0 = <&uart5m1_xfer>;
811
850
 };
812
851
 
852
+
813
853
 &uart7 {
814
854
 	status = "okay";
815
855
 	pinctrl-0 = <&uart7m1_xfer>;
816
856
 };
817
857
 
858
+&uart8 {
859
+	status = "disabled";
860
+	pinctrl-0 = <&uart8m1_xfer>;
861
+};
862
+
818
863
 &uart9 {
819
-	status = "okay";
864
+	status = "disabled";
820
865
 	pinctrl-0 = <&uart9m1_xfer>;
821
866
 };