enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -8,6 +8,7 @@
8
8
 
9
9
 #include <dt-bindings/gpio/gpio.h>
10
10
 #include <dt-bindings/pinctrl/rockchip.h>
11
+#include <dt-bindings/display/media-bus-format.h>
11
12
 #include "rk3568.dtsi"
12
13
 #include "rk3568-evb.dtsi"
13
14
 
..
..
@@ -17,7 +18,8 @@
17
18
 
18
19
 	rk_headset: rk-headset {
19
20
 		compatible = "rockchip_headset";
20
-		headset_gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
21
+		headset_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>;
22
+		spk_ctl_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;//AMP_SD_GPIO4_C2_3V3
21
23
 		pinctrl-names = "default";
22
24
 		pinctrl-0 = <&hp_det>;
23
25
 	};
..
..
@@ -67,7 +69,9 @@
67
69
 		regulator-name = "vcc3v3_pcie";
68
70
 		regulator-min-microvolt = <3300000>;
69
71
 		regulator-max-microvolt = <3300000>;
72
+		regulator-always-on;
70
73
 		enable-active-high;
74
+		regulator-boot-on;
71
75
 		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
72
76
 		startup-delay-us = <5000>;
73
77
 		vin-supply = <&dc_12v>;
..
..
@@ -94,38 +98,166 @@
94
98
 		regulator-boot-on;
95
99
     	};
96
100
 #endif
97
-
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			
98
200
 	    nk_io_init {
99
201
                 compatible = "nk_io_control";
100
-				usb_en_oc_gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;  //USB_EN_OC_GPIO0_A5
101
-				lcd_bk_en_gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
102
-				lcd_pwblk_gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
103
-				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
104
203
                 hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
105
204
                 hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
106
-//              hub_host3_5V_rest_gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>; 
107
205
                 vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
108
206
                 vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
109
207
                 en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
110
208
                 reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
111
209
                 air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
112
210
                 wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
113
-                
114
-				edp_enable_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
115
-                edp_gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_LOW>; //7511_GPIO0-GPIO3_D2
116
-				edp_gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_LOW>; //7511_GPIO1-GPIO3_D3
117
-				edp_gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_LOW>; //7511_GPIO2-GPIO3_D4
118
-				edp_gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>; //7511_GPIO3-GPIO3_D5
119
-                edp_reset = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
120
-//              tp_reset = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
121
-//              vddio_mipi = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
122
-		
211
+				hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
212
+//              spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3			
123
213
 				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
124
-
214
+//				pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4				
125
215
 				pinctrl-names = "default";
126
-				pinctrl-0 = <&nk_io_gpio>;
127
-				nodka_lvds = <9>;
216
+				pinctrl-0 = <&nk_io_gpio>;				
128
217
         };
218
+#endif	
219
+		panel: panel {
220
+				compatible = "simple-panel";
221
+				backlight = <&backlight>;
222
+				power-supply = <&vcc3v3_lcd0_n>;
223
+				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
224
+				reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
225
+				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
226
+				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
227
+				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
228
+				bpc = <8>;
229
+				prepare-delay-ms = <200>;
230
+				enable-delay-ms = <20>;
231
+				lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2 
232
+				lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3 
233
+				lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4 
234
+				lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
235
+				nodka-lvds = <15>;
236
+
237
+				display-timings {
238
+                native-mode = <&timing0>;
239
+                timing0: timing0 {
240
+					clock-frequency = <72500000>;
241
+					hactive = <1280>;
242
+					vactive = <800>;
243
+					hfront-porch = <70>;
244
+					hsync-len = <2>;
245
+					hback-porch = <88>;
246
+					vfront-porch = <7>;
247
+					vsync-len = <4>;
248
+					vback-porch = <17>;
249
+					hsync-active = <21>;
250
+					vsync-active = <0>;
251
+					de-active = <0>;
252
+					pixelclk-active = <0>;			
253
+					};
254
+				};
255
+				ports {
256
+					panel_in: endpoint {
257
+					remote-endpoint = <&edp_out>;
258
+						};
259
+					};   
260
+				};
129
261
 };
130
262
 
131
263
 &combphy0_us {
..
..
@@ -141,11 +273,11 @@
141
273
 };
142
274
 
143
275
 &csi2_dphy_hw {
144
-	status = "okay";
276
+	status = "disabled";
145
277
 };
146
278
 
147
279
 &csi2_dphy0 {
148
-	status = "okay";
280
+	status = "disabled";
149
281
 
150
282
 	ports {
151
283
 		#address-cells = <1>;
..
..
@@ -188,8 +320,12 @@
188
320
  * video_phy0 needs to be enabled
189
321
  * when dsi0 is enabled
190
322
  */
323
+&video_phy0 {
324
+	status = "disabled";
325
+};
326
+
191
327
 &dsi0 {
192
-	status = "okay";
328
+	status = "disabled";
193
329
 };
194
330
 
195
331
 &dsi0_in_vp0 {
..
..
@@ -197,7 +333,7 @@
197
333
 };
198
334
 
199
335
 &dsi0_in_vp1 {
200
-	status = "okay";
336
+	status = "disabled";
201
337
 };
202
338
 
203
339
 &dsi0_panel {
..
..
@@ -208,6 +344,10 @@
208
344
  * video_phy1 needs to be enabled
209
345
  * when dsi1 is enabled
210
346
  */
347
+ 
348
+&video_phy1 {
349
+	status = "okay";
350
+}; 
211
351
 &dsi1 {
212
352
 	status = "disabled";
213
353
 };
..
..
@@ -217,16 +357,40 @@
217
357
 };
218
358
 
219
359
 &dsi1_in_vp1 {
220
-	status = "disabled";
360
+	status = "okay";
221
361
 };
222
362
 
223
363
 &dsi1_panel {
224
-	power-supply = <&vcc3v3_lcd1_n>;
364
+	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
365
+    vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
366
+    reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
367
+    vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
368
+    pinctrl-names = "default";
369
+    pinctrl-0 = <&lcd1_rst_gpio>;
225
370
 };
226
371
 
372
+&route_dsi1 {
373
+	status = "disabled";
374
+	connect = <&vp1_out_dsi1>;
375
+};
376
+
377
+
378
+/*
379
+*  edp_start
380
+*/
381
+
227
382
 &edp {
228
-	hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
229
-	status = "okay";
383
+    force-hpd;
384
+    status = "okay";
385
+    ports {
386
+        port@1 {
387
+            reg = <1>;
388
+            edp_out: endpoint {
389
+                remote-endpoint = <&panel_in>;
390
+            };
391
+        };
392
+   
393
+	};
230
394
 };
231
395
 
232
396
 &edp_phy {
..
..
@@ -234,18 +398,67 @@
234
398
 };
235
399
 
236
400
 &edp_in_vp0 {
237
-	status = "okay";
401
+    status = "disabled";
238
402
 };
239
403
 
240
404
 &edp_in_vp1 {
405
+    status = "okay";
406
+
407
+};
408
+
409
+&route_edp {
410
+    status = "okay";
411
+    connect = <&vp1_out_edp>;
412
+};
413
+
414
+&route_edp {
415
+	status = "okay";
416
+};
417
+/*
418
+*  edp_end
419
+*/
420
+
421
+/*
422
+*  Hdmi_start
423
+*/
424
+
425
+&hdmi {
426
+	status = "okay";
427
+	rockchip,phy-table =
428
+		<92812500  0x8009 0x0000 0x0270>,
429
+		<165000000 0x800b 0x0000 0x026d>,
430
+		<185625000 0x800b 0x0000 0x01ed>,
431
+		<297000000 0x800b 0x0000 0x01ad>,
432
+		<594000000 0x8029 0x0000 0x0088>,
433
+		<000000000 0x0000 0x0000 0x0000>;
434
+};
435
+
436
+&route_hdmi {
437
+	status = "okay";
438
+	connect = <&vp0_out_hdmi>;
439
+};
440
+
441
+&hdmi_in_vp0 {
442
+	status = "okay";
443
+};
444
+
445
+&hdmi_in_vp1 {
241
446
 	status = "disabled";
242
447
 };
448
+
449
+&hdmi_sound {
450
+	status = "okay";
451
+};
452
+
453
+/*
454
+ *  Hdmi_END
455
+*/
243
456
 
244
457
 &gmac0 {
245
458
 	phy-mode = "rgmii";
246
459
 	clock_in_out = "output";
247
460
 
248
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
461
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
249
462
 	snps,reset-active-low;
250
463
 	/* Reset time is 20ms, 100ms for rtl8211f */
251
464
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -265,7 +478,9 @@
265
478
 	rx_delay = <0x2f>;
266
479
 
267
480
 	phy-handle = <&rgmii_phy0>;
481
+	
268
482
 	status = "disabled";
483
+	
269
484
 };
270
485
 
271
486
 &gmac1 {
..
..
@@ -299,9 +514,7 @@
299
514
  * power-supply should switche to vcc3v3_lcd1_n
300
515
  * when mipi panel is connected to dsi1.
301
516
  */
302
-&gt1x {
303
-	power-supply = <&vcc3v3_lcd0_n>;
304
-};
517
+
305
518
 
306
519
 &i2c3 {
307
520
 	status = "okay";
..
..
@@ -317,13 +530,10 @@
317
530
                 compatible = "nk_mcu";
318
531
                 reg = <0x15>;
319
532
         };
320
-
321
-
322
-
323
533
 };
324
534
 
325
535
 &i2c4 {
326
-	status = "okay";
536
+	status = "disabled";
327
537
 	gc8034: gc8034@37 {
328
538
 		compatible = "galaxycore,gc8034";
329
539
 		status = "okay";
..
..
@@ -335,7 +545,6 @@
335
545
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
336
546
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
337
547
 		rockchip,grf = <&grf>;
338
-		power-domains = <&power RK3568_PD_VI>;
339
548
 		rockchip,camera-module-index = <0>;
340
549
 		rockchip,camera-module-facing = "back";
341
550
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -369,7 +578,7 @@
369
578
 		};
370
579
 	};
371
580
 	ov5695: ov5695@36 {
372
-		status = "okay";
581
+		status = "disabled";
373
582
 		compatible = "ovti,ov5695";
374
583
 		reg = <0x36>;
375
584
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -392,6 +601,19 @@
392
601
 	};
393
602
 };
394
603
 
604
+&i2c5 {
605
+	status = "okay";
606
+
607
+	hym8563: hym8563@51 {
608
+		compatible = "haoyu,hym8563";
609
+		reg = <0x51>;
610
+		#clock-cells = <0>;
611
+		clock-frequency = <32768>;
612
+		clock-output-names = "xin32k";
613
+		/* rtc_int is not connected */
614
+	};
615
+};
616
+
395
617
 &mdio0 {
396
618
 	rgmii_phy0: phy@0 {
397
619
 		compatible = "ethernet-phy-ieee802.3-c22";
..
..
@@ -406,20 +628,14 @@
406
628
 	};
407
629
 };
408
630
 
409
-&video_phy0 {
410
-	status = "okay";
411
-};
412
631
 
413
-&video_phy1 {
414
-	status = "disabled";
415
-};
416
632
 
417
633
 &pcie30phy {
418
634
 	status = "okay";
419
635
 };
420
636
 
421
-&pcie3x2 {
422
-	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
637
+&pcie2x1 {
638
+	reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
423
639
 	vpcie3v3-supply = <&vcc3v3_pcie>;
424
640
 	status = "okay";
425
641
 };
..
..
@@ -434,7 +650,8 @@
434
650
 //	};
435
651
 	headphone {
436
652
 		hp_det: hp-det {
437
-			rockchip,pins = <3 RK_PC2 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>;
438
655
 		};
439
656
 	};
440
657
 
..
..
@@ -449,23 +666,50 @@
449
666
 			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
450
667
 		};
451
668
 	};
669
+	
670
+	lcd1 {
671
+        lcd1_rst_gpio: lcd1-rst-gpio {
672
+            rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
673
+        };
674
+    };
675
+		
452
676
 	nk_io_init{
453
677
 		nk_io_gpio: nk-io-gpio{
454
-            rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
678
+			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
679
+							<0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,
680
+							<0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,
681
+							<4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
682
+							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
683
+							<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
684
+							<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
685
+							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
686
+							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
687
+							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
688
+							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
689
+							<3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
690
+							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
691
+							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
692
+							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
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
698
+							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
455
699
 		};
456
700
 	};
457
701
 };
458
702
 
459
703
 &rkisp {
460
-	status = "okay";
704
+	status = "disabled";
461
705
 };
462
706
 
463
707
 &rkisp_mmu {
464
-	status = "okay";
708
+	status = "disabled";
465
709
 };
466
710
 
467
711
 &rkisp_vir0 {
468
-	status = "okay";
712
+	status = "disabled";
469
713
 
470
714
 	port {
471
715
 		#address-cells = <1>;
..
..
@@ -478,15 +722,7 @@
478
722
 	};
479
723
 };
480
724
 
481
-&route_dsi0 {
482
-	status = "okay";
483
-	connect = <&vp1_out_dsi0>;
484
-};
485
725
 
486
-&route_edp {
487
-	status = "okay";
488
-	connect = <&vp0_out_edp>;
489
-};
490
726
 
491
727
 &sata2 {
492
728
 	status = "okay";
..
..
@@ -525,12 +761,12 @@
525
761
 };
526
762
 
527
763
 &vcc3v3_lcd0_n {
528
-	gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
764
+	gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; 
529
765
 	enable-active-high;
530
766
 };
531
767
 
532
768
 &vcc3v3_lcd1_n {
533
-	gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
769
+	gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; //MIPI_3V3EN_GPIO3_A3_d_3V3
534
770
 	enable-active-high;
535
771
 };
536
772
 
..
..
@@ -546,20 +782,25 @@
546
782
 	clock-names = "ext_clock";
547
783
 	//wifi-bt-power-toggle;
548
784
 	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
549
-	BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
550
785
 	pinctrl-names = "default", "rts_gpio";
551
786
 	pinctrl-0 = <&uart1m0_rtsn>;
552
787
 	pinctrl-1 = <&uart1_gpios>;
553
-	BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
554
-	BT,wake_gpio     = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
555
-	BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
556
-	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";
557
792
 };
558
793
 
559
794
 &uart0 {
560
795
 	status = "okay";
561
796
 };
562
797
 
798
+&uart1 {	
799
+	pinctrl-names = "default";	
800
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
801
+	status = "okay";		
802
+};
803
+
563
804
 &uart3 {
564
805
 	status = "okay";
565
806
 	pinctrl-0 = <&uart3m1_xfer>;