enable lvds 1280x800

hc

2023-11-20 0d8657dd3056063fb115946b10157477b5c70451

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -8,19 +8,13 @@
8
8
 
9
9
 #include <dt-bindings/gpio/gpio.h>
10
10
 #include <dt-bindings/pinctrl/rockchip.h>
11
+#include <dt-bindings/display/media-bus-format.h>
11
12
 #include "rk3568.dtsi"
12
13
 #include "rk3568-evb.dtsi"
13
14
 
14
15
 / {
15
16
 	model = "Rockchip RK3568 EVB1 DDR4 V10 Board";
16
17
 	compatible = "rockchip,rk3568-evb1-ddr4-v10", "rockchip,rk3568";
17
-
18
-	rk_headset: rk-headset {
19
-		compatible = "rockchip_headset";
20
-		headset_gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
21
-		pinctrl-names = "default";
22
-		pinctrl-0 = <&hp_det>;
23
-	};
24
18
 
25
19
 	vcc2v5_sys: vcc2v5-ddr {
26
20
 		compatible = "regulator-fixed";
..
..
@@ -92,40 +86,144 @@
92
86
 		enable-active-high;
93
87
 		regulator-always-on;
94
88
 		regulator-boot-on;
95
-    	};
89
+	};
96
90
 #endif
97
91
 
98
-	    nk_io_init {
99
-                compatible = "nk_io_control";
100
-				usb_en_oc_gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;  //USB_EN_OC_GPIO0_A5
101
-				lcd_bk_en_gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
102
-				lcd_pwblk_gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
103
-				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
104
-                hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
105
-                hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
106
-//              hub_host3_5V_rest_gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>; 
107
-                vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
108
-                vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
109
-                en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
110
-                reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
111
-                air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
112
-                wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
113
-                
114
-				edp_enable_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
115
-                edp_gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_LOW>; //7511_GPIO0-GPIO3_D2
116
-				edp_gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_LOW>; //7511_GPIO1-GPIO3_D3
117
-				edp_gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_LOW>; //7511_GPIO2-GPIO3_D4
118
-				edp_gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>; //7511_GPIO3-GPIO3_D5
119
-                edp_reset = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
120
-//              tp_reset = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>;
121
-//              vddio_mipi = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;
122
-		
123
-				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
92
+	ndj_io_init {
93
+         	compatible = "nk_io_control";	
94
+			pinctrl-names = "default";
95
+        	pinctrl-0 = <&nk_io_gpio>;
96
+			
97
+			//gpio_op0 = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
98
+			
99
+			vcc_5v {
100
+				gpio_num = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
101
+				gpio_function = <0>;	
102
+			};
103
+			
104
+			vcc_12v {
105
+				gpio_num = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;  //VCC12_IO_EN_GPIO0_C7_3V3
106
+				gpio_function = <0>;
107
+			};
108
+			
109
+			hub_host2_rst {
110
+				gpio_num = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;  //HUB_RST_GPIO4_D2_3V3
111
+				gpio_function = <3>;
112
+			};
113
+			
114
+			hub_host3 {
115
+				gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
116
+				gpio_function = <0>;
117
+			};
118
+			
119
+			wake_4g {
120
+				gpio_num = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>; //4G_WAKEUP_GPIO01_B1_3V3
121
+				gpio_function = <0>;
122
+			};
123
+			
124
+			air_mode_4g {
125
+				gpio_num = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>; //4G_AIR_MODE_GPIO01_B0_3V3
126
+				gpio_function = <0>;
127
+			};
128
+			
129
+			reset_4g {
130
+				gpio_num = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; //4G_RST_GPIO01_B2_3V3
131
+				gpio_function = <3>;
132
+			};
133
+			
134
+			en_4g {
135
+				gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
136
+				gpio_function = <0>;
137
+			};
138
+			
139
+			hp_en {
140
+				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
141
+				gpio_function = <0>;
142
+			};
143
+			
144
+			wifi_power_en {
145
+				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
146
+				gpio_function = <0>;
147
+			};
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 {
192
+				compatible = "simple-panel";
193
+				backlight = <&backlight>;
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
197
+				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
198
+				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
199
+				bpc = <8>;
200
+				prepare-delay-ms = <200>;
201
+				enable-delay-ms = <20>;
124
202
 
125
-				pinctrl-names = "default";
126
-				pinctrl-0 = <&nk_io_gpio>;
127
-				nodka_lvds = <9>;
128
-        };
203
+				display-timings {
204
+                native-mode = <&timing>;
205
+                timing: timing {
206
+					clock-frequency = <72500000>;
207
+					hactive = <1280>;
208
+					vactive = <800>;
209
+					hfront-porch = <70>;
210
+					hsync-len = <2>;
211
+					hback-porch = <88>;
212
+					vfront-porch = <7>;
213
+					vsync-len = <4>;
214
+					vback-porch = <17>;
215
+					hsync-active = <21>;
216
+					vsync-active = <0>;
217
+					de-active = <0>;
218
+					pixelclk-active = <0>;			
219
+					};
220
+				};
221
+				ports {
222
+					panel_in_lvds: endpoint {
223
+					remote-endpoint = <&lvds_out>;
224
+						};
225
+					};   
226
+				};
129
227
 };
130
228
 
131
229
 &combphy0_us {
..
..
@@ -141,11 +239,11 @@
141
239
 };
142
240
 
143
241
 &csi2_dphy_hw {
144
-	status = "okay";
242
+	status = "disabled";
145
243
 };
146
244
 
147
245
 &csi2_dphy0 {
148
-	status = "okay";
246
+	status = "disabled";
149
247
 
150
248
 	ports {
151
249
 		#address-cells = <1>;
..
..
@@ -189,7 +287,7 @@
189
287
  * when dsi0 is enabled
190
288
  */
191
289
 &dsi0 {
192
-	status = "okay";
290
+	status = "disabled";
193
291
 };
194
292
 
195
293
 &dsi0_in_vp0 {
..
..
@@ -197,7 +295,7 @@
197
295
 };
198
296
 
199
297
 &dsi0_in_vp1 {
200
-	status = "okay";
298
+	status = "disabled";
201
299
 };
202
300
 
203
301
 &dsi0_panel {
..
..
@@ -225,7 +323,30 @@
225
323
 };
226
324
 
227
325
 &edp {
228
-	hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
326
+	//hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;	
327
+    force-hpd;
328
+    status = "disabled";
329
+};
330
+
331
+&lvds {
332
+    status = "okay";
333
+    ports {
334
+        port@1 {
335
+            reg = <1>;
336
+            lvds_out: endpoint {
337
+                remote-endpoint = <&panel_in_lvds>;
338
+            };
339
+        };
340
+   
341
+	};
342
+};
343
+
344
+&route_lvds{
345
+	 status = "okay";
346
+	 connect = <&vp2_out_lvds>;
347
+};
348
+
349
+&lvds_in_vp2 {
229
350
 	status = "okay";
230
351
 };
231
352
 
..
..
@@ -234,18 +355,18 @@
234
355
 };
235
356
 
236
357
 &edp_in_vp0 {
237
-	status = "okay";
358
+	status = "disabled";
238
359
 };
239
360
 
240
361
 &edp_in_vp1 {
241
-	status = "disabled";
362
+	status = "okay";
242
363
 };
243
364
 
244
365
 &gmac0 {
245
366
 	phy-mode = "rgmii";
246
367
 	clock_in_out = "output";
247
368
 
248
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
369
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
249
370
 	snps,reset-active-low;
250
371
 	/* Reset time is 20ms, 100ms for rtl8211f */
251
372
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -265,7 +386,7 @@
265
386
 	rx_delay = <0x2f>;
266
387
 
267
388
 	phy-handle = <&rgmii_phy0>;
268
-	status = "disabled";
389
+	status = "okay";
269
390
 };
270
391
 
271
392
 &gmac1 {
..
..
@@ -299,9 +420,7 @@
299
420
  * power-supply should switche to vcc3v3_lcd1_n
300
421
  * when mipi panel is connected to dsi1.
301
422
  */
302
-&gt1x {
303
-	power-supply = <&vcc3v3_lcd0_n>;
304
-};
423
+
305
424
 
306
425
 &i2c3 {
307
426
 	status = "okay";
..
..
@@ -317,13 +436,10 @@
317
436
                 compatible = "nk_mcu";
318
437
                 reg = <0x15>;
319
438
         };
320
-
321
-
322
-
323
439
 };
324
440
 
325
441
 &i2c4 {
326
-	status = "okay";
442
+	status = "disabled";
327
443
 	gc8034: gc8034@37 {
328
444
 		compatible = "galaxycore,gc8034";
329
445
 		status = "okay";
..
..
@@ -369,7 +485,7 @@
369
485
 		};
370
486
 	};
371
487
 	ov5695: ov5695@36 {
372
-		status = "okay";
488
+		status = "disabled";
373
489
 		compatible = "ovti,ov5695";
374
490
 		reg = <0x36>;
375
491
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -415,6 +531,12 @@
415
531
 };
416
532
 
417
533
 &pcie30phy {
534
+	status = "disabled";
535
+};
536
+
537
+&pcie2x1 {
538
+	reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
539
+	vpcie3v3-supply = <&vcc3v3_pcie>;
418
540
 	status = "okay";
419
541
 };
420
542
 
..
..
@@ -425,13 +547,7 @@
425
547
 };
426
548
 
427
549
 &pinctrl {
428
-//	cam {
429
-//		camera_pwr: camera-pwr {
430
-//			rockchip,pins =
431
-//				/* camera power en */
432
-//				<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
433
-//		};
434
-//	};
550
+
435
551
 	headphone {
436
552
 		hp_det: hp-det {
437
553
 			rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
..
..
@@ -440,32 +556,51 @@
440
556
 
441
557
 	wireless-wlan {
442
558
 		wifi_host_wake_irq: wifi-host-wake-irq {
443
-			rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
559
+			rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
444
560
 		};
445
561
 	};
446
-
447
-	wireless-bluetooth {
448
-		uart1_gpios: uart1-gpios {
449
-			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
450
-		};
451
-	};
562
+	
452
563
 	nk_io_init{
453
564
 		nk_io_gpio: nk-io-gpio{
454
-            rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>;
565
+			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
566
+							<0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>,
567
+							<0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>,
568
+							<4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
569
+							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
570
+							<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
571
+							<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
572
+							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, 
573
+							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
574
+							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
575
+							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
576
+							<3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
577
+							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
578
+							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
579
+							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
580
+							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
581
+							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
582
+							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
583
+							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
584
+							<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3
585
+							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
455
586
 		};
456
587
 	};
588
+};
589
+
590
+&rk809_sound {
591
+	hp-det-gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
457
592
 };
458
593
 
459
594
 &rkisp {
460
-	status = "okay";
595
+	status = "disabled";
461
596
 };
462
597
 
463
598
 &rkisp_mmu {
464
-	status = "okay";
599
+	status = "disabled";
465
600
 };
466
601
 
467
602
 &rkisp_vir0 {
468
-	status = "okay";
603
+	status = "disabled";
469
604
 
470
605
 	port {
471
606
 		#address-cells = <1>;
..
..
@@ -479,13 +614,15 @@
479
614
 };
480
615
 
481
616
 &route_dsi0 {
482
-	status = "okay";
617
+	status = "disabled";
483
618
 	connect = <&vp1_out_dsi0>;
484
619
 };
485
620
 
621
+
622
+
486
623
 &route_edp {
487
-	status = "okay";
488
-	connect = <&vp0_out_edp>;
624
+	status = "disabled";
625
+	connect = <&vp1_out_edp>;
489
626
 };
490
627
 
491
628
 &sata2 {
..
..
@@ -493,23 +630,19 @@
493
630
 };
494
631
 
495
632
 &sdmmc2 {
496
-        status = "disabled";
497
-};
498
-
499
-&sdmmc1 {
500
-        max-frequency = <150000000>;
501
-        supports-sdio;
502
-        bus-width = <4>;
503
-        disable-wp;
504
-        cap-sd-highspeed;
505
-        cap-sdio-irq;
506
-        keep-power-in-suspend;
507
-        mmc-pwrseq = <&sdio_pwrseq>;
508
-        non-removable;
509
-        pinctrl-names = "default";
510
-        pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
511
-        sd-uhs-sdr104;
512
-        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";
513
646
 };
514
647
 
515
648
 &spdif_8ch {
..
..
@@ -525,12 +658,12 @@
525
658
 };
526
659
 
527
660
 &vcc3v3_lcd0_n {
528
-	gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
661
+	gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; 
529
662
 	enable-active-high;
530
663
 };
531
664
 
532
665
 &vcc3v3_lcd1_n {
533
-	gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
666
+	gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; //MIPI_3V3EN_GPIO3_A3_d_3V3
534
667
 	enable-active-high;
535
668
 };
536
669
 
..
..
@@ -542,22 +675,17 @@
542
675
 
543
676
 &wireless_bluetooth {
544
677
 	compatible = "bluetooth-platdata";
545
-	clocks = <&rk809 1>;
546
-	clock-names = "ext_clock";
547
-	//wifi-bt-power-toggle;
548
-	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
549
-	BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
550
-	pinctrl-names = "default", "rts_gpio";
551
-	pinctrl-0 = <&uart1m0_rtsn>;
552
-	pinctrl-1 = <&uart1_gpios>;
553
-	BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
554
-	BT,wake_gpio     = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
555
-	BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
556
678
 	status = "disabled";
557
679
 };
558
680
 
559
681
 &uart0 {
560
682
 	status = "okay";
683
+};
684
+
685
+&uart1 {	
686
+	pinctrl-names = "default";	
687
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
688
+	status = "disabled";		
561
689
 };
562
690
 
563
691
 &uart3 {
..
..
@@ -583,4 +711,4 @@
583
711
 &uart9 {
584
712
 	status = "okay";
585
713
 	pinctrl-0 = <&uart9m1_xfer>;
586
-};
714
+};