forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-10-19 0e3fb4354b784f3b341617ff304b9189b4a8cd1f 
 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 
....@@ -17,7 +18,8 @@
1718 
1819 	rk_headset: rk-headset {
1920 		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
2123 		pinctrl-names = "default";
2224 		pinctrl-0 = <&hp_det>;
2325 	};
....@@ -32,15 +34,6 @@
3234 		vin-supply = <&vcc3v3_sys>;
3335 	};
3436 
35
-	vcc3v3_vga: vcc3v3-vga {
36
-		compatible = "regulator-fixed";
37
-		regulator-name = "vcc3v3_vga";
38
-		regulator-always-on;
39
-		regulator-boot-on;
40
-		gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
41
-		enable-active-high;
42
-		vin-supply = <&vcc3v3_sys>;
43
-	};
4437 
4538 	pcie30_avdd0v9: pcie30-avdd0v9 {
4639 		compatible = "regulator-fixed";
....@@ -67,7 +60,9 @@
6760 		regulator-name = "vcc3v3_pcie";
6861 		regulator-min-microvolt = <3300000>;
6962 		regulator-max-microvolt = <3300000>;
63
+		regulator-always-on;
7064 		enable-active-high;
65
+		regulator-boot-on;
7166 		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
7267 		startup-delay-us = <5000>;
7368 		vin-supply = <&dc_12v>;
....@@ -82,7 +77,7 @@
8277 		regulator-max-microvolt = <3300000>;
8378 		vin-supply = <&vcc5v0_sys>;
8479 	};
85
-
80
+#if 0
8681 	vcc_camera: vcc-camera-regulator {
8782 		compatible = "regulator-fixed";
8883 		gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;
....@@ -92,43 +87,168 @@
9287 		enable-active-high;
9388 		regulator-always-on;
9489 		regulator-boot-on;
95
-	
9690     	};
97
-
91
+#endif
92
+	ndj_io_init {
93
+         	compatible = "nk_io_control";	
94
+			pinctrl-names = "default";
95
+        	pinctrl-0 = <&nk_io_gpio>;
96
+			
97
+			//gpio_op0 = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
98
+			
99
+			vcc_5v {
100
+				gpio_num = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
101
+				gpio_function = <0>;	
102
+			};
103
+			
104
+			vcc_12v {
105
+				gpio_num = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;  //VCC12_IO_EN_GPIO0_C7_3V3
106
+				gpio_function = <0>;
107
+			};
108
+			
109
+			hub_host2_rst {
110
+				gpio_num = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;  //HUB_RST_GPIO4_D2_3V3
111
+				gpio_function = <3>;
112
+			};
113
+			
114
+			hub_host3 {
115
+				gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
116
+				gpio_function = <0>;
117
+			};
118
+			
119
+			wake_4g {
120
+				gpio_num = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>; //4G_WAKEUP_GPIO01_B1_3V3
121
+				gpio_function = <0>;
122
+			};
123
+			
124
+			air_mode_4g {
125
+				gpio_num = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>; //4G_AIR_MODE_GPIO01_B0_3V3
126
+				gpio_function = <0>;
127
+			};
128
+			
129
+			reset_4g {
130
+				gpio_num = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; //4G_RST_GPIO01_B2_3V3
131
+				gpio_function = <3>;
132
+			};
133
+			
134
+			en_4g {
135
+				gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
136
+				gpio_function = <0>;
137
+			};
138
+			
139
+			hp_en {
140
+				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
141
+				gpio_function = <0>;
142
+			};
143
+			
144
+			wifi_power_en {
145
+				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
146
+				gpio_function = <0>;
147
+			};
148
+	#if 0		
149
+			do1 {
150
+				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
151
+				gpio_function = <0>;
152
+			};
153
+			
154
+			do2 {
155
+				gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
156
+				gpio_function = <0>;
157
+			};
158
+			
159
+			do3 {
160
+				gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>;
161
+				gpio_function = <0>;
162
+			};
163
+			
164
+			do4 {
165
+				gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>;
166
+				gpio_function = <0>;
167
+			};
168
+			
169
+			do5 {
170
+				gpio_num = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>; 
171
+				gpio_function = <0>;
172
+			};
173
+			
174
+			do6 {
175
+				gpio_num = <&gpio2 RK_PD7 GPIO_ACTIVE_LOW>; 
176
+				gpio_function = <0>;
177
+			};
178
+			
179
+			do7 {
180
+				gpio_num = <&gpio3 RK_PA0 GPIO_ACTIVE_LOW>; 
181
+				gpio_function = <0>;
182
+			};
183
+			
184
+			di1 {
185
+				gpio_num = <&gpio2 RK_PD5 GPIO_ACTIVE_HIGH>;
186
+				gpio_function = <1>;
187
+			};
188
+	#endif
189
+		};
190
+#if 0			
98191 	    nk_io_init {
99192                 compatible = "nk_io_control";
100
-                hub_host2_5v_gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; //USB_HOST_PWREN_H_GPIO0_A6
101
-		usb_en_oc_gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;  //USB_EN_OC_GPIO0_A5
102
-		lcd_bk_en_gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
103
-		lcd_pwblk_gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
104
-		vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
193
+//				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
105194                 hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
106195                 hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
107
-//              hub_host3_5V_rest_gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>; 
108196                 vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
109197                 vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
110198                 en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
111199                 reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
112200                 air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
113201                 wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
114
-                
115
-		edp_enable_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
116
-                edp_gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_LOW>; //7511_GPIO0-GPIO3_D2
117
-        	edp_gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_LOW>; //7511_GPIO1-GPIO3_D3
118
-        	edp_gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_LOW>; //7511_GPIO2-GPIO3_D4
119
-        	edp_gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>; //7511_GPIO3-GPIO3_D5
120
-                edp_reset = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
121
-//              tp_reset = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
122
-//              vddio_mipi = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
123
-		
124
-		wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
125
-
126
-  //      pinctrl-names = "default";
127
-//        pinctrl-0 = <&nk_io_gpio>;
128
-        nodka_lvds = <9>;
202
+				hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
203
+//              spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3			
204
+				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
205
+//				pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4				
206
+				pinctrl-names = "default";
207
+				pinctrl-0 = <&nk_io_gpio>;				
129208         };
209
+#endif	
210
+		panel: panel {
211
+				compatible = "simple-panel";
212
+				backlight = <&backlight>;
213
+				power-supply = <&vcc3v3_lcd0_n>;
214
+				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
215
+				reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
216
+				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
217
+				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
218
+				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
219
+				bpc = <8>;
220
+				prepare-delay-ms = <200>;
221
+				enable-delay-ms = <20>;
222
+				lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2 
223
+				lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3 
224
+				lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4 
225
+				lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
226
+				nodka-lvds = <15>;
130227 
131
-	
228
+				display-timings {
229
+                native-mode = <&timing0>;
230
+                timing0: timing0 {
231
+					clock-frequency = <72500000>;
232
+					hactive = <1280>;
233
+					vactive = <800>;
234
+					hfront-porch = <70>;
235
+					hsync-len = <2>;
236
+					hback-porch = <88>;
237
+					vfront-porch = <7>;
238
+					vsync-len = <4>;
239
+					vback-porch = <17>;
240
+					hsync-active = <21>;
241
+					vsync-active = <0>;
242
+					de-active = <0>;
243
+					pixelclk-active = <0>;			
244
+					};
245
+				};
246
+				ports {
247
+					panel_in: endpoint {
248
+					remote-endpoint = <&edp_out>;
249
+						};
250
+					};   
251
+				};
132252 };
133253 
134254 &combphy0_us {
....@@ -144,11 +264,11 @@
144264 };
145265 
146266 &csi2_dphy_hw {
147
-	status = "okay";
267
+	status = "disabled";
148268 };
149269 
150270 &csi2_dphy0 {
151
-	status = "okay";
271
+	status = "disabled";
152272 
153273 	ports {
154274 		#address-cells = <1>;
....@@ -191,8 +311,12 @@
191311  * video_phy0 needs to be enabled
192312  * when dsi0 is enabled
193313  */
314
+&video_phy0 {
315
+	status = "disabled";
316
+};
317
+
194318 &dsi0 {
195
-	status = "okay";
319
+	status = "disabled";
196320 };
197321 
198322 &dsi0_in_vp0 {
....@@ -200,7 +324,7 @@
200324 };
201325 
202326 &dsi0_in_vp1 {
203
-	status = "okay";
327
+	status = "disabled";
204328 };
205329 
206330 &dsi0_panel {
....@@ -211,6 +335,10 @@
211335  * video_phy1 needs to be enabled
212336  * when dsi1 is enabled
213337  */
338
+ 
339
+&video_phy1 {
340
+	status = "okay";
341
+}; 
214342 &dsi1 {
215343 	status = "disabled";
216344 };
....@@ -220,29 +348,102 @@
220348 };
221349 
222350 &dsi1_in_vp1 {
223
-	status = "disabled";
351
+	status = "okay";
224352 };
225353 
226354 &dsi1_panel {
227
-	power-supply = <&vcc3v3_lcd1_n>;
355
+	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
356
+    vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
357
+    reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
358
+    vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
359
+    pinctrl-names = "default";
360
+    pinctrl-0 = <&lcd1_rst_gpio>;
228361 };
229362 
363
+&route_dsi1 {
364
+	status = "disabled";
365
+	connect = <&vp1_out_dsi1>;
366
+};
367
+
368
+
369
+/*
370
+*  edp_start
371
+*/
372
+
230373 &edp {
231
-	hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
232
-	status = "okay";
374
+    force-hpd;
375
+    status = "okay";
376
+    ports {
377
+        port@1 {
378
+            reg = <1>;
379
+            edp_out: endpoint {
380
+                remote-endpoint = <&panel_in>;
381
+            };
382
+        };
383
+    };
233384 };
234385 
235386 &edp_phy {
236
-	status = "okay";
387
+  status = "okay";
388
+
237389 };
238390 
239391 &edp_in_vp0 {
240
-	status = "okay";
392
+    status = "disabled";
241393 };
242394 
243395 &edp_in_vp1 {
396
+    status = "okay";
397
+
398
+};
399
+
400
+&route_edp {
401
+    status = "okay";
402
+    connect = <&vp1_out_edp>;
403
+};
404
+
405
+&route_edp {
406
+	status = "okay";
407
+};
408
+/*
409
+*  edp_end
410
+*/
411
+
412
+/*
413
+*  Hdmi_start
414
+*/
415
+
416
+&hdmi {
417
+	status = "okay";
418
+	rockchip,phy-table =
419
+		<92812500  0x8009 0x0000 0x0270>,
420
+		<165000000 0x800b 0x0000 0x026d>,
421
+		<185625000 0x800b 0x0000 0x01ed>,
422
+		<297000000 0x800b 0x0000 0x01ad>,
423
+		<594000000 0x8029 0x0000 0x0088>,
424
+		<000000000 0x0000 0x0000 0x0000>;
425
+};
426
+
427
+&route_hdmi {
428
+	status = "okay";
429
+	connect = <&vp0_out_hdmi>;
430
+};
431
+
432
+&hdmi_in_vp0 {
433
+	status = "okay";
434
+};
435
+
436
+&hdmi_in_vp1 {
244437 	status = "disabled";
245438 };
439
+
440
+&hdmi_sound {
441
+	status = "okay";
442
+};
443
+
444
+/*
445
+ *  Hdmi_END
446
+*/
246447 
247448 &gmac0 {
248449 	phy-mode = "rgmii";
....@@ -320,9 +521,6 @@
320521                 compatible = "nk_mcu";
321522                 reg = <0x15>;
322523         };
323
-
324
-
325
-
326524 };
327525 
328526 &i2c4 {
....@@ -395,6 +593,19 @@
395593 	};
396594 };
397595 
596
+&i2c5 {
597
+	status = "okay";
598
+
599
+	hym8563: hym8563@51 {
600
+		compatible = "haoyu,hym8563";
601
+		reg = <0x51>;
602
+		#clock-cells = <0>;
603
+		clock-frequency = <32768>;
604
+		clock-output-names = "xin32k";
605
+		/* rtc_int is not connected */
606
+	};
607
+};
608
+
398609 &mdio0 {
399610 	rgmii_phy0: phy@0 {
400611 		compatible = "ethernet-phy-ieee802.3-c22";
....@@ -409,73 +620,88 @@
409620 	};
410621 };
411622 
412
-&video_phy0 {
413
-	status = "okay";
414
-};
415623 
416
-&video_phy1 {
417
-	status = "disabled";
418
-};
419624 
420625 &pcie30phy {
421626 	status = "okay";
422627 };
423628 
424
-&pcie3x2 {
425
-	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
629
+&pcie2x1 {
630
+	reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
426631 	vpcie3v3-supply = <&vcc3v3_pcie>;
427632 	status = "okay";
428633 };
429634 
430635 &pinctrl {
431
-	cam {
432
-		camera_pwr: camera-pwr {
433
-			rockchip,pins =
434
-				/* camera power en */
435
-				<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
436
-		};
437
-	};
636
+//	cam {
637
+//		camera_pwr: camera-pwr {
638
+//			rockchip,pins =
639
+//				/* camera power en */
640
+//				<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
641
+//		};
642
+//	};
438643 	headphone {
439644 		hp_det: hp-det {
440
-			rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
645
+			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
646
+							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
441647 		};
442648 	};
443649 
444650 	wireless-wlan {
445651 		wifi_host_wake_irq: wifi-host-wake-irq {
446
-			rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
652
+			rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
447653 		};
448654 	};
449655 
450656 	wireless-bluetooth {
451
-		uart8_gpios: uart8-gpios {
452
-			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
657
+		uart1_gpios: uart1-gpios {
658
+			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
453659 		};
454660 	};
455
-
456
-	nk_io_gpio: nk_io_gpio_col{
457
-                        rockchip,pins =
458
-                                <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>,
459
-                                <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>,
460
-                                <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>,
461
-                                <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>,
462
-                                <0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>,
463
-                                <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>,
464
-                                <1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>,
465
-                                <3 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>;
661
+	
662
+	lcd1 {
663
+        lcd1_rst_gpio: lcd1-rst-gpio {
664
+            rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
665
+        };
666
+    };
667
+		
668
+	nk_io_init{
669
+		nk_io_gpio: nk-io-gpio{
670
+			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
671
+							<0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,
672
+							<0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,
673
+							<4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
674
+							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
675
+							<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
676
+							<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
677
+							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, 
678
+							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
679
+							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
680
+							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
681
+							<3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
682
+							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
683
+							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
684
+							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
685
+							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
686
+							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
687
+							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
688
+							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
689
+							<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3
690
+							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
691
+		};
466692 	};
467693 };
468694 
469695 &rkisp {
470
-	status = "okay";
696
+	status = "disabled";
471697 };
472698 
473699 &rkisp_mmu {
474
-	status = "okay";
700
+	status = "disabled";
475701 };
476702 
477703 &rkisp_vir0 {
478
-	status = "okay";
704
+	status = "disabled";
479705 
480706 	port {
481707 		#address-cells = <1>;
....@@ -488,34 +714,32 @@
488714 	};
489715 };
490716 
491
-&route_dsi0 {
492
-	status = "okay";
493
-	connect = <&vp1_out_dsi0>;
494
-};
495717 
496
-&route_edp {
497
-	status = "okay";
498
-	connect = <&vp0_out_edp>;
499
-};
718
+
719
+
500720 
501721 &sata2 {
502722 	status = "okay";
503723 };
504724 
505725 &sdmmc2 {
506
-	max-frequency = <150000000>;
507
-	supports-sdio;
508
-	bus-width = <4>;
509
-	disable-wp;
510
-	cap-sd-highspeed;
511
-	cap-sdio-irq;
512
-	keep-power-in-suspend;
513
-	mmc-pwrseq = <&sdio_pwrseq>;
514
-	non-removable;
515
-	pinctrl-names = "default";
516
-	pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
517
-	sd-uhs-sdr104;
518
-	status = "okay";
726
+        status = "disabled";
727
+};
728
+
729
+&sdmmc1 {
730
+        max-frequency = <150000000>;
731
+        supports-sdio;
732
+        bus-width = <4>;
733
+        disable-wp;
734
+        cap-sd-highspeed;
735
+        cap-sdio-irq;
736
+        keep-power-in-suspend;
737
+        mmc-pwrseq = <&sdio_pwrseq>;
738
+        non-removable;
739
+        pinctrl-names = "default";
740
+        pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
741
+        sd-uhs-sdr104;
742
+        status = "okay";
519743 };
520744 
521745 &spdif_8ch {
....@@ -531,12 +755,12 @@
531755 };
532756 
533757 &vcc3v3_lcd0_n {
534
-	gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
758
+	gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; 
535759 	enable-active-high;
536760 };
537761 
538762 &vcc3v3_lcd1_n {
539
-	gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
763
+	gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; //MIPI_3V3EN_GPIO3_A3_d_3V3
540764 	enable-active-high;
541765 };
542766 
....@@ -551,12 +775,47 @@
551775 	clocks = <&rk809 1>;
552776 	clock-names = "ext_clock";
553777 	//wifi-bt-power-toggle;
554
-	uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
778
+	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
555779 	pinctrl-names = "default", "rts_gpio";
556
-	pinctrl-0 = <&uart8m0_rtsn>;
557
-	pinctrl-1 = <&uart8_gpios>;
558
-	BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
559
-	BT,wake_gpio     = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
560
-	BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
780
+	pinctrl-0 = <&uart1m0_rtsn>;
781
+	pinctrl-1 = <&uart1_gpios>;
782
+	BT,reset_gpio    = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
783
+    BT,wake_gpio     = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
784
+    BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
561785 	status = "okay";
562786 };
787
+
788
+&uart0 {
789
+	status = "okay";
790
+};
791
+
792
+&uart1 {	
793
+	pinctrl-names = "default";	
794
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
795
+	status = "okay";		
796
+};
797
+
798
+&uart3 {
799
+	status = "okay";
800
+	pinctrl-0 = <&uart3m1_xfer>;
801
+};
802
+
803
+&uart4 {
804
+	status = "okay";
805
+	pinctrl-0 = <&uart4m1_xfer>;
806
+};
807
+
808
+&uart5 {
809
+	status = "okay";
810
+	pinctrl-0 = <&uart5m1_xfer>;
811
+};
812
+
813
+&uart7 {
814
+	status = "okay";
815
+	pinctrl-0 = <&uart7m1_xfer>;
816
+};
817
+
818
+&uart9 {
819
+	status = "okay";
820
+	pinctrl-0 = <&uart9m1_xfer>;
821
+};