enable lvds 1280x800

hc

2023-11-20 0d8657dd3056063fb115946b10157477b5c70451

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -16,14 +16,6 @@
16
16
 	model = "Rockchip RK3568 EVB1 DDR4 V10 Board";
17
17
 	compatible = "rockchip,rk3568-evb1-ddr4-v10", "rockchip,rk3568";
18
18
 
19
-	rk_headset: rk-headset {
20
-		compatible = "rockchip_headset";
21
-		headset_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>;
22
-		spk_ctl_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;//AMP_SD_GPIO4_C2_3V3
23
-		pinctrl-names = "default";
24
-		pinctrl-0 = <&hp_det>;
25
-	};
26
-
27
19
 	vcc2v5_sys: vcc2v5-ddr {
28
20
 		compatible = "regulator-fixed";
29
21
 		regulator-name = "vcc2v5-sys";
..
..
@@ -34,6 +26,15 @@
34
26
 		vin-supply = <&vcc3v3_sys>;
35
27
 	};
36
28
 
29
+	vcc3v3_vga: vcc3v3-vga {
30
+		compatible = "regulator-fixed";
31
+		regulator-name = "vcc3v3_vga";
32
+		regulator-always-on;
33
+		regulator-boot-on;
34
+		gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
35
+		enable-active-high;
36
+		vin-supply = <&vcc3v3_sys>;
37
+	};
37
38
 
38
39
 	pcie30_avdd0v9: pcie30-avdd0v9 {
39
40
 		compatible = "regulator-fixed";
..
..
@@ -60,9 +61,7 @@
60
61
 		regulator-name = "vcc3v3_pcie";
61
62
 		regulator-min-microvolt = <3300000>;
62
63
 		regulator-max-microvolt = <3300000>;
63
-		regulator-always-on;
64
64
 		enable-active-high;
65
-		regulator-boot-on;
66
65
 		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
67
66
 		startup-delay-us = <5000>;
68
67
 		vin-supply = <&dc_12v>;
..
..
@@ -87,8 +86,9 @@
87
86
 		enable-active-high;
88
87
 		regulator-always-on;
89
88
 		regulator-boot-on;
90
-    	};
89
+	};
91
90
 #endif
91
+
92
92
 	ndj_io_init {
93
93
          	compatible = "nk_io_control";	
94
94
 			pinctrl-names = "default";
..
..
@@ -145,7 +145,7 @@
145
145
 				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
146
146
 				gpio_function = <0>;
147
147
 			};
148
-			
148
+	#if 0		
149
149
 			do1 {
150
150
 				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
151
151
 				gpio_function = <0>;
..
..
@@ -185,48 +185,24 @@
185
185
 				gpio_num = <&gpio2 RK_PD5 GPIO_ACTIVE_HIGH>;
186
186
 				gpio_function = <1>;
187
187
 			};
188
-		};
189
-#if 0			
190
-	    nk_io_init {
191
-                compatible = "nk_io_control";
192
-//				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
193
-                hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
194
-                hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
195
-                vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
196
-                vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
197
-                en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
198
-                reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
199
-                air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
200
-                wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
201
-				hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
202
-//              spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3			
203
-				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
204
-//				pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4				
205
-				pinctrl-names = "default";
206
-				pinctrl-0 = <&nk_io_gpio>;				
207
-        };
208
-#endif	
209
-		panel: panel {
188
+	#endif
189
+	};
190
+	
191
+			panel: panel {
210
192
 				compatible = "simple-panel";
211
193
 				backlight = <&backlight>;
212
-				power-supply = <&vcc3v3_lcd0_n>;
213
-				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
214
-				reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
215
-				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
216
197
 				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
217
198
 				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
218
199
 				bpc = <8>;
219
200
 				prepare-delay-ms = <200>;
220
201
 				enable-delay-ms = <20>;
221
-				lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2 
222
-				lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3 
223
-				lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4 
224
-				lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
225
-				nodka-lvds = <15>;
226
202
 
227
203
 				display-timings {
228
-                native-mode = <&timing0>;
229
-                timing0: timing0 {
204
+                native-mode = <&timing>;
205
+                timing: timing {
230
206
 					clock-frequency = <72500000>;
231
207
 					hactive = <1280>;
232
208
 					vactive = <800>;
..
..
@@ -243,8 +219,8 @@
243
219
 					};
244
220
 				};
245
221
 				ports {
246
-					panel_in: endpoint {
247
-					remote-endpoint = <&edp_out>;
222
+					panel_in_lvds: endpoint {
223
+					remote-endpoint = <&lvds_out>;
248
224
 						};
249
225
 					};   
250
226
 				};
..
..
@@ -310,10 +286,6 @@
310
286
  * video_phy0 needs to be enabled
311
287
  * when dsi0 is enabled
312
288
  */
313
-&video_phy0 {
314
-	status = "disabled";
315
-};
316
-
317
289
 &dsi0 {
318
290
 	status = "disabled";
319
291
 };
..
..
@@ -334,10 +306,6 @@
334
306
  * video_phy1 needs to be enabled
335
307
  * when dsi1 is enabled
336
308
  */
337
- 
338
-&video_phy1 {
339
-	status = "okay";
340
-}; 
341
309
 &dsi1 {
342
310
 	status = "disabled";
343
311
 };
..
..
@@ -347,108 +315,58 @@
347
315
 };
348
316
 
349
317
 &dsi1_in_vp1 {
350
-	status = "okay";
318
+	status = "disabled";
351
319
 };
352
320
 
353
321
 &dsi1_panel {
354
-	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
355
-    vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
356
-    reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
357
-    vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
358
-    pinctrl-names = "default";
359
-    pinctrl-0 = <&lcd1_rst_gpio>;
322
+	power-supply = <&vcc3v3_lcd1_n>;
360
323
 };
361
-
362
-&route_dsi1 {
363
-	status = "disabled";
364
-	connect = <&vp1_out_dsi1>;
365
-};
366
-
367
-
368
-/*
369
-*  edp_start
370
-*/
371
324
 
372
325
 &edp {
326
+	//hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;	
373
327
     force-hpd;
328
+    status = "disabled";
329
+};
330
+
331
+&lvds {
374
332
     status = "okay";
375
333
     ports {
376
334
         port@1 {
377
335
             reg = <1>;
378
-            edp_out: endpoint {
379
-                remote-endpoint = <&panel_in>;
336
+            lvds_out: endpoint {
337
+                remote-endpoint = <&panel_in_lvds>;
380
338
             };
381
339
         };
382
-    };
340
+   
341
+	};
342
+};
343
+
344
+&route_lvds{
345
+	 status = "okay";
346
+	 connect = <&vp2_out_lvds>;
347
+};
348
+
349
+&lvds_in_vp2 {
350
+	status = "okay";
383
351
 };
384
352
 
385
353
 &edp_phy {
386
-  status = "okay";
387
-
354
+	status = "okay";
388
355
 };
389
356
 
390
357
 &edp_in_vp0 {
391
-    status = "disabled";
392
-};
393
-
394
-&edp_in_vp1 {
395
-    status = "okay";
396
-
397
-};
398
-
399
-&route_edp {
400
-    status = "okay";
401
-    connect = <&vp1_out_edp>;
402
-};
403
-
404
-&route_edp {
405
-	status = "okay";
406
-};
407
-/*
408
-*  edp_end
409
-*/
410
-
411
-/*
412
-*  Hdmi_start
413
-*/
414
-
415
-&hdmi {
416
-	status = "okay";
417
-	rockchip,phy-table =
418
-		<92812500  0x8009 0x0000 0x0270>,
419
-		<165000000 0x800b 0x0000 0x026d>,
420
-		<185625000 0x800b 0x0000 0x01ed>,
421
-		<297000000 0x800b 0x0000 0x01ad>,
422
-		<594000000 0x8029 0x0000 0x0088>,
423
-		<000000000 0x0000 0x0000 0x0000>;
424
-};
425
-
426
-&route_hdmi {
427
-	status = "okay";
428
-	connect = <&vp0_out_hdmi>;
429
-};
430
-
431
-&hdmi_in_vp0 {
432
-	status = "okay";
433
-};
434
-
435
-&hdmi_in_vp1 {
436
358
 	status = "disabled";
437
359
 };
438
360
 
439
-&hdmi_sound {
361
+&edp_in_vp1 {
440
362
 	status = "okay";
441
363
 };
442
-
443
-/*
444
- *  Hdmi_END
445
-*/
446
364
 
447
365
 &gmac0 {
448
366
 	phy-mode = "rgmii";
449
367
 	clock_in_out = "output";
450
368
 
451
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
369
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
452
370
 	snps,reset-active-low;
453
371
 	/* Reset time is 20ms, 100ms for rtl8211f */
454
372
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -468,7 +386,7 @@
468
386
 	rx_delay = <0x2f>;
469
387
 
470
388
 	phy-handle = <&rgmii_phy0>;
471
-	status = "disabled";
389
+	status = "okay";
472
390
 };
473
391
 
474
392
 &gmac1 {
..
..
@@ -502,9 +420,7 @@
502
420
  * power-supply should switche to vcc3v3_lcd1_n
503
421
  * when mipi panel is connected to dsi1.
504
422
  */
505
-&gt1x {
506
-	power-supply = <&vcc3v3_lcd0_n>;
507
-};
423
+
508
424
 
509
425
 &i2c3 {
510
426
 	status = "okay";
..
..
@@ -523,7 +439,7 @@
523
439
 };
524
440
 
525
441
 &i2c4 {
526
-	status = "okay";
442
+	status = "disabled";
527
443
 	gc8034: gc8034@37 {
528
444
 		compatible = "galaxycore,gc8034";
529
445
 		status = "okay";
..
..
@@ -569,7 +485,7 @@
569
485
 		};
570
486
 	};
571
487
 	ov5695: ov5695@36 {
572
-		status = "okay";
488
+		status = "disabled";
573
489
 		compatible = "ovti,ov5695";
574
490
 		reg = <0x36>;
575
491
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -592,19 +508,6 @@
592
508
 	};
593
509
 };
594
510
 
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
-
608
511
 &mdio0 {
609
512
 	rgmii_phy0: phy@0 {
610
513
 		compatible = "ethernet-phy-ieee802.3-c22";
..
..
@@ -619,10 +522,16 @@
619
522
 	};
620
523
 };
621
524
 
525
+&video_phy0 {
526
+	status = "okay";
527
+};
622
528
 
529
+&video_phy1 {
530
+	status = "disabled";
531
+};
623
532
 
624
533
 &pcie30phy {
625
-	status = "okay";
534
+	status = "disabled";
626
535
 };
627
536
 
628
537
 &pcie2x1 {
..
..
@@ -631,39 +540,26 @@
631
540
 	status = "okay";
632
541
 };
633
542
 
543
+&pcie3x2 {
544
+	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
545
+	vpcie3v3-supply = <&vcc3v3_pcie>;
546
+	status = "okay";
547
+};
548
+
634
549
 &pinctrl {
635
-//	cam {
636
-//		camera_pwr: camera-pwr {
637
-//			rockchip,pins =
638
-//				/* camera power en */
639
-//				<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
640
-//		};
641
-//	};
550
+
642
551
 	headphone {
643
552
 		hp_det: hp-det {
644
-			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
645
-							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
553
+			rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
646
554
 		};
647
555
 	};
648
556
 
649
557
 	wireless-wlan {
650
558
 		wifi_host_wake_irq: wifi-host-wake-irq {
651
-			rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
652
-		};
653
-	};
654
-
655
-	wireless-bluetooth {
656
-		uart1_gpios: uart1-gpios {
657
-			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
559
+			rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
658
560
 		};
659
561
 	};
660
562
 	
661
-	lcd1 {
662
-        lcd1_rst_gpio: lcd1-rst-gpio {
663
-            rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
664
-        };
665
-    };
666
-		
667
563
 	nk_io_init{
668
564
 		nk_io_gpio: nk-io-gpio{
669
565
 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -691,6 +587,10 @@
691
587
 	};
692
588
 };
693
589
 
590
+&rk809_sound {
591
+	hp-det-gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
592
+};
593
+
694
594
 &rkisp {
695
595
 	status = "disabled";
696
596
 };
..
..
@@ -713,32 +613,36 @@
713
613
 	};
714
614
 };
715
615
 
616
+&route_dsi0 {
617
+	status = "disabled";
618
+	connect = <&vp1_out_dsi0>;
619
+};
716
620
 
717
621
 
718
622
 
623
+&route_edp {
624
+	status = "disabled";
625
+	connect = <&vp1_out_edp>;
626
+};
719
627
 
720
628
 &sata2 {
721
629
 	status = "okay";
722
630
 };
723
631
 
724
632
 &sdmmc2 {
725
-        status = "disabled";
726
-};
727
-
728
-&sdmmc1 {
729
-        max-frequency = <150000000>;
730
-        supports-sdio;
731
-        bus-width = <4>;
732
-        disable-wp;
733
-        cap-sd-highspeed;
734
-        cap-sdio-irq;
735
-        keep-power-in-suspend;
736
-        mmc-pwrseq = <&sdio_pwrseq>;
737
-        non-removable;
738
-        pinctrl-names = "default";
739
-        pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
740
-        sd-uhs-sdr104;
741
-        status = "okay";
633
+	max-frequency = <150000000>;
634
+	supports-sdio;
635
+	bus-width = <4>;
636
+	disable-wp;
637
+	cap-sd-highspeed;
638
+	cap-sdio-irq;
639
+	keep-power-in-suspend;
640
+	mmc-pwrseq = <&sdio_pwrseq>;
641
+	non-removable;
642
+	pinctrl-names = "default";
643
+	pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
644
+	sd-uhs-sdr104;
645
+	status = "okay";
742
646
 };
743
647
 
744
648
 &spdif_8ch {
..
..
@@ -771,17 +675,7 @@
771
675
 
772
676
 &wireless_bluetooth {
773
677
 	compatible = "bluetooth-platdata";
774
-	clocks = <&rk809 1>;
775
-	clock-names = "ext_clock";
776
-	//wifi-bt-power-toggle;
777
-	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
778
-	pinctrl-names = "default", "rts_gpio";
779
-	pinctrl-0 = <&uart1m0_rtsn>;
780
-	pinctrl-1 = <&uart1_gpios>;
781
-	BT,reset_gpio    = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
782
-    BT,wake_gpio     = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
783
-    BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
784
-	status = "okay";
678
+	status = "disabled";
785
679
 };
786
680
 
787
681
 &uart0 {
..
..
@@ -791,7 +685,7 @@
791
685
 &uart1 {	
792
686
 	pinctrl-names = "default";	
793
687
 	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
794
-	status = "okay";		
688
+	status = "disabled";		
795
689
 };
796
690
 
797
691
 &uart3 {
..
..
@@ -817,4 +711,4 @@
817
711
 &uart9 {
818
712
 	status = "okay";
819
713
 	pinctrl-0 = <&uart9m1_xfer>;
820
-};
714
+};