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";
..
..
@@ -186,48 +186,23 @@
186
186
 				gpio_function = <1>;
187
187
 			};
188
188
 	#endif
189
-		};
190
-#if 0			
191
-	    nk_io_init {
192
-                compatible = "nk_io_control";
193
-//				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
194
-                hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
195
-                hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
196
-                vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
197
-                vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
198
-                en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
199
-                reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
200
-                air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
201
-                wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
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>;				
208
-        };
209
-#endif	
210
-		panel: panel {
189
+	};
190
+	
191
+			panel: panel {
211
192
 				compatible = "simple-panel";
212
193
 				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
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
217
197
 				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
218
198
 				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
219
199
 				bpc = <8>;
220
200
 				prepare-delay-ms = <200>;
221
201
 				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
202
 
228
203
 				display-timings {
229
-                native-mode = <&timing0>;
230
-                timing0: timing0 {
204
+                native-mode = <&timing>;
205
+                timing: timing {
231
206
 					clock-frequency = <72500000>;
232
207
 					hactive = <1280>;
233
208
 					vactive = <800>;
..
..
@@ -244,8 +219,8 @@
244
219
 					};
245
220
 				};
246
221
 				ports {
247
-					panel_in: endpoint {
248
-					remote-endpoint = <&edp_out>;
222
+					panel_in_lvds: endpoint {
223
+					remote-endpoint = <&lvds_out>;
249
224
 						};
250
225
 					};   
251
226
 				};
..
..
@@ -311,10 +286,6 @@
311
286
  * video_phy0 needs to be enabled
312
287
  * when dsi0 is enabled
313
288
  */
314
-&video_phy0 {
315
-	status = "disabled";
316
-};
317
-
318
289
 &dsi0 {
319
290
 	status = "disabled";
320
291
 };
..
..
@@ -335,10 +306,6 @@
335
306
  * video_phy1 needs to be enabled
336
307
  * when dsi1 is enabled
337
308
  */
338
- 
339
-&video_phy1 {
340
-	status = "okay";
341
-}; 
342
309
 &dsi1 {
343
310
 	status = "disabled";
344
311
 };
..
..
@@ -348,108 +315,58 @@
348
315
 };
349
316
 
350
317
 &dsi1_in_vp1 {
351
-	status = "okay";
318
+	status = "disabled";
352
319
 };
353
320
 
354
321
 &dsi1_panel {
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>;
322
+	power-supply = <&vcc3v3_lcd1_n>;
361
323
 };
362
-
363
-&route_dsi1 {
364
-	status = "disabled";
365
-	connect = <&vp1_out_dsi1>;
366
-};
367
-
368
-
369
-/*
370
-*  edp_start
371
-*/
372
324
 
373
325
 &edp {
326
+	//hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;	
374
327
     force-hpd;
328
+    status = "disabled";
329
+};
330
+
331
+&lvds {
375
332
     status = "okay";
376
333
     ports {
377
334
         port@1 {
378
335
             reg = <1>;
379
-            edp_out: endpoint {
380
-                remote-endpoint = <&panel_in>;
336
+            lvds_out: endpoint {
337
+                remote-endpoint = <&panel_in_lvds>;
381
338
             };
382
339
         };
383
-    };
340
+   
341
+	};
342
+};
343
+
344
+&route_lvds{
345
+	 status = "okay";
346
+	 connect = <&vp2_out_lvds>;
347
+};
348
+
349
+&lvds_in_vp2 {
350
+	status = "okay";
384
351
 };
385
352
 
386
353
 &edp_phy {
387
-  status = "okay";
388
-
354
+	status = "okay";
389
355
 };
390
356
 
391
357
 &edp_in_vp0 {
392
-    status = "disabled";
393
-};
394
-
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 {
437
358
 	status = "disabled";
438
359
 };
439
360
 
440
-&hdmi_sound {
361
+&edp_in_vp1 {
441
362
 	status = "okay";
442
363
 };
443
-
444
-/*
445
- *  Hdmi_END
446
-*/
447
364
 
448
365
 &gmac0 {
449
366
 	phy-mode = "rgmii";
450
367
 	clock_in_out = "output";
451
368
 
452
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
369
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
453
370
 	snps,reset-active-low;
454
371
 	/* Reset time is 20ms, 100ms for rtl8211f */
455
372
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -469,7 +386,7 @@
469
386
 	rx_delay = <0x2f>;
470
387
 
471
388
 	phy-handle = <&rgmii_phy0>;
472
-	status = "disabled";
389
+	status = "okay";
473
390
 };
474
391
 
475
392
 &gmac1 {
..
..
@@ -503,9 +420,7 @@
503
420
  * power-supply should switche to vcc3v3_lcd1_n
504
421
  * when mipi panel is connected to dsi1.
505
422
  */
506
-&gt1x {
507
-	power-supply = <&vcc3v3_lcd0_n>;
508
-};
423
+
509
424
 
510
425
 &i2c3 {
511
426
 	status = "okay";
..
..
@@ -524,7 +439,7 @@
524
439
 };
525
440
 
526
441
 &i2c4 {
527
-	status = "okay";
442
+	status = "disabled";
528
443
 	gc8034: gc8034@37 {
529
444
 		compatible = "galaxycore,gc8034";
530
445
 		status = "okay";
..
..
@@ -570,7 +485,7 @@
570
485
 		};
571
486
 	};
572
487
 	ov5695: ov5695@36 {
573
-		status = "okay";
488
+		status = "disabled";
574
489
 		compatible = "ovti,ov5695";
575
490
 		reg = <0x36>;
576
491
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -593,19 +508,6 @@
593
508
 	};
594
509
 };
595
510
 
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
-
609
511
 &mdio0 {
610
512
 	rgmii_phy0: phy@0 {
611
513
 		compatible = "ethernet-phy-ieee802.3-c22";
..
..
@@ -620,10 +522,16 @@
620
522
 	};
621
523
 };
622
524
 
525
+&video_phy0 {
526
+	status = "okay";
527
+};
623
528
 
529
+&video_phy1 {
530
+	status = "disabled";
531
+};
624
532
 
625
533
 &pcie30phy {
626
-	status = "okay";
534
+	status = "disabled";
627
535
 };
628
536
 
629
537
 &pcie2x1 {
..
..
@@ -632,39 +540,26 @@
632
540
 	status = "okay";
633
541
 };
634
542
 
543
+&pcie3x2 {
544
+	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
545
+	vpcie3v3-supply = <&vcc3v3_pcie>;
546
+	status = "okay";
547
+};
548
+
635
549
 &pinctrl {
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
-//	};
550
+
643
551
 	headphone {
644
552
 		hp_det: hp-det {
645
-			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
646
-							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
553
+			rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
647
554
 		};
648
555
 	};
649
556
 
650
557
 	wireless-wlan {
651
558
 		wifi_host_wake_irq: wifi-host-wake-irq {
652
-			rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
653
-		};
654
-	};
655
-
656
-	wireless-bluetooth {
657
-		uart1_gpios: uart1-gpios {
658
-			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
559
+			rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
659
560
 		};
660
561
 	};
661
562
 	
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
563
 	nk_io_init{
669
564
 		nk_io_gpio: nk-io-gpio{
670
565
 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -692,6 +587,10 @@
692
587
 	};
693
588
 };
694
589
 
590
+&rk809_sound {
591
+	hp-det-gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
592
+};
593
+
695
594
 &rkisp {
696
595
 	status = "disabled";
697
596
 };
..
..
@@ -714,32 +613,36 @@
714
613
 	};
715
614
 };
716
615
 
616
+&route_dsi0 {
617
+	status = "disabled";
618
+	connect = <&vp1_out_dsi0>;
619
+};
717
620
 
718
621
 
719
622
 
623
+&route_edp {
624
+	status = "disabled";
625
+	connect = <&vp1_out_edp>;
626
+};
720
627
 
721
628
 &sata2 {
722
629
 	status = "okay";
723
630
 };
724
631
 
725
632
 &sdmmc2 {
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";
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";
743
646
 };
744
647
 
745
648
 &spdif_8ch {
..
..
@@ -772,17 +675,7 @@
772
675
 
773
676
 &wireless_bluetooth {
774
677
 	compatible = "bluetooth-platdata";
775
-	clocks = <&rk809 1>;
776
-	clock-names = "ext_clock";
777
-	//wifi-bt-power-toggle;
778
-	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
779
-	pinctrl-names = "default", "rts_gpio";
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>;
785
-	status = "okay";
678
+	status = "disabled";
786
679
 };
787
680
 
788
681
 &uart0 {
..
..
@@ -792,7 +685,7 @@
792
685
 &uart1 {	
793
686
 	pinctrl-names = "default";	
794
687
 	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
795
-	status = "okay";		
688
+	status = "disabled";		
796
689
 };
797
690
 
798
691
 &uart3 {
..
..
@@ -818,4 +711,4 @@
818
711
 &uart9 {
819
712
 	status = "okay";
820
713
 	pinctrl-0 = <&uart9m1_xfer>;
821
-};
714
+};