enable lvds 1280x800

hc

2023-11-20 0d8657dd3056063fb115946b10157477b5c70451

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -191,24 +191,18 @@
191
191
 			panel: panel {
192
192
 				compatible = "simple-panel";
193
193
 				backlight = <&backlight>;
194
-				power-supply = <&vcc3v3_lcd0_n>;
195
-				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
196
-				reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
197
-				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
194
+				power-supply = <&vcc3v3_lcd1_n>;
195
+				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4				
196
+				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_PWBLK_H_GPIO0_B7
198
197
 				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
199
198
 				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
200
199
 				bpc = <8>;
201
200
 				prepare-delay-ms = <200>;
202
201
 				enable-delay-ms = <20>;
203
-				lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2 
204
-				lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3 
205
-				lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4 
206
-				lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
207
-				nodka-lvds = <15>;
208
202
 
209
203
 				display-timings {
210
-                native-mode = <&timing0>;
211
-                timing0: timing0 {
204
+                native-mode = <&timing>;
205
+                timing: timing {
212
206
 					clock-frequency = <72500000>;
213
207
 					hactive = <1280>;
214
208
 					vactive = <800>;
..
..
@@ -225,8 +219,8 @@
225
219
 					};
226
220
 				};
227
221
 				ports {
228
-					panel_in: endpoint {
229
-					remote-endpoint = <&edp_out>;
222
+					panel_in_lvds: endpoint {
223
+					remote-endpoint = <&lvds_out>;
230
224
 						};
231
225
 					};   
232
226
 				};
..
..
@@ -331,16 +325,29 @@
331
325
 &edp {
332
326
 	//hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;	
333
327
     force-hpd;
328
+    status = "disabled";
329
+};
330
+
331
+&lvds {
334
332
     status = "okay";
335
333
     ports {
336
334
         port@1 {
337
335
             reg = <1>;
338
-            edp_out: endpoint {
339
-                remote-endpoint = <&panel_in>;
336
+            lvds_out: endpoint {
337
+                remote-endpoint = <&panel_in_lvds>;
340
338
             };
341
339
         };
342
340
    
343
341
 	};
342
+};
343
+
344
+&route_lvds{
345
+	 status = "okay";
346
+	 connect = <&vp2_out_lvds>;
347
+};
348
+
349
+&lvds_in_vp2 {
350
+	status = "okay";
344
351
 };
345
352
 
346
353
 &edp_phy {
..
..
@@ -359,7 +366,7 @@
359
366
 	phy-mode = "rgmii";
360
367
 	clock_in_out = "output";
361
368
 
362
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
369
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
363
370
 	snps,reset-active-low;
364
371
 	/* Reset time is 20ms, 100ms for rtl8211f */
365
372
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -379,7 +386,7 @@
379
386
 	rx_delay = <0x2f>;
380
387
 
381
388
 	phy-handle = <&rgmii_phy0>;
382
-	status = "disabled";
389
+	status = "okay";
383
390
 };
384
391
 
385
392
 &gmac1 {
..
..
@@ -516,7 +523,7 @@
516
523
 };
517
524
 
518
525
 &video_phy0 {
519
-	status = "disabled";
526
+	status = "okay";
520
527
 };
521
528
 
522
529
 &video_phy1 {
..
..
@@ -524,6 +531,12 @@
524
531
 };
525
532
 
526
533
 &pcie30phy {
534
+	status = "disabled";
535
+};
536
+
537
+&pcie2x1 {
538
+	reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
539
+	vpcie3v3-supply = <&vcc3v3_pcie>;
527
540
 	status = "okay";
528
541
 };
529
542
 
..
..
@@ -544,12 +557,6 @@
544
557
 	wireless-wlan {
545
558
 		wifi_host_wake_irq: wifi-host-wake-irq {
546
559
 			rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
547
-		};
548
-	};
549
-
550
-	wireless-bluetooth {
551
-		uart8_gpios: uart8-gpios {
552
-			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
553
560
 		};
554
561
 	};
555
562
 	
..
..
@@ -614,7 +621,7 @@
614
621
 
615
622
 
616
623
 &route_edp {
617
-	status = "okay";
624
+	status = "disabled";
618
625
 	connect = <&vp1_out_edp>;
619
626
 };
620
627
 
..
..
@@ -663,22 +670,12 @@
663
670
 &wireless_wlan {
664
671
 	pinctrl-names = "default";
665
672
 	pinctrl-0 = <&wifi_host_wake_irq>;
666
-	WIFI,host_wake_irq = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>;
673
+	WIFI,host_wake_irq = <&gpio2 RK_PB2 GPIO_ACTIVE_HIGH>;
667
674
 };
668
675
 
669
676
 &wireless_bluetooth {
670
677
 	compatible = "bluetooth-platdata";
671
-	clocks = <&rk809 1>;
672
-	clock-names = "ext_clock";
673
-	//wifi-bt-power-toggle;
674
-	uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
675
-	pinctrl-names = "default", "rts_gpio";
676
-	pinctrl-0 = <&uart8m0_rtsn>;
677
-	pinctrl-1 = <&uart8_gpios>;
678
-	BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
679
-	BT,wake_gpio     = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
680
-	BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
681
-	status = "okay";
678
+	status = "disabled";
682
679
 };
683
680
 
684
681
 &uart0 {
..
..
@@ -688,7 +685,7 @@
688
685
 &uart1 {	
689
686
 	pinctrl-names = "default";	
690
687
 	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
691
-	status = "okay";		
688
+	status = "disabled";		
692
689
 };
693
690
 
694
691
 &uart3 {