enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -19,6 +19,7 @@
19
19
 	rk_headset: rk-headset {
20
20
 		compatible = "rockchip_headset";
21
21
 		headset_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>;
22
+		spk_ctl_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;//AMP_SD_GPIO4_C2_3V3
22
23
 		pinctrl-names = "default";
23
24
 		pinctrl-0 = <&hp_det>;
24
25
 	};
..
..
@@ -33,6 +34,15 @@
33
34
 		vin-supply = <&vcc3v3_sys>;
34
35
 	};
35
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
+	};
36
46
 
37
47
 	pcie30_avdd0v9: pcie30-avdd0v9 {
38
48
 		compatible = "regulator-fixed";
..
..
@@ -88,10 +98,108 @@
88
98
 		regulator-boot-on;
89
99
     	};
90
100
 #endif
91
-
101
+	ndj_io_init {
102
+         	compatible = "nk_io_control";	
103
+			pinctrl-names = "default";
104
+        	pinctrl-0 = <&nk_io_gpio>;
105
+			
106
+			//gpio_op0 = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
107
+			
108
+			vcc_5v {
109
+				gpio_num = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
110
+				gpio_function = <0>;	
111
+			};
112
+			
113
+			vcc_12v {
114
+				gpio_num = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;  //VCC12_IO_EN_GPIO0_C7_3V3
115
+				gpio_function = <0>;
116
+			};
117
+			
118
+			hub_host2_rst {
119
+				gpio_num = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;  //HUB_RST_GPIO4_D2_3V3
120
+				gpio_function = <3>;
121
+			};
122
+			
123
+			hub_host3 {
124
+				gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
125
+				gpio_function = <0>;
126
+			};
127
+			
128
+			wake_4g {
129
+				gpio_num = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>; //4G_WAKEUP_GPIO01_B1_3V3
130
+				gpio_function = <0>;
131
+			};
132
+			
133
+			air_mode_4g {
134
+				gpio_num = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>; //4G_AIR_MODE_GPIO01_B0_3V3
135
+				gpio_function = <0>;
136
+			};
137
+			
138
+			reset_4g {
139
+				gpio_num = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; //4G_RST_GPIO01_B2_3V3
140
+				gpio_function = <3>;
141
+			};
142
+			
143
+			en_4g {
144
+				gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
145
+				gpio_function = <0>;
146
+			};
147
+			
148
+			hp_en {
149
+				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
150
+				gpio_function = <0>;
151
+			};
152
+			
153
+			wifi_power_en {
154
+				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
155
+				gpio_function = <0>;
156
+			};
157
+	#if 0		
158
+			do1 {
159
+				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
160
+				gpio_function = <0>;
161
+			};
162
+			
163
+			do2 {
164
+				gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
165
+				gpio_function = <0>;
166
+			};
167
+			
168
+			do3 {
169
+				gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>;
170
+				gpio_function = <0>;
171
+			};
172
+			
173
+			do4 {
174
+				gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>;
175
+				gpio_function = <0>;
176
+			};
177
+			
178
+			do5 {
179
+				gpio_num = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>; 
180
+				gpio_function = <0>;
181
+			};
182
+			
183
+			do6 {
184
+				gpio_num = <&gpio2 RK_PD7 GPIO_ACTIVE_LOW>; 
185
+				gpio_function = <0>;
186
+			};
187
+			
188
+			do7 {
189
+				gpio_num = <&gpio3 RK_PA0 GPIO_ACTIVE_LOW>; 
190
+				gpio_function = <0>;
191
+			};
192
+			
193
+			di1 {
194
+				gpio_num = <&gpio2 RK_PD5 GPIO_ACTIVE_HIGH>;
195
+				gpio_function = <1>;
196
+			};
197
+	#endif
198
+		};
199
+#if 0			
92
200
 	    nk_io_init {
93
201
                 compatible = "nk_io_control";
94
-				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
202
+//				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
95
203
                 hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
96
204
                 hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
97
205
                 vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
..
..
@@ -101,13 +209,13 @@
101
209
                 air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
102
210
                 wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
103
211
 				hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
104
-                spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3			
212
+//              spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3			
105
213
 				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
106
214
 //				pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4				
107
215
 				pinctrl-names = "default";
108
216
 				pinctrl-0 = <&nk_io_gpio>;				
109
217
         };
110
-		
218
+#endif	
111
219
 		panel: panel {
112
220
 				compatible = "simple-panel";
113
221
 				backlight = <&backlight>;
..
..
@@ -281,12 +389,12 @@
281
389
                 remote-endpoint = <&panel_in>;
282
390
             };
283
391
         };
284
-    };
392
+   
393
+	};
285
394
 };
286
395
 
287
396
 &edp_phy {
288
-  status = "okay";
289
-
397
+	status = "okay";
290
398
 };
291
399
 
292
400
 &edp_in_vp0 {
..
..
@@ -350,7 +458,7 @@
350
458
 	phy-mode = "rgmii";
351
459
 	clock_in_out = "output";
352
460
 
353
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
461
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
354
462
 	snps,reset-active-low;
355
463
 	/* Reset time is 20ms, 100ms for rtl8211f */
356
464
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -370,7 +478,9 @@
370
478
 	rx_delay = <0x2f>;
371
479
 
372
480
 	phy-handle = <&rgmii_phy0>;
481
+	
373
482
 	status = "disabled";
483
+	
374
484
 };
375
485
 
376
486
 &gmac1 {
..
..
@@ -404,9 +514,7 @@
404
514
  * power-supply should switche to vcc3v3_lcd1_n
405
515
  * when mipi panel is connected to dsi1.
406
516
  */
407
-&gt1x {
408
-	power-supply = <&vcc3v3_lcd0_n>;
409
-};
517
+
410
518
 
411
519
 &i2c3 {
412
520
 	status = "okay";
..
..
@@ -425,7 +533,7 @@
425
533
 };
426
534
 
427
535
 &i2c4 {
428
-	status = "okay";
536
+	status = "disabled";
429
537
 	gc8034: gc8034@37 {
430
538
 		compatible = "galaxycore,gc8034";
431
539
 		status = "okay";
..
..
@@ -437,7 +545,6 @@
437
545
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
438
546
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
439
547
 		rockchip,grf = <&grf>;
440
-		power-domains = <&power RK3568_PD_VI>;
441
548
 		rockchip,camera-module-index = <0>;
442
549
 		rockchip,camera-module-facing = "back";
443
550
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -471,7 +578,7 @@
471
578
 		};
472
579
 	};
473
580
 	ov5695: ov5695@36 {
474
-		status = "okay";
581
+		status = "disabled";
475
582
 		compatible = "ovti,ov5695";
476
583
 		reg = <0x36>;
477
584
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -543,7 +650,8 @@
543
650
 //	};
544
651
 	headphone {
545
652
 		hp_det: hp-det {
546
-			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>;
653
+			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
654
+							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
547
655
 		};
548
656
 	};
549
657
 
..
..
@@ -578,12 +686,15 @@
578
686
 							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
579
687
 							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
580
688
 							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
581
-							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,
582
689
 							<3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
583
690
 							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
584
691
 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
585
692
 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
586
693
 							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
694
+							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
695
+							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
696
+							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
697
+							<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3
587
698
 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
588
699
 		};
589
700
 	};
..
..
@@ -610,8 +721,6 @@
610
721
 		};
611
722
 	};
612
723
 };
613
-
614
-
615
724
 
616
725
 
617
726
 
..
..
@@ -673,20 +782,25 @@
673
782
 	clock-names = "ext_clock";
674
783
 	//wifi-bt-power-toggle;
675
784
 	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
676
-	BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
677
785
 	pinctrl-names = "default", "rts_gpio";
678
786
 	pinctrl-0 = <&uart1m0_rtsn>;
679
787
 	pinctrl-1 = <&uart1_gpios>;
680
-	BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
681
-	BT,wake_gpio     = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
682
-	BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
683
-	status = "disabled";
788
+	BT,reset_gpio    = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
789
+    BT,wake_gpio     = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
790
+    BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
791
+	status = "okay";
684
792
 };
685
793
 
686
794
 &uart0 {
687
795
 	status = "okay";
688
796
 };
689
797
 
798
+&uart1 {	
799
+	pinctrl-names = "default";	
800
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
801
+	status = "okay";		
802
+};
803
+
690
804
 &uart3 {
691
805
 	status = "okay";
692
806
 	pinctrl-0 = <&uart3m1_xfer>;