forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-10 61598093bbdd283a7edc367d900f223070ead8d2 
 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
....@@ -8,6 +8,7 @@
88 
99 #include <dt-bindings/gpio/gpio.h>
1010 #include <dt-bindings/pinctrl/rockchip.h>
11
+#include <dt-bindings/display/media-bus-format.h>
1112 #include "rk3568.dtsi"
1213 #include "rk3568-evb.dtsi"
1314 
....@@ -18,6 +19,7 @@
1819 	rk_headset: rk-headset {
1920 		compatible = "rockchip_headset";
2021 		headset_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>;
22
+		spk_ctl_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;//AMP_SD_GPIO4_C2_3V3
2123 		pinctrl-names = "default";
2224 		pinctrl-0 = <&hp_det>;
2325 	};
....@@ -58,7 +60,9 @@
5860 		regulator-name = "vcc3v3_pcie";
5961 		regulator-min-microvolt = <3300000>;
6062 		regulator-max-microvolt = <3300000>;
63
+		regulator-always-on;
6164 		enable-active-high;
65
+		regulator-boot-on;
6266 		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
6367 		startup-delay-us = <5000>;
6468 		vin-supply = <&dc_12v>;
....@@ -86,15 +90,132 @@
8690     	};
8791 #endif
8892 
93
+		leds: leds {
94
+		compatible = "gpio-leds";
95
+		sig_led: sig_led {
96
+			gpios = <&gpio4 RK_PC3 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
+
110
+	ndj_io_init {
111
+         	compatible = "nk_io_control";	
112
+			pinctrl-names = "default";
113
+        	pinctrl-0 = <&nk_io_gpio>;
114
+			
115
+			//gpio_op0 = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
116
+			
117
+			vcc_5v {
118
+				gpio_num = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
119
+				gpio_function = <0>;	
120
+			};
121
+			
122
+			vcc_12v {
123
+				gpio_num = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;  //VCC12_IO_EN_GPIO0_C7_3V3
124
+				gpio_function = <0>;
125
+			};
126
+			
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
+			hub_host2_rst {
133
+				gpio_num = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;  //HUB_RST_GPIO4_D2_3V3
134
+				gpio_function = <3>;
135
+			};
136
+			
137
+			hub_host3 {
138
+				gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
139
+				gpio_function = <0>;
140
+			};
141
+			
142
+			wake_4g {
143
+				gpio_num = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>; //4G_WAKEUP_GPIO01_B1_3V3
144
+				gpio_function = <0>;
145
+			};
146
+			
147
+			air_mode_4g {
148
+				gpio_num = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>; //4G_AIR_MODE_GPIO01_B0_3V3
149
+				gpio_function = <0>;
150
+			};
151
+			
152
+			reset_4g {
153
+				gpio_num = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; //4G_RST_GPIO01_B2_3V3
154
+				gpio_function = <3>;
155
+			};
156
+			
157
+			en_4g {
158
+				gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
159
+				gpio_function = <0>;
160
+			};
161
+			
162
+			//gpio99 {
163
+			//	gpio_num = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
164
+			//	gpio_function = <1>;
165
+			//};
166
+			
167
+			wifi_power_en {
168
+				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
169
+				gpio_function = <0>;
170
+			};
171
+	#if 0		
172
+			do1 {
173
+				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
174
+				gpio_function = <0>;
175
+			};
176
+			
177
+			do2 {
178
+				gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
179
+				gpio_function = <0>;
180
+			};
181
+			
182
+			do3 {
183
+				gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>;
184
+				gpio_function = <0>;
185
+			};
186
+			
187
+			do4 {
188
+				gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>;
189
+				gpio_function = <0>;
190
+			};
191
+			
192
+			do5 {
193
+				gpio_num = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>; 
194
+				gpio_function = <0>;
195
+			};
196
+			
197
+			do6 {
198
+				gpio_num = <&gpio2 RK_PD7 GPIO_ACTIVE_LOW>; 
199
+				gpio_function = <0>;
200
+			};
201
+			
202
+			do7 {
203
+				gpio_num = <&gpio3 RK_PA0 GPIO_ACTIVE_LOW>; 
204
+				gpio_function = <0>;
205
+			};
206
+			
207
+			di1 {
208
+				gpio_num = <&gpio2 RK_PD5 GPIO_ACTIVE_HIGH>;
209
+				gpio_function = <1>;
210
+			};
211
+	#endif
212
+		};
213
+#if 0			
89214 	    nk_io_init {
90215                 compatible = "nk_io_control";
91
-//				usb_en_oc_gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;  //USB_EN_OC_GPIO0_A5
92
-				lcd_bk_en_gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
93
-				lcd_pwblk_gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
94
-				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
216
+//				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
95217                 hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
96218                 hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
97
-//              hub_host3_5V_rest_gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>; 
98219                 vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
99220                 vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
100221                 en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
....@@ -102,23 +223,55 @@
102223                 air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
103224                 wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
104225 				hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
105
-                spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3
106
-				
107
-				edp_enable_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
108
-                edp_gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2
109
-				edp_gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3
110
-				edp_gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4
111
-				edp_gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
112
-                edp_reset = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
113
-//              tp_reset = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
114
-//              vddio_mipi = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
115
-		
226
+//              spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3			
116227 				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
117
-
228
+//				pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4				
118229 				pinctrl-names = "default";
119
-				pinctrl-0 = <&nk_io_gpio>;
120
-				nodka_lvds = <9>;
230
+				pinctrl-0 = <&nk_io_gpio>;				
121231         };
232
+#endif	
233
+		panel: panel {
234
+				compatible = "simple-panel";
235
+				backlight = <&backlight>;
236
+				power-supply = <&vcc3v3_lcd0_n>;
237
+				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
238
+				reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
239
+				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
240
+				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
241
+				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
242
+				bpc = <8>;
243
+				prepare-delay-ms = <200>;
244
+				enable-delay-ms = <20>;
245
+				lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2 
246
+				lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3 
247
+				lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4 
248
+				lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
249
+				nodka-lvds = <15>;
250
+
251
+				display-timings {
252
+                native-mode = <&timing>;
253
+                timing: timing {
254
+					clock-frequency = <72500000>;
255
+					hactive = <1280>;
256
+					vactive = <800>;
257
+					hfront-porch = <70>;
258
+					hsync-len = <2>;
259
+					hback-porch = <88>;
260
+					vfront-porch = <7>;
261
+					vsync-len = <4>;
262
+					vback-porch = <17>;
263
+					hsync-active = <21>;
264
+					vsync-active = <0>;
265
+					de-active = <0>;
266
+					pixelclk-active = <0>;			
267
+					};
268
+				};
269
+				ports {
270
+					panel_in_lvds: endpoint {
271
+					remote-endpoint = <&lvds_out>;
272
+						};
273
+					};   
274
+				};
122275 };
123276 
124277 &combphy0_us {
....@@ -134,11 +287,11 @@
134287 };
135288 
136289 &csi2_dphy_hw {
137
-	status = "okay";
290
+	status = "disabled";
138291 };
139292 
140293 &csi2_dphy0 {
141
-	status = "okay";
294
+	status = "disabled";
142295 
143296 	ports {
144297 		#address-cells = <1>;
....@@ -181,8 +334,12 @@
181334  * video_phy0 needs to be enabled
182335  * when dsi0 is enabled
183336  */
337
+&video_phy0 {
338
+	status = "disabled";
339
+};
340
+
184341 &dsi0 {
185
-	status = "okay";
342
+	status = "disabled";
186343 };
187344 
188345 &dsi0_in_vp0 {
....@@ -190,7 +347,7 @@
190347 };
191348 
192349 &dsi0_in_vp1 {
193
-	status = "okay";
350
+	status = "disabled";
194351 };
195352 
196353 &dsi0_panel {
....@@ -201,6 +358,10 @@
201358  * video_phy1 needs to be enabled
202359  * when dsi1 is enabled
203360  */
361
+ 
362
+&video_phy1 {
363
+	status = "disabled";
364
+}; 
204365 &dsi1 {
205366 	status = "disabled";
206367 };
....@@ -214,31 +375,117 @@
214375 };
215376 
216377 &dsi1_panel {
217
-	power-supply = <&vcc3v3_lcd1_n>;
378
+//	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
379
+    vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
380
+    reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
381
+    vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
382
+    pinctrl-names = "default";
383
+    pinctrl-0 = <&lcd1_rst_gpio>;
218384 };
219385 
386
+&route_dsi1 {
387
+	status = "disabled";
388
+	connect = <&vp1_out_dsi1>;
389
+};
390
+
391
+
392
+/*
393
+*  edp_start
394
+*/
395
+
220396 &edp {
221
-	hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
222
-	status = "okay";
397
+    force-hpd;
398
+	status = "disabled";
223399 };
224400 
225401 &edp_phy {
226
-	status = "okay";
402
+	status = "disabled";
227403 };
228404 
229405 &edp_in_vp0 {
230
-	status = "okay";
406
+    status = "disabled";
231407 };
232408 
233409 &edp_in_vp1 {
410
+    status = "disabled";
411
+
412
+};
413
+
414
+&route_edp {
415
+    status = "disabled";
416
+    connect = <&vp1_out_edp>;
417
+};
418
+
419
+&route_edp {
234420 	status = "disabled";
235421 };
422
+
423
+&lvds {
424
+	status = "disabled";
425
+	ports {
426
+		port@1 {
427
+			reg = <1>;
428
+			lvds_out:endpoint {
429
+				remote-endpoint = <&panel_in_lvds>;
430
+			};
431
+		};
432
+	};
433
+};
434
+
435
+&route_lvds{
436
+	status = "okay";
437
+	connect = <&vp1_out_lvds>;
438
+};
439
+
440
+&lvds_in_vp1 {
441
+	status = "disabled";
442
+};
443
+
444
+/*
445
+*  edp_end
446
+*/
447
+
448
+/*
449
+*  Hdmi_start
450
+*/
451
+
452
+&hdmi {
453
+	status = "okay";
454
+	rockchip,phy-table =
455
+		<92812500  0x8009 0x0000 0x0270>,
456
+		<165000000 0x800b 0x0000 0x026d>,
457
+		<185625000 0x800b 0x0000 0x01ed>,
458
+		<297000000 0x800b 0x0000 0x01ad>,
459
+		<594000000 0x8029 0x0000 0x0088>,
460
+		<000000000 0x0000 0x0000 0x0000>;
461
+};
462
+
463
+&route_hdmi {
464
+	status = "okay";
465
+	connect = <&vp0_out_hdmi>;
466
+};
467
+
468
+&hdmi_in_vp0 {
469
+	status = "okay";
470
+};
471
+
472
+&hdmi_in_vp1 {
473
+	status = "disabled";
474
+};
475
+
476
+&hdmi_sound {
477
+	status = "okay";
478
+};
479
+
480
+/*
481
+ *  Hdmi_END
482
+*/
236483 
237484 &gmac0 {
238485 	phy-mode = "rgmii";
239486 	clock_in_out = "output";
240487 
241
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
488
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
242489 	snps,reset-active-low;
243490 	/* Reset time is 20ms, 100ms for rtl8211f */
244491 	snps,reset-delays-us = <0 20000 100000>;
....@@ -258,7 +505,9 @@
258505 	rx_delay = <0x2f>;
259506 
260507 	phy-handle = <&rgmii_phy0>;
508
+	
261509 	status = "disabled";
510
+	
262511 };
263512 
264513 &gmac1 {
....@@ -292,9 +541,7 @@
292541  * power-supply should switche to vcc3v3_lcd1_n
293542  * when mipi panel is connected to dsi1.
294543  */
295
-&gt1x {
296
-	power-supply = <&vcc3v3_lcd0_n>;
297
-};
544
+
298545 
299546 &i2c3 {
300547 	status = "okay";
....@@ -313,7 +560,7 @@
313560 };
314561 
315562 &i2c4 {
316
-	status = "okay";
563
+	status = "disabled";
317564 	gc8034: gc8034@37 {
318565 		compatible = "galaxycore,gc8034";
319566 		status = "okay";
....@@ -325,7 +572,6 @@
325572 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
326573 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
327574 		rockchip,grf = <&grf>;
328
-		power-domains = <&power RK3568_PD_VI>;
329575 		rockchip,camera-module-index = <0>;
330576 		rockchip,camera-module-facing = "back";
331577 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
....@@ -359,7 +605,7 @@
359605 		};
360606 	};
361607 	ov5695: ov5695@36 {
362
-		status = "okay";
608
+		status = "disabled";
363609 		compatible = "ovti,ov5695";
364610 		reg = <0x36>;
365611 		clocks = <&cru CLK_CIF_OUT>;
....@@ -409,20 +655,14 @@
409655 	};
410656 };
411657 
412
-&video_phy0 {
413
-	status = "okay";
414
-};
415658 
416
-&video_phy1 {
659
+
660
+&pcie30phy {
417661 	status = "disabled";
418662 };
419663 
420
-&pcie30phy {
421
-	status = "okay";
422
-};
423
-
424
-&pcie3x2 {
425
-	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
664
+&pcie2x1 {
665
+	reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
426666 	vpcie3v3-supply = <&vcc3v3_pcie>;
427667 	status = "okay";
428668 };
....@@ -437,7 +677,8 @@
437677 //	};
438678 	headphone {
439679 		hp_det: hp-det {
440
-			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>;
680
+			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
681
+							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
441682 		};
442683 	};
443684 
....@@ -452,6 +693,13 @@
452693 			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
453694 		};
454695 	};
696
+	
697
+	lcd1 {
698
+        lcd1_rst_gpio: lcd1-rst-gpio {
699
+            rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
700
+        };
701
+    };
702
+		
455703 	nk_io_init{
456704 		nk_io_gpio: nk-io-gpio{
457705 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
....@@ -465,27 +713,40 @@
465713 							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
466714 							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
467715 							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
468
-							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,
469716 							<3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
470717 							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
471718 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
472719 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
720
+							<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
721
+							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
722
+							<3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
473723 							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
724
+							<0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B0_u_3V3  DO1
725
+							<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B3_u_3V3  DO2
726
+							<0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B4_u_3V3  DO3
727
+							<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B5_u_3V3  DO4
728
+							<0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B6_u_3V3  DO5
729
+							
730
+							<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C0_d_3V3 DI1_1
731
+							<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C1_d_3V3 DI2_1
732
+							<0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C2_d_3V3 DI3_1
733
+							<0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C3_d_3V3 DI4_1
734
+							<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C5_d_3V3 DI5_1
474735 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
475736 		};
476737 	};
477738 };
478739 
479740 &rkisp {
480
-	status = "okay";
741
+	status = "disabled";
481742 };
482743 
483744 &rkisp_mmu {
484
-	status = "okay";
745
+	status = "disabled";
485746 };
486747 
487748 &rkisp_vir0 {
488
-	status = "okay";
749
+	status = "disabled";
489750 
490751 	port {
491752 		#address-cells = <1>;
....@@ -498,15 +759,7 @@
498759 	};
499760 };
500761 
501
-&route_dsi0 {
502
-	status = "okay";
503
-	connect = <&vp1_out_dsi0>;
504
-};
505762 
506
-&route_edp {
507
-	status = "okay";
508
-	connect = <&vp0_out_edp>;
509
-};
510763 
511764 &sata2 {
512765 	status = "okay";
....@@ -544,15 +797,6 @@
544797 	pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>;
545798 };
546799 
547
-&vcc3v3_lcd0_n {
548
-	gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
549
-	enable-active-high;
550
-};
551
-
552
-&vcc3v3_lcd1_n {
553
-	gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
554
-	enable-active-high;
555
-};
556800 
557801 &wireless_wlan {
558802 	pinctrl-names = "default";
....@@ -566,18 +810,23 @@
566810 	clock-names = "ext_clock";
567811 	//wifi-bt-power-toggle;
568812 	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
569
-	BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
570813 	pinctrl-names = "default", "rts_gpio";
571814 	pinctrl-0 = <&uart1m0_rtsn>;
572815 	pinctrl-1 = <&uart1_gpios>;
573
-	BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
574
-	BT,wake_gpio     = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
575
-	BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
816
+	BT,reset_gpio    = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
817
+    BT,wake_gpio     = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
818
+    BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
576819 	status = "disabled";
577820 };
578821 
579822 &uart0 {
580
-	status = "okay";
823
+	status = "disabled";
824
+};
825
+
826
+&uart1 {	
827
+	pinctrl-names = "default";	
828
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
829
+	status = "disabled";		
581830 };
582831 
583832 &uart3 {
....@@ -586,7 +835,7 @@
586835 };
587836 
588837 &uart4 {
589
-	status = "okay";
838
+	status = "disabled";
590839 	pinctrl-0 = <&uart4m1_xfer>;
591840 };
592841 
....@@ -595,12 +844,18 @@
595844 	pinctrl-0 = <&uart5m1_xfer>;
596845 };
597846 
847
+
598848 &uart7 {
599849 	status = "okay";
600850 	pinctrl-0 = <&uart7m1_xfer>;
601851 };
602852 
853
+&uart8 {
854
+	status = "disabled";
855
+	pinctrl-0 = <&uart8m1_xfer>;
856
+};
857
+
603858 &uart9 {
604
-	status = "okay";
859
+	status = "disabled";
605860 	pinctrl-0 = <&uart9m1_xfer>;
606861 };