enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -34,6 +34,15 @@
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
+	};
37
46
 
38
47
 	pcie30_avdd0v9: pcie30-avdd0v9 {
39
48
 		compatible = "regulator-fixed";
..
..
@@ -89,10 +98,108 @@
89
98
 		regulator-boot-on;
90
99
     	};
91
100
 #endif
92
-
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			
93
200
 	    nk_io_init {
94
201
                 compatible = "nk_io_control";
95
-				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
96
203
                 hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
97
204
                 hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
98
205
                 vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
..
..
@@ -108,7 +215,7 @@
108
215
 				pinctrl-names = "default";
109
216
 				pinctrl-0 = <&nk_io_gpio>;				
110
217
         };
111
-		
218
+#endif	
112
219
 		panel: panel {
113
220
 				compatible = "simple-panel";
114
221
 				backlight = <&backlight>;
..
..
@@ -282,12 +389,12 @@
282
389
                 remote-endpoint = <&panel_in>;
283
390
             };
284
391
         };
285
-    };
392
+   
393
+	};
286
394
 };
287
395
 
288
396
 &edp_phy {
289
-  status = "okay";
290
-
397
+	status = "okay";
291
398
 };
292
399
 
293
400
 &edp_in_vp0 {
..
..
@@ -351,7 +458,7 @@
351
458
 	phy-mode = "rgmii";
352
459
 	clock_in_out = "output";
353
460
 
354
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
461
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
355
462
 	snps,reset-active-low;
356
463
 	/* Reset time is 20ms, 100ms for rtl8211f */
357
464
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -371,7 +478,9 @@
371
478
 	rx_delay = <0x2f>;
372
479
 
373
480
 	phy-handle = <&rgmii_phy0>;
481
+	
374
482
 	status = "disabled";
483
+	
375
484
 };
376
485
 
377
486
 &gmac1 {
..
..
@@ -405,9 +514,7 @@
405
514
  * power-supply should switche to vcc3v3_lcd1_n
406
515
  * when mipi panel is connected to dsi1.
407
516
  */
408
-&gt1x {
409
-	power-supply = <&vcc3v3_lcd0_n>;
410
-};
517
+
411
518
 
412
519
 &i2c3 {
413
520
 	status = "okay";
..
..
@@ -426,7 +533,7 @@
426
533
 };
427
534
 
428
535
 &i2c4 {
429
-	status = "okay";
536
+	status = "disabled";
430
537
 	gc8034: gc8034@37 {
431
538
 		compatible = "galaxycore,gc8034";
432
539
 		status = "okay";
..
..
@@ -438,7 +545,6 @@
438
545
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
439
546
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
440
547
 		rockchip,grf = <&grf>;
441
-		power-domains = <&power RK3568_PD_VI>;
442
548
 		rockchip,camera-module-index = <0>;
443
549
 		rockchip,camera-module-facing = "back";
444
550
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -472,7 +578,7 @@
472
578
 		};
473
579
 	};
474
580
 	ov5695: ov5695@36 {
475
-		status = "okay";
581
+		status = "disabled";
476
582
 		compatible = "ovti,ov5695";
477
583
 		reg = <0x36>;
478
584
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -585,6 +691,10 @@
585
691
 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
586
692
 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
587
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
588
698
 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
589
699
 		};
590
700
 	};
..
..
@@ -611,8 +721,6 @@
611
721
 		};
612
722
 	};
613
723
 };
614
-
615
-
616
724
 
617
725
 
618
726
 
..
..
@@ -674,20 +782,25 @@
674
782
 	clock-names = "ext_clock";
675
783
 	//wifi-bt-power-toggle;
676
784
 	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
677
-	BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
678
785
 	pinctrl-names = "default", "rts_gpio";
679
786
 	pinctrl-0 = <&uart1m0_rtsn>;
680
787
 	pinctrl-1 = <&uart1_gpios>;
681
-	BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
682
-	BT,wake_gpio     = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
683
-	BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
684
-	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";
685
792
 };
686
793
 
687
794
 &uart0 {
688
795
 	status = "okay";
689
796
 };
690
797
 
798
+&uart1 {	
799
+	pinctrl-names = "default";	
800
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
801
+	status = "okay";		
802
+};
803
+
691
804
 &uart3 {
692
805
 	status = "okay";
693
806
 	pinctrl-0 = <&uart3m1_xfer>;