修改4g拨号为QMI,需要在系统里后台执行quectel-CM

hc

2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5

 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,25 @@
96
89
 		regulator-boot-on;
97
90
     	};
98
91
 #endif
92
+
93
+#if 0
94
+		leds: leds {
95
+		compatible = "gpio-leds";
96
+		sig_led: sig_led {
97
+			gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;
98
+			default-state = "on";
99
+		};
100
+	};
101
+	
102
+		leds: leds {
103
+		compatible = "gpio-leds";	
104
+		err_led: err_led {
105
+			gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
106
+			default-state = "on";
107
+		};
108
+	};
109
+#endif
110
+
99
111
 	ndj_io_init {
100
112
          	compatible = "nk_io_control";	
101
113
 			pinctrl-names = "default";
..
..
@@ -113,16 +125,26 @@
113
125
 				gpio_function = <0>;
114
126
 			};
115
127
 			
116
-			hub_host2_rst {
117
-				gpio_num = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;  //HUB_RST_GPIO4_D2_3V3
128
+			vcc_3.3v {
129
+				gpio_num = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
130
+				gpio_function = <0>;
131
+			};
132
+			
133
+			ax88772_rst {
134
+				gpio_num = <&gpio3 RK_PB5 GPIO_ACTIVE_HIGH>;  //AX88772_RST_GPIO3_B5_3V3
118
135
 				gpio_function = <3>;
119
136
 			};
120
137
 			
138
+			ax88631_rst {
139
+				gpio_num = <&gpio3 RK_PB6 GPIO_ACTIVE_HIGH>;  //AX88772_RST_GPIO3_B6_3V3
140
+				gpio_function = <3>;
141
+			};
142
+/*
121
143
 			hub_host3 {
122
144
 				gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
123
145
 				gpio_function = <0>;
124
146
 			};
125
-			
147
+*/			
126
148
 			wake_4g {
127
149
 				gpio_num = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>; //4G_WAKEUP_GPIO01_B1_3V3
128
150
 				gpio_function = <0>;
..
..
@@ -143,22 +165,15 @@
143
165
 				gpio_function = <0>;
144
166
 			};
145
167
 			
146
-			hp_en {
147
-				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
168
+			//gpio99 {
169
+			//	gpio_num = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
170
+			//	gpio_function = <1>;
171
+			//};
172
+			
173
+			wifi_power_en {
174
+				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
148
175
 				gpio_function = <0>;
149
176
 			};
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
177
 	#if 0		
163
178
 			do1 {
164
179
 				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
..
..
@@ -225,8 +240,9 @@
225
240
 				compatible = "simple-panel";
226
241
 				backlight = <&backlight>;
227
242
 				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
243
+				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
244
+				reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
245
+				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
230
246
 				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
231
247
 				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
232
248
 				bpc = <8>;
..
..
@@ -256,7 +272,7 @@
256
272
 					pixelclk-active = <0>;			
257
273
 					};
258
274
 				};
259
-				port {
275
+				ports {
260
276
 					panel_in_lvds: endpoint {
261
277
 					remote-endpoint = <&lvds_out>;
262
278
 						};
..
..
@@ -348,6 +364,10 @@
348
364
  * video_phy1 needs to be enabled
349
365
  * when dsi1 is enabled
350
366
  */
367
+ 
368
+&video_phy1 {
369
+	status = "disabled";
370
+}; 
351
371
 &dsi1 {
352
372
 	status = "disabled";
353
373
 };
..
..
@@ -361,39 +381,31 @@
361
381
 };
362
382
 
363
383
 &dsi1_panel {
364
-	power-supply = <&vcc3v3_lcd1_n>;
384
+//	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
385
+    vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
386
+    reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
387
+    vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
388
+    pinctrl-names = "default";
389
+    pinctrl-0 = <&lcd1_rst_gpio>;
365
390
 };
391
+
392
+&route_dsi1 {
393
+	status = "disabled";
394
+	connect = <&vp1_out_dsi1>;
395
+};
396
+
397
+
398
+/*
399
+*  edp_start
400
+*/
366
401
 
367
402
 &edp {
368
-	//hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;	
369
403
     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
404
 	status = "disabled";
393
405
 };
394
406
 
395
407
 &edp_phy {
396
-	status = "okay";
408
+	status = "disabled";
397
409
 };
398
410
 
399
411
 &edp_in_vp0 {
..
..
@@ -401,15 +413,39 @@
401
413
 };
402
414
 
403
415
 &edp_in_vp1 {
404
-    status = "okay";
416
+    status = "disabled";
405
417
 
406
418
 };
407
419
 
408
420
 &route_edp {
409
-    status = "okay";
421
+    status = "disabled";
410
422
     connect = <&vp1_out_edp>;
411
423
 };
412
424
 
425
+&route_edp {
426
+	status = "disabled";
427
+};
428
+
429
+&lvds {
430
+	status = "disabled";
431
+	ports {
432
+		port@1 {
433
+			reg = <1>;
434
+			lvds_out:endpoint {
435
+				remote-endpoint = <&panel_in_lvds>;
436
+			};
437
+		};
438
+	};
439
+};
440
+
441
+&route_lvds{
442
+	status = "okay";
443
+	connect = <&vp1_out_lvds>;
444
+};
445
+
446
+&lvds_in_vp1 {
447
+	status = "disabled";
448
+};
413
449
 
414
450
 /*
415
451
 *  edp_end
..
..
@@ -625,20 +661,14 @@
625
661
 	};
626
662
 };
627
663
 
628
-&video_phy0 {
629
-	status = "okay";
630
-};
631
664
 
632
-&video_phy1 {
665
+
666
+&pcie30phy {
633
667
 	status = "disabled";
634
668
 };
635
669
 
636
-&pcie30phy {
637
-	status = "okay";
638
-};
639
-
640
-&pcie3x2 {
641
-	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
670
+&pcie2x1 {
671
+	reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
642
672
 	vpcie3v3-supply = <&vcc3v3_pcie>;
643
673
 	status = "okay";
644
674
 };
..
..
@@ -693,16 +723,27 @@
693
723
 							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
694
724
 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
695
725
 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
726
+							<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
727
+							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
728
+							<3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
696
729
 							<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
705
-							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
730
+							<0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B0_u_3V3  DO1 8
731
+							<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B3_u_3V3  DO2 11
732
+							<0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B4_u_3V3  DO3 12
733
+							<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B5_u_3V3  DO4 13
734
+							<0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B6_u_3V3  DO5 14
735
+							
736
+							<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C0_d_3V3  DI1 16
737
+							<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C1_d_3V3  DI2 17
738
+							<0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C2_d_3V3  DI3 18
739
+							<0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C3_d_3V3  DI4 19
740
+							<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C5_d_3V3  DI5 21
741
+							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
742
+							<4 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>, //sig_led
743
+							<4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>, //err_led
744
+							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>, //run_led
745
+							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; //HOST3_EN_GPIO4_B2_1V8
746
+
706
747
 		};
707
748
 	};
708
749
 };
..
..
@@ -767,15 +808,6 @@
767
808
 	pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>;
768
809
 };
769
810
 
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
811
 
780
812
 &wireless_wlan {
781
813
 	pinctrl-names = "default";
..
..
@@ -795,7 +827,7 @@
795
827
 	BT,reset_gpio    = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
796
828
     BT,wake_gpio     = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
797
829
     BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
798
-	status = "okay";
830
+	status = "disabled";
799
831
 };
800
832
 
801
833
 &uart0 {
..
..
@@ -814,7 +846,7 @@
814
846
 };
815
847
 
816
848
 &uart4 {
817
-	status = "okay";
849
+	status = "disabled";
818
850
 	pinctrl-0 = <&uart4m1_xfer>;
819
851
 };
820
852
 
..
..
@@ -823,11 +855,17 @@
823
855
 	pinctrl-0 = <&uart5m1_xfer>;
824
856
 };
825
857
 
858
+
826
859
 &uart7 {
827
-	status = "disabled";
860
+	status = "okay";
828
861
 	pinctrl-0 = <&uart7m1_xfer>;
829
862
 };
830
863
 
864
+&uart8 {
865
+	status = "disabled";
866
+	pinctrl-0 = <&uart8m1_xfer>;
867
+};
868
+
831
869
 &uart9 {
832
870
 	status = "disabled";
833
871
 	pinctrl-0 = <&uart9m1_xfer>;