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,12 +86,16 @@
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";
95
95
         	pinctrl-0 = <&nk_io_gpio>;
96
+			
97
+			//gpio_op0 = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
98
+			
96
99
 			vcc_5v {
97
100
 				gpio_num = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
98
101
 				gpio_function = <0>;	
..
..
@@ -142,48 +145,64 @@
142
145
 				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
143
146
 				gpio_function = <0>;
144
147
 			};
145
-		};
146
-#if 0			
147
-	    nk_io_init {
148
-                compatible = "nk_io_control";
149
-//				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
150
-                hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
151
-                hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
152
-                vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
153
-                vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
154
-                en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
155
-                reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
156
-                air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
157
-                wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
158
-				hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
159
-//              spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3			
160
-				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
161
-//				pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4				
162
-				pinctrl-names = "default";
163
-				pinctrl-0 = <&nk_io_gpio>;				
164
-        };
165
-#endif	
166
-		panel: panel {
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
+	
191
+			panel: panel {
167
192
 				compatible = "simple-panel";
168
193
 				backlight = <&backlight>;
169
-				power-supply = <&vcc3v3_lcd0_n>;
170
-				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
171
-				reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
172
-				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
173
197
 				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
174
198
 				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
175
199
 				bpc = <8>;
176
200
 				prepare-delay-ms = <200>;
177
201
 				enable-delay-ms = <20>;
178
-				lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2 
179
-				lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3 
180
-				lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4 
181
-				lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
182
-				nodka-lvds = <15>;
183
202
 
184
203
 				display-timings {
185
-                native-mode = <&timing0>;
186
-                timing0: timing0 {
204
+                native-mode = <&timing>;
205
+                timing: timing {
187
206
 					clock-frequency = <72500000>;
188
207
 					hactive = <1280>;
189
208
 					vactive = <800>;
..
..
@@ -200,8 +219,8 @@
200
219
 					};
201
220
 				};
202
221
 				ports {
203
-					panel_in: endpoint {
204
-					remote-endpoint = <&edp_out>;
222
+					panel_in_lvds: endpoint {
223
+					remote-endpoint = <&lvds_out>;
205
224
 						};
206
225
 					};   
207
226
 				};
..
..
@@ -267,10 +286,6 @@
267
286
  * video_phy0 needs to be enabled
268
287
  * when dsi0 is enabled
269
288
  */
270
-&video_phy0 {
271
-	status = "disabled";
272
-};
273
-
274
289
 &dsi0 {
275
290
 	status = "disabled";
276
291
 };
..
..
@@ -291,10 +306,6 @@
291
306
  * video_phy1 needs to be enabled
292
307
  * when dsi1 is enabled
293
308
  */
294
- 
295
-&video_phy1 {
296
-	status = "okay";
297
-}; 
298
309
 &dsi1 {
299
310
 	status = "disabled";
300
311
 };
..
..
@@ -304,108 +315,58 @@
304
315
 };
305
316
 
306
317
 &dsi1_in_vp1 {
307
-	status = "okay";
318
+	status = "disabled";
308
319
 };
309
320
 
310
321
 &dsi1_panel {
311
-	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
312
-    vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
313
-    reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
314
-    vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
315
-    pinctrl-names = "default";
316
-    pinctrl-0 = <&lcd1_rst_gpio>;
322
+	power-supply = <&vcc3v3_lcd1_n>;
317
323
 };
318
-
319
-&route_dsi1 {
320
-	status = "disabled";
321
-	connect = <&vp1_out_dsi1>;
322
-};
323
-
324
-
325
-/*
326
-*  edp_start
327
-*/
328
324
 
329
325
 &edp {
326
+	//hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;	
330
327
     force-hpd;
328
+    status = "disabled";
329
+};
330
+
331
+&lvds {
331
332
     status = "okay";
332
333
     ports {
333
334
         port@1 {
334
335
             reg = <1>;
335
-            edp_out: endpoint {
336
-                remote-endpoint = <&panel_in>;
336
+            lvds_out: endpoint {
337
+                remote-endpoint = <&panel_in_lvds>;
337
338
             };
338
339
         };
339
-    };
340
+   
341
+	};
342
+};
343
+
344
+&route_lvds{
345
+	 status = "okay";
346
+	 connect = <&vp2_out_lvds>;
347
+};
348
+
349
+&lvds_in_vp2 {
350
+	status = "okay";
340
351
 };
341
352
 
342
353
 &edp_phy {
343
-  status = "okay";
344
-
354
+	status = "okay";
345
355
 };
346
356
 
347
357
 &edp_in_vp0 {
348
-    status = "disabled";
349
-};
350
-
351
-&edp_in_vp1 {
352
-    status = "okay";
353
-
354
-};
355
-
356
-&route_edp {
357
-    status = "okay";
358
-    connect = <&vp1_out_edp>;
359
-};
360
-
361
-&route_edp {
362
-	status = "okay";
363
-};
364
-/*
365
-*  edp_end
366
-*/
367
-
368
-/*
369
-*  Hdmi_start
370
-*/
371
-
372
-&hdmi {
373
-	status = "okay";
374
-	rockchip,phy-table =
375
-		<92812500  0x8009 0x0000 0x0270>,
376
-		<165000000 0x800b 0x0000 0x026d>,
377
-		<185625000 0x800b 0x0000 0x01ed>,
378
-		<297000000 0x800b 0x0000 0x01ad>,
379
-		<594000000 0x8029 0x0000 0x0088>,
380
-		<000000000 0x0000 0x0000 0x0000>;
381
-};
382
-
383
-&route_hdmi {
384
-	status = "okay";
385
-	connect = <&vp0_out_hdmi>;
386
-};
387
-
388
-&hdmi_in_vp0 {
389
-	status = "okay";
390
-};
391
-
392
-&hdmi_in_vp1 {
393
358
 	status = "disabled";
394
359
 };
395
360
 
396
-&hdmi_sound {
361
+&edp_in_vp1 {
397
362
 	status = "okay";
398
363
 };
399
-
400
-/*
401
- *  Hdmi_END
402
-*/
403
364
 
404
365
 &gmac0 {
405
366
 	phy-mode = "rgmii";
406
367
 	clock_in_out = "output";
407
368
 
408
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
369
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
409
370
 	snps,reset-active-low;
410
371
 	/* Reset time is 20ms, 100ms for rtl8211f */
411
372
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -425,7 +386,7 @@
425
386
 	rx_delay = <0x2f>;
426
387
 
427
388
 	phy-handle = <&rgmii_phy0>;
428
-	status = "disabled";
389
+	status = "okay";
429
390
 };
430
391
 
431
392
 &gmac1 {
..
..
@@ -459,9 +420,7 @@
459
420
  * power-supply should switche to vcc3v3_lcd1_n
460
421
  * when mipi panel is connected to dsi1.
461
422
  */
462
-&gt1x {
463
-	power-supply = <&vcc3v3_lcd0_n>;
464
-};
423
+
465
424
 
466
425
 &i2c3 {
467
426
 	status = "okay";
..
..
@@ -480,7 +439,7 @@
480
439
 };
481
440
 
482
441
 &i2c4 {
483
-	status = "okay";
442
+	status = "disabled";
484
443
 	gc8034: gc8034@37 {
485
444
 		compatible = "galaxycore,gc8034";
486
445
 		status = "okay";
..
..
@@ -526,7 +485,7 @@
526
485
 		};
527
486
 	};
528
487
 	ov5695: ov5695@36 {
529
-		status = "okay";
488
+		status = "disabled";
530
489
 		compatible = "ovti,ov5695";
531
490
 		reg = <0x36>;
532
491
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -549,19 +508,6 @@
549
508
 	};
550
509
 };
551
510
 
552
-&i2c5 {
553
-	status = "okay";
554
-
555
-	hym8563: hym8563@51 {
556
-		compatible = "haoyu,hym8563";
557
-		reg = <0x51>;
558
-		#clock-cells = <0>;
559
-		clock-frequency = <32768>;
560
-		clock-output-names = "xin32k";
561
-		/* rtc_int is not connected */
562
-	};
563
-};
564
-
565
511
 &mdio0 {
566
512
 	rgmii_phy0: phy@0 {
567
513
 		compatible = "ethernet-phy-ieee802.3-c22";
..
..
@@ -576,10 +522,16 @@
576
522
 	};
577
523
 };
578
524
 
525
+&video_phy0 {
526
+	status = "okay";
527
+};
579
528
 
529
+&video_phy1 {
530
+	status = "disabled";
531
+};
580
532
 
581
533
 &pcie30phy {
582
-	status = "okay";
534
+	status = "disabled";
583
535
 };
584
536
 
585
537
 &pcie2x1 {
..
..
@@ -588,39 +540,26 @@
588
540
 	status = "okay";
589
541
 };
590
542
 
543
+&pcie3x2 {
544
+	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
545
+	vpcie3v3-supply = <&vcc3v3_pcie>;
546
+	status = "okay";
547
+};
548
+
591
549
 &pinctrl {
592
-//	cam {
593
-//		camera_pwr: camera-pwr {
594
-//			rockchip,pins =
595
-//				/* camera power en */
596
-//				<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
597
-//		};
598
-//	};
550
+
599
551
 	headphone {
600
552
 		hp_det: hp-det {
601
-			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
602
-							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
553
+			rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
603
554
 		};
604
555
 	};
605
556
 
606
557
 	wireless-wlan {
607
558
 		wifi_host_wake_irq: wifi-host-wake-irq {
608
-			rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
609
-		};
610
-	};
611
-
612
-	wireless-bluetooth {
613
-		uart1_gpios: uart1-gpios {
614
-			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
559
+			rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
615
560
 		};
616
561
 	};
617
562
 	
618
-	lcd1 {
619
-        lcd1_rst_gpio: lcd1-rst-gpio {
620
-            rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
621
-        };
622
-    };
623
-		
624
563
 	nk_io_init{
625
564
 		nk_io_gpio: nk-io-gpio{
626
565
 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -630,7 +569,7 @@
630
569
 							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
631
570
 							<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
632
571
 							<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
633
-							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
572
+							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, 
634
573
 							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
635
574
 							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
636
575
 							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -646,6 +585,10 @@
646
585
 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
647
586
 		};
648
587
 	};
588
+};
589
+
590
+&rk809_sound {
591
+	hp-det-gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
649
592
 };
650
593
 
651
594
 &rkisp {
..
..
@@ -670,32 +613,36 @@
670
613
 	};
671
614
 };
672
615
 
616
+&route_dsi0 {
617
+	status = "disabled";
618
+	connect = <&vp1_out_dsi0>;
619
+};
673
620
 
674
621
 
675
622
 
623
+&route_edp {
624
+	status = "disabled";
625
+	connect = <&vp1_out_edp>;
626
+};
676
627
 
677
628
 &sata2 {
678
629
 	status = "okay";
679
630
 };
680
631
 
681
632
 &sdmmc2 {
682
-        status = "disabled";
683
-};
684
-
685
-&sdmmc1 {
686
-        max-frequency = <150000000>;
687
-        supports-sdio;
688
-        bus-width = <4>;
689
-        disable-wp;
690
-        cap-sd-highspeed;
691
-        cap-sdio-irq;
692
-        keep-power-in-suspend;
693
-        mmc-pwrseq = <&sdio_pwrseq>;
694
-        non-removable;
695
-        pinctrl-names = "default";
696
-        pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
697
-        sd-uhs-sdr104;
698
-        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";
699
646
 };
700
647
 
701
648
 &spdif_8ch {
..
..
@@ -728,17 +675,7 @@
728
675
 
729
676
 &wireless_bluetooth {
730
677
 	compatible = "bluetooth-platdata";
731
-	clocks = <&rk809 1>;
732
-	clock-names = "ext_clock";
733
-	//wifi-bt-power-toggle;
734
-	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
735
-	pinctrl-names = "default", "rts_gpio";
736
-	pinctrl-0 = <&uart1m0_rtsn>;
737
-	pinctrl-1 = <&uart1_gpios>;
738
-	BT,reset_gpio    = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
739
-    BT,wake_gpio     = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
740
-    BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
741
-	status = "okay";
678
+	status = "disabled";
742
679
 };
743
680
 
744
681
 &uart0 {
..
..
@@ -748,7 +685,7 @@
748
685
 &uart1 {	
749
686
 	pinctrl-names = "default";	
750
687
 	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
751
-	status = "okay";		
688
+	status = "disabled";		
752
689
 };
753
690
 
754
691
 &uart3 {
..
..
@@ -774,4 +711,4 @@
774
711
 &uart9 {
775
712
 	status = "okay";
776
713
 	pinctrl-0 = <&uart9m1_xfer>;
777
-};
714
+};