add lvds1024*800

hc

2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -34,15 +34,6 @@
34
34
 		vin-supply = <&vcc3v3_sys>;
35
35
 	};
36
36
 
37
-	vcc3v3_vga: vcc3v3-vga {
38
-		compatible = "regulator-fixed";
39
-		regulator-name = "vcc3v3_vga";
40
-		regulator-always-on;
41
-		regulator-boot-on;
42
-		gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
43
-		enable-active-high;
44
-		vin-supply = <&vcc3v3_sys>;
45
-	};
46
37
 
47
38
 	pcie30_avdd0v9: pcie30-avdd0v9 {
48
39
 		compatible = "regulator-fixed";
..
..
@@ -69,7 +60,9 @@
69
60
 		regulator-name = "vcc3v3_pcie";
70
61
 		regulator-min-microvolt = <3300000>;
71
62
 		regulator-max-microvolt = <3300000>;
63
+		regulator-always-on;
72
64
 		enable-active-high;
65
+		regulator-boot-on;
73
66
 		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
74
67
 		startup-delay-us = <5000>;
75
68
 		vin-supply = <&dc_12v>;
..
..
@@ -144,21 +137,14 @@
144
137
 			};
145
138
 			
146
139
 			hp_en {
147
-				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
140
+				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
148
141
 				gpio_function = <0>;
149
142
 			};
150
143
 			
151
-			usb_ogt {
152
-				gpio_num = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; //OTG_EN_OC_GPIO0_C2
144
+			wifi_power_en {
145
+				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
153
146
 				gpio_function = <0>;
154
147
 			};
155
-			
156
-			m2_wifi_pwr {
157
-				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;//WIFI_PWREN_GPIO3_C6_1V8
158
-				gpio_function = <0>;
159
-			};
160
-			
161
-			 
162
148
 	#if 0		
163
149
 			do1 {
164
150
 				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
..
..
@@ -225,8 +211,9 @@
225
211
 				compatible = "simple-panel";
226
212
 				backlight = <&backlight>;
227
213
 				power-supply = <&vcc3v3_lcd0_n>;
228
-				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4				
229
-				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_PWBLK_H_GPIO0_B7
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
230
217
 				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
231
218
 				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
232
219
 				bpc = <8>;
..
..
@@ -256,7 +243,7 @@
256
243
 					pixelclk-active = <0>;			
257
244
 					};
258
245
 				};
259
-				port {
246
+				ports {
260
247
 					panel_in_lvds: endpoint {
261
248
 					remote-endpoint = <&lvds_out>;
262
249
 						};
..
..
@@ -325,7 +312,7 @@
325
312
  * when dsi0 is enabled
326
313
  */
327
314
 &video_phy0 {
328
-	status = "disabled";
315
+	status = "okay";
329
316
 };
330
317
 
331
318
 &dsi0 {
..
..
@@ -348,6 +335,10 @@
348
335
  * video_phy1 needs to be enabled
349
336
  * when dsi1 is enabled
350
337
  */
338
+ 
339
+&video_phy1 {
340
+	status = "disabled";
341
+}; 
351
342
 &dsi1 {
352
343
 	status = "disabled";
353
344
 };
..
..
@@ -361,39 +352,31 @@
361
352
 };
362
353
 
363
354
 &dsi1_panel {
364
-	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>;
365
361
 };
362
+
363
+&route_dsi1 {
364
+	status = "disabled";
365
+	connect = <&vp1_out_dsi1>;
366
+};
367
+
368
+
369
+/*
370
+*  edp_start
371
+*/
366
372
 
367
373
 &edp {
368
-	//hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;	
369
374
     force-hpd;
370
-    status = "okay";
371
-};
372
-
373
-&lvds {
374
-    status = "disabled";
375
-    ports {
376
-        port@1 {
377
-            reg = <1>;
378
-            lvds_out: endpoint {
379
-                remote-endpoint = <&panel_in_lvds>;
380
-            };
381
-        };
382
-   
383
-	};
384
-};
385
-
386
-&route_lvds{
387
-	 status = "disabled";
388
-	 connect = <&vp2_out_lvds>;
389
-};
390
-
391
-&lvds_in_vp2 {
392
375
 	status = "disabled";
393
376
 };
394
377
 
395
378
 &edp_phy {
396
-	status = "okay";
379
+	status = "disabled";
397
380
 };
398
381
 
399
382
 &edp_in_vp0 {
..
..
@@ -401,15 +384,39 @@
401
384
 };
402
385
 
403
386
 &edp_in_vp1 {
404
-    status = "okay";
387
+    status = "disabled";
405
388
 
406
389
 };
407
390
 
408
391
 &route_edp {
409
-    status = "okay";
392
+    status = "disabled";
410
393
     connect = <&vp1_out_edp>;
411
394
 };
412
395
 
396
+&route_edp {
397
+	status = "disabled";
398
+};
399
+
400
+&lvds {
401
+	status = "okay";
402
+	ports {
403
+		port@1 {
404
+			reg = <1>;
405
+			lvds_out:endpoint {
406
+				remote-endpoint = <&panel_in_lvds>;
407
+			};
408
+		};
409
+	};
410
+};
411
+
412
+&route_lvds{
413
+	status = "okay";
414
+	connect = <&vp1_out_lvds>;
415
+};
416
+
417
+&lvds_in_vp1 {
418
+	status = "okay";
419
+};
413
420
 
414
421
 /*
415
422
 *  edp_end
..
..
@@ -625,20 +632,14 @@
625
632
 	};
626
633
 };
627
634
 
628
-&video_phy0 {
629
-	status = "okay";
630
-};
631
635
 
632
-&video_phy1 {
633
-	status = "disabled";
634
-};
635
636
 
636
637
 &pcie30phy {
637
638
 	status = "okay";
638
639
 };
639
640
 
640
-&pcie3x2 {
641
-	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
641
+&pcie2x1 {
642
+	reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
642
643
 	vpcie3v3-supply = <&vcc3v3_pcie>;
643
644
 	status = "okay";
644
645
 };
..
..
@@ -694,10 +695,6 @@
694
695
 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
695
696
 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
696
697
 							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
697
-							<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //12
698
-							<0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,  //13
699
-							<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,  //16
700
-							<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,  //17
701
698
 							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
702
699
 							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
703
700
 							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
..
..
@@ -799,13 +796,13 @@
799
796
 };
800
797
 
801
798
 &uart0 {
802
-	status = "disabled";
799
+	status = "okay";
803
800
 };
804
801
 
805
802
 &uart1 {	
806
803
 	pinctrl-names = "default";	
807
804
 	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
808
-	status = "disabled";		
805
+	status = "okay";		
809
806
 };
810
807
 
811
808
 &uart3 {
..
..
@@ -824,11 +821,11 @@
824
821
 };
825
822
 
826
823
 &uart7 {
827
-	status = "disabled";
824
+	status = "okay";
828
825
 	pinctrl-0 = <&uart7m1_xfer>;
829
826
 };
830
827
 
831
828
 &uart9 {
832
-	status = "disabled";
829
+	status = "okay";
833
830
 	pinctrl-0 = <&uart9m1_xfer>;
834
831
 };