forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-09-20 a36159eec6ca17402b0e146b86efaf76568dc353 
 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,137 @@
8690     	};
8791 #endif
8892 
93
+		leds: leds {
94
+		compatible = "gpio-leds";
95
+		sig_led: sig_led {
96
+			gpios = <&gpio4 RK_PC4 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
+			ax88772_rst {
133
+				gpio_num = <&gpio3 RK_PB5 GPIO_ACTIVE_HIGH>;  //AX88772_RST_GPIO3_B5_3V3
134
+				gpio_function = <3>;
135
+			};
136
+			
137
+			ax88631_rst {
138
+				gpio_num = <&gpio3 RK_PB6 GPIO_ACTIVE_HIGH>;  //AX88772_RST_GPIO3_B6_3V3
139
+				gpio_function = <3>;
140
+			};
141
+			
142
+			hub_host3 {
143
+				gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
144
+				gpio_function = <0>;
145
+			};
146
+			
147
+			wake_4g {
148
+				gpio_num = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>; //4G_WAKEUP_GPIO01_B1_3V3
149
+				gpio_function = <0>;
150
+			};
151
+			
152
+			air_mode_4g {
153
+				gpio_num = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>; //4G_AIR_MODE_GPIO01_B0_3V3
154
+				gpio_function = <0>;
155
+			};
156
+			
157
+			reset_4g {
158
+				gpio_num = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; //4G_RST_GPIO01_B2_3V3
159
+				gpio_function = <3>;
160
+			};
161
+			
162
+			en_4g {
163
+				gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
164
+				gpio_function = <0>;
165
+			};
166
+			
167
+			//gpio99 {
168
+			//	gpio_num = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
169
+			//	gpio_function = <1>;
170
+			//};
171
+			
172
+			wifi_power_en {
173
+				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
174
+				gpio_function = <0>;
175
+			};
176
+	#if 0		
177
+			do1 {
178
+				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
179
+				gpio_function = <0>;
180
+			};
181
+			
182
+			do2 {
183
+				gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
184
+				gpio_function = <0>;
185
+			};
186
+			
187
+			do3 {
188
+				gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>;
189
+				gpio_function = <0>;
190
+			};
191
+			
192
+			do4 {
193
+				gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>;
194
+				gpio_function = <0>;
195
+			};
196
+			
197
+			do5 {
198
+				gpio_num = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>; 
199
+				gpio_function = <0>;
200
+			};
201
+			
202
+			do6 {
203
+				gpio_num = <&gpio2 RK_PD7 GPIO_ACTIVE_LOW>; 
204
+				gpio_function = <0>;
205
+			};
206
+			
207
+			do7 {
208
+				gpio_num = <&gpio3 RK_PA0 GPIO_ACTIVE_LOW>; 
209
+				gpio_function = <0>;
210
+			};
211
+			
212
+			di1 {
213
+				gpio_num = <&gpio2 RK_PD5 GPIO_ACTIVE_HIGH>;
214
+				gpio_function = <1>;
215
+			};
216
+	#endif
217
+		};
218
+#if 0			
89219 	    nk_io_init {
90220                 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
221
+//				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
95222                 hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
96223                 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>; 
98224                 vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
99225                 vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
100226                 en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
....@@ -102,23 +228,55 @@
102228                 air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
103229                 wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
104230 				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
-		
231
+//              spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3			
116232 				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
117
-
233
+//				pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4				
118234 				pinctrl-names = "default";
119
-				pinctrl-0 = <&nk_io_gpio>;
120
-				nodka_lvds = <9>;
235
+				pinctrl-0 = <&nk_io_gpio>;				
121236         };
237
+#endif	
238
+		panel: panel {
239
+				compatible = "simple-panel";
240
+				backlight = <&backlight>;
241
+				power-supply = <&vcc3v3_lcd0_n>;
242
+				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
243
+				reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
244
+				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
245
+				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
246
+				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
247
+				bpc = <8>;
248
+				prepare-delay-ms = <200>;
249
+				enable-delay-ms = <20>;
250
+				lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2 
251
+				lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3 
252
+				lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4 
253
+				lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
254
+				nodka-lvds = <15>;
255
+
256
+				display-timings {
257
+                native-mode = <&timing>;
258
+                timing: timing {
259
+					clock-frequency = <72500000>;
260
+					hactive = <1280>;
261
+					vactive = <800>;
262
+					hfront-porch = <70>;
263
+					hsync-len = <2>;
264
+					hback-porch = <88>;
265
+					vfront-porch = <7>;
266
+					vsync-len = <4>;
267
+					vback-porch = <17>;
268
+					hsync-active = <21>;
269
+					vsync-active = <0>;
270
+					de-active = <0>;
271
+					pixelclk-active = <0>;			
272
+					};
273
+				};
274
+				ports {
275
+					panel_in_lvds: endpoint {
276
+					remote-endpoint = <&lvds_out>;
277
+						};
278
+					};   
279
+				};
122280 };
123281 
124282 &combphy0_us {
....@@ -134,11 +292,11 @@
134292 };
135293 
136294 &csi2_dphy_hw {
137
-	status = "okay";
295
+	status = "disabled";
138296 };
139297 
140298 &csi2_dphy0 {
141
-	status = "okay";
299
+	status = "disabled";
142300 
143301 	ports {
144302 		#address-cells = <1>;
....@@ -181,8 +339,12 @@
181339  * video_phy0 needs to be enabled
182340  * when dsi0 is enabled
183341  */
342
+&video_phy0 {
343
+	status = "disabled";
344
+};
345
+
184346 &dsi0 {
185
-	status = "okay";
347
+	status = "disabled";
186348 };
187349 
188350 &dsi0_in_vp0 {
....@@ -190,7 +352,7 @@
190352 };
191353 
192354 &dsi0_in_vp1 {
193
-	status = "okay";
355
+	status = "disabled";
194356 };
195357 
196358 &dsi0_panel {
....@@ -201,6 +363,10 @@
201363  * video_phy1 needs to be enabled
202364  * when dsi1 is enabled
203365  */
366
+ 
367
+&video_phy1 {
368
+	status = "disabled";
369
+}; 
204370 &dsi1 {
205371 	status = "disabled";
206372 };
....@@ -214,31 +380,117 @@
214380 };
215381 
216382 &dsi1_panel {
217
-	power-supply = <&vcc3v3_lcd1_n>;
383
+//	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
384
+    vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
385
+    reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
386
+    vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
387
+    pinctrl-names = "default";
388
+    pinctrl-0 = <&lcd1_rst_gpio>;
218389 };
219390 
391
+&route_dsi1 {
392
+	status = "disabled";
393
+	connect = <&vp1_out_dsi1>;
394
+};
395
+
396
+
397
+/*
398
+*  edp_start
399
+*/
400
+
220401 &edp {
221
-	hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
222
-	status = "okay";
402
+    force-hpd;
403
+	status = "disabled";
223404 };
224405 
225406 &edp_phy {
226
-	status = "okay";
407
+	status = "disabled";
227408 };
228409 
229410 &edp_in_vp0 {
230
-	status = "okay";
411
+    status = "disabled";
231412 };
232413 
233414 &edp_in_vp1 {
415
+    status = "disabled";
416
+
417
+};
418
+
419
+&route_edp {
420
+    status = "disabled";
421
+    connect = <&vp1_out_edp>;
422
+};
423
+
424
+&route_edp {
234425 	status = "disabled";
235426 };
427
+
428
+&lvds {
429
+	status = "disabled";
430
+	ports {
431
+		port@1 {
432
+			reg = <1>;
433
+			lvds_out:endpoint {
434
+				remote-endpoint = <&panel_in_lvds>;
435
+			};
436
+		};
437
+	};
438
+};
439
+
440
+&route_lvds{
441
+	status = "okay";
442
+	connect = <&vp1_out_lvds>;
443
+};
444
+
445
+&lvds_in_vp1 {
446
+	status = "disabled";
447
+};
448
+
449
+/*
450
+*  edp_end
451
+*/
452
+
453
+/*
454
+*  Hdmi_start
455
+*/
456
+
457
+&hdmi {
458
+	status = "okay";
459
+	rockchip,phy-table =
460
+		<92812500  0x8009 0x0000 0x0270>,
461
+		<165000000 0x800b 0x0000 0x026d>,
462
+		<185625000 0x800b 0x0000 0x01ed>,
463
+		<297000000 0x800b 0x0000 0x01ad>,
464
+		<594000000 0x8029 0x0000 0x0088>,
465
+		<000000000 0x0000 0x0000 0x0000>;
466
+};
467
+
468
+&route_hdmi {
469
+	status = "okay";
470
+	connect = <&vp0_out_hdmi>;
471
+};
472
+
473
+&hdmi_in_vp0 {
474
+	status = "okay";
475
+};
476
+
477
+&hdmi_in_vp1 {
478
+	status = "disabled";
479
+};
480
+
481
+&hdmi_sound {
482
+	status = "okay";
483
+};
484
+
485
+/*
486
+ *  Hdmi_END
487
+*/
236488 
237489 &gmac0 {
238490 	phy-mode = "rgmii";
239491 	clock_in_out = "output";
240492 
241
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
493
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
242494 	snps,reset-active-low;
243495 	/* Reset time is 20ms, 100ms for rtl8211f */
244496 	snps,reset-delays-us = <0 20000 100000>;
....@@ -258,7 +510,9 @@
258510 	rx_delay = <0x2f>;
259511 
260512 	phy-handle = <&rgmii_phy0>;
513
+	
261514 	status = "disabled";
515
+	
262516 };
263517 
264518 &gmac1 {
....@@ -292,9 +546,7 @@
292546  * power-supply should switche to vcc3v3_lcd1_n
293547  * when mipi panel is connected to dsi1.
294548  */
295
-&gt1x {
296
-	power-supply = <&vcc3v3_lcd0_n>;
297
-};
549
+
298550 
299551 &i2c3 {
300552 	status = "okay";
....@@ -313,7 +565,7 @@
313565 };
314566 
315567 &i2c4 {
316
-	status = "okay";
568
+	status = "disabled";
317569 	gc8034: gc8034@37 {
318570 		compatible = "galaxycore,gc8034";
319571 		status = "okay";
....@@ -325,7 +577,6 @@
325577 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
326578 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
327579 		rockchip,grf = <&grf>;
328
-		power-domains = <&power RK3568_PD_VI>;
329580 		rockchip,camera-module-index = <0>;
330581 		rockchip,camera-module-facing = "back";
331582 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
....@@ -359,7 +610,7 @@
359610 		};
360611 	};
361612 	ov5695: ov5695@36 {
362
-		status = "okay";
613
+		status = "disabled";
363614 		compatible = "ovti,ov5695";
364615 		reg = <0x36>;
365616 		clocks = <&cru CLK_CIF_OUT>;
....@@ -409,20 +660,14 @@
409660 	};
410661 };
411662 
412
-&video_phy0 {
413
-	status = "okay";
414
-};
415663 
416
-&video_phy1 {
664
+
665
+&pcie30phy {
417666 	status = "disabled";
418667 };
419668 
420
-&pcie30phy {
421
-	status = "okay";
422
-};
423
-
424
-&pcie3x2 {
425
-	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
669
+&pcie2x1 {
670
+	reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
426671 	vpcie3v3-supply = <&vcc3v3_pcie>;
427672 	status = "okay";
428673 };
....@@ -437,7 +682,8 @@
437682 //	};
438683 	headphone {
439684 		hp_det: hp-det {
440
-			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>;
685
+			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
686
+							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
441687 		};
442688 	};
443689 
....@@ -452,6 +698,13 @@
452698 			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
453699 		};
454700 	};
701
+	
702
+	lcd1 {
703
+        lcd1_rst_gpio: lcd1-rst-gpio {
704
+            rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
705
+        };
706
+    };
707
+		
455708 	nk_io_init{
456709 		nk_io_gpio: nk-io-gpio{
457710 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
....@@ -465,27 +718,40 @@
465718 							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
466719 							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
467720 							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
468
-							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,
469721 							<3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
470722 							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
471723 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
472724 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
725
+							<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
726
+							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
727
+							<3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
473728 							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
729
+							<0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B0_u_3V3  DO1 8
730
+							<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B3_u_3V3  DO2 11
731
+							<0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B4_u_3V3  DO3 12
732
+							<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B5_u_3V3  DO4 13
733
+							<0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B6_u_3V3  DO5 14
734
+							
735
+							<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C0_d_3V3  DI1 16
736
+							<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C1_d_3V3  DI2 17
737
+							<0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C2_d_3V3  DI3 18
738
+							<0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C3_d_3V3  DI4 19
739
+							<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C5_d_3V3  DI5 21
474740 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
475741 		};
476742 	};
477743 };
478744 
479745 &rkisp {
480
-	status = "okay";
746
+	status = "disabled";
481747 };
482748 
483749 &rkisp_mmu {
484
-	status = "okay";
750
+	status = "disabled";
485751 };
486752 
487753 &rkisp_vir0 {
488
-	status = "okay";
754
+	status = "disabled";
489755 
490756 	port {
491757 		#address-cells = <1>;
....@@ -498,15 +764,7 @@
498764 	};
499765 };
500766 
501
-&route_dsi0 {
502
-	status = "okay";
503
-	connect = <&vp1_out_dsi0>;
504
-};
505767 
506
-&route_edp {
507
-	status = "okay";
508
-	connect = <&vp0_out_edp>;
509
-};
510768 
511769 &sata2 {
512770 	status = "okay";
....@@ -544,15 +802,6 @@
544802 	pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>;
545803 };
546804 
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
-};
556805 
557806 &wireless_wlan {
558807 	pinctrl-names = "default";
....@@ -566,18 +815,23 @@
566815 	clock-names = "ext_clock";
567816 	//wifi-bt-power-toggle;
568817 	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
569
-	BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
570818 	pinctrl-names = "default", "rts_gpio";
571819 	pinctrl-0 = <&uart1m0_rtsn>;
572820 	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>;
821
+	BT,reset_gpio    = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
822
+    BT,wake_gpio     = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
823
+    BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
576824 	status = "disabled";
577825 };
578826 
579827 &uart0 {
580
-	status = "okay";
828
+	status = "disabled";
829
+};
830
+
831
+&uart1 {	
832
+	pinctrl-names = "default";	
833
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
834
+	status = "disabled";		
581835 };
582836 
583837 &uart3 {
....@@ -586,7 +840,7 @@
586840 };
587841 
588842 &uart4 {
589
-	status = "okay";
843
+	status = "disabled";
590844 	pinctrl-0 = <&uart4m1_xfer>;
591845 };
592846 
....@@ -595,12 +849,18 @@
595849 	pinctrl-0 = <&uart5m1_xfer>;
596850 };
597851 
852
+
598853 &uart7 {
599854 	status = "okay";
600855 	pinctrl-0 = <&uart7m1_xfer>;
601856 };
602857 
858
+&uart8 {
859
+	status = "disabled";
860
+	pinctrl-0 = <&uart8m1_xfer>;
861
+};
862
+
603863 &uart9 {
604
-	status = "okay";
864
+	status = "disabled";
605865 	pinctrl-0 = <&uart9m1_xfer>;
606866 };