update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 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
 	};
..
..
@@ -32,15 +34,6 @@
32
34
 		vin-supply = <&vcc3v3_sys>;
33
35
 	};
34
36
 
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
-	};
44
37
 
45
38
 	pcie30_avdd0v9: pcie30-avdd0v9 {
46
39
 		compatible = "regulator-fixed";
..
..
@@ -67,7 +60,9 @@
67
60
 		regulator-name = "vcc3v3_pcie";
68
61
 		regulator-min-microvolt = <3300000>;
69
62
 		regulator-max-microvolt = <3300000>;
63
+		regulator-always-on;
70
64
 		enable-active-high;
65
+		regulator-boot-on;
71
66
 		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
72
67
 		startup-delay-us = <5000>;
73
68
 		vin-supply = <&dc_12v>;
..
..
@@ -94,38 +89,166 @@
94
89
 		regulator-boot-on;
95
90
     	};
96
91
 #endif
97
-
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_LOW>;//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			
98
191
 	    nk_io_init {
99
192
                 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
193
+//				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
104
194
                 hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
105
195
                 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
196
                 vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
108
197
                 vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
109
198
                 en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
110
199
                 reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
111
200
                 air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
112
201
                 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
-		
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			
123
204
 				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
124
-
205
+//				pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4				
125
206
 				pinctrl-names = "default";
126
-				pinctrl-0 = <&nk_io_gpio>;
127
-				nodka_lvds = <9>;
207
+				pinctrl-0 = <&nk_io_gpio>;				
128
208
         };
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>;
227
+
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
+				};
129
252
 };
130
253
 
131
254
 &combphy0_us {
..
..
@@ -141,11 +264,11 @@
141
264
 };
142
265
 
143
266
 &csi2_dphy_hw {
144
-	status = "okay";
267
+	status = "disabled";
145
268
 };
146
269
 
147
270
 &csi2_dphy0 {
148
-	status = "okay";
271
+	status = "disabled";
149
272
 
150
273
 	ports {
151
274
 		#address-cells = <1>;
..
..
@@ -188,8 +311,12 @@
188
311
  * video_phy0 needs to be enabled
189
312
  * when dsi0 is enabled
190
313
  */
314
+&video_phy0 {
315
+	status = "disabled";
316
+};
317
+
191
318
 &dsi0 {
192
-	status = "okay";
319
+	status = "disabled";
193
320
 };
194
321
 
195
322
 &dsi0_in_vp0 {
..
..
@@ -197,7 +324,7 @@
197
324
 };
198
325
 
199
326
 &dsi0_in_vp1 {
200
-	status = "okay";
327
+	status = "disabled";
201
328
 };
202
329
 
203
330
 &dsi0_panel {
..
..
@@ -208,6 +335,10 @@
208
335
  * video_phy1 needs to be enabled
209
336
  * when dsi1 is enabled
210
337
  */
338
+ 
339
+&video_phy1 {
340
+	status = "okay";
341
+}; 
211
342
 &dsi1 {
212
343
 	status = "disabled";
213
344
 };
..
..
@@ -217,16 +348,40 @@
217
348
 };
218
349
 
219
350
 &dsi1_in_vp1 {
220
-	status = "disabled";
351
+	status = "okay";
221
352
 };
222
353
 
223
354
 &dsi1_panel {
224
-	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>;
225
361
 };
226
362
 
363
+&route_dsi1 {
364
+	status = "disabled";
365
+	connect = <&vp1_out_dsi1>;
366
+};
367
+
368
+
369
+/*
370
+*  edp_start
371
+*/
372
+
227
373
 &edp {
228
-	hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
229
-	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
+   
384
+	};
230
385
 };
231
386
 
232
387
 &edp_phy {
..
..
@@ -234,18 +389,67 @@
234
389
 };
235
390
 
236
391
 &edp_in_vp0 {
237
-	status = "okay";
392
+    status = "disabled";
238
393
 };
239
394
 
240
395
 &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 {
241
437
 	status = "disabled";
242
438
 };
439
+
440
+&hdmi_sound {
441
+	status = "okay";
442
+};
443
+
444
+/*
445
+ *  Hdmi_END
446
+*/
243
447
 
244
448
 &gmac0 {
245
449
 	phy-mode = "rgmii";
246
450
 	clock_in_out = "output";
247
451
 
248
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
452
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
249
453
 	snps,reset-active-low;
250
454
 	/* Reset time is 20ms, 100ms for rtl8211f */
251
455
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -265,7 +469,9 @@
265
469
 	rx_delay = <0x2f>;
266
470
 
267
471
 	phy-handle = <&rgmii_phy0>;
472
+	
268
473
 	status = "disabled";
474
+	
269
475
 };
270
476
 
271
477
 &gmac1 {
..
..
@@ -299,9 +505,7 @@
299
505
  * power-supply should switche to vcc3v3_lcd1_n
300
506
  * when mipi panel is connected to dsi1.
301
507
  */
302
-&gt1x {
303
-	power-supply = <&vcc3v3_lcd0_n>;
304
-};
508
+
305
509
 
306
510
 &i2c3 {
307
511
 	status = "okay";
..
..
@@ -317,13 +521,10 @@
317
521
                 compatible = "nk_mcu";
318
522
                 reg = <0x15>;
319
523
         };
320
-
321
-
322
-
323
524
 };
324
525
 
325
526
 &i2c4 {
326
-	status = "okay";
527
+	status = "disabled";
327
528
 	gc8034: gc8034@37 {
328
529
 		compatible = "galaxycore,gc8034";
329
530
 		status = "okay";
..
..
@@ -335,7 +536,6 @@
335
536
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
336
537
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
337
538
 		rockchip,grf = <&grf>;
338
-		power-domains = <&power RK3568_PD_VI>;
339
539
 		rockchip,camera-module-index = <0>;
340
540
 		rockchip,camera-module-facing = "back";
341
541
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -369,7 +569,7 @@
369
569
 		};
370
570
 	};
371
571
 	ov5695: ov5695@36 {
372
-		status = "okay";
572
+		status = "disabled";
373
573
 		compatible = "ovti,ov5695";
374
574
 		reg = <0x36>;
375
575
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -392,6 +592,19 @@
392
592
 	};
393
593
 };
394
594
 
595
+&i2c5 {
596
+	status = "okay";
597
+
598
+	hym8563: hym8563@51 {
599
+		compatible = "haoyu,hym8563";
600
+		reg = <0x51>;
601
+		#clock-cells = <0>;
602
+		clock-frequency = <32768>;
603
+		clock-output-names = "xin32k";
604
+		/* rtc_int is not connected */
605
+	};
606
+};
607
+
395
608
 &mdio0 {
396
609
 	rgmii_phy0: phy@0 {
397
610
 		compatible = "ethernet-phy-ieee802.3-c22";
..
..
@@ -406,20 +619,14 @@
406
619
 	};
407
620
 };
408
621
 
409
-&video_phy0 {
410
-	status = "okay";
411
-};
412
622
 
413
-&video_phy1 {
414
-	status = "disabled";
415
-};
416
623
 
417
624
 &pcie30phy {
418
625
 	status = "okay";
419
626
 };
420
627
 
421
-&pcie3x2 {
422
-	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
628
+&pcie2x1 {
629
+	reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
423
630
 	vpcie3v3-supply = <&vcc3v3_pcie>;
424
631
 	status = "okay";
425
632
 };
..
..
@@ -434,7 +641,8 @@
434
641
 //	};
435
642
 	headphone {
436
643
 		hp_det: hp-det {
437
-			rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
644
+			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
645
+							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
438
646
 		};
439
647
 	};
440
648
 
..
..
@@ -449,23 +657,50 @@
449
657
 			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
450
658
 		};
451
659
 	};
660
+	
661
+	lcd1 {
662
+        lcd1_rst_gpio: lcd1-rst-gpio {
663
+            rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
664
+        };
665
+    };
666
+		
452
667
 	nk_io_init{
453
668
 		nk_io_gpio: nk-io-gpio{
454
-            rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
669
+			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
670
+							<0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,
671
+							<0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,
672
+							<4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
673
+							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
674
+							<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
675
+							<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
676
+							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
677
+							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
678
+							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
679
+							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
680
+							<3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
681
+							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
682
+							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
683
+							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
684
+							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
685
+							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
686
+							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
687
+							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
688
+							<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3
689
+							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
455
690
 		};
456
691
 	};
457
692
 };
458
693
 
459
694
 &rkisp {
460
-	status = "okay";
695
+	status = "disabled";
461
696
 };
462
697
 
463
698
 &rkisp_mmu {
464
-	status = "okay";
699
+	status = "disabled";
465
700
 };
466
701
 
467
702
 &rkisp_vir0 {
468
-	status = "okay";
703
+	status = "disabled";
469
704
 
470
705
 	port {
471
706
 		#address-cells = <1>;
..
..
@@ -478,15 +713,7 @@
478
713
 	};
479
714
 };
480
715
 
481
-&route_dsi0 {
482
-	status = "okay";
483
-	connect = <&vp1_out_dsi0>;
484
-};
485
716
 
486
-&route_edp {
487
-	status = "okay";
488
-	connect = <&vp0_out_edp>;
489
-};
490
717
 
491
718
 &sata2 {
492
719
 	status = "okay";
..
..
@@ -525,12 +752,12 @@
525
752
 };
526
753
 
527
754
 &vcc3v3_lcd0_n {
528
-	gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
755
+	gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; 
529
756
 	enable-active-high;
530
757
 };
531
758
 
532
759
 &vcc3v3_lcd1_n {
533
-	gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
760
+	gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; //MIPI_3V3EN_GPIO3_A3_d_3V3
534
761
 	enable-active-high;
535
762
 };
536
763
 
..
..
@@ -546,20 +773,25 @@
546
773
 	clock-names = "ext_clock";
547
774
 	//wifi-bt-power-toggle;
548
775
 	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
549
-	BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
550
776
 	pinctrl-names = "default", "rts_gpio";
551
777
 	pinctrl-0 = <&uart1m0_rtsn>;
552
778
 	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";
779
+	BT,reset_gpio    = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
780
+    BT,wake_gpio     = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
781
+    BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
782
+	status = "okay";
557
783
 };
558
784
 
559
785
 &uart0 {
560
786
 	status = "okay";
561
787
 };
562
788
 
789
+&uart1 {	
790
+	pinctrl-names = "default";	
791
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
792
+	status = "okay";		
793
+};
794
+
563
795
 &uart3 {
564
796
 	status = "okay";
565
797
 	pinctrl-0 = <&uart3m1_xfer>;