add lvds1024*800

hc

2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -137,7 +137,7 @@
137
137
 			};
138
138
 			
139
139
 			hp_en {
140
-				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
140
+				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
141
141
 				gpio_function = <0>;
142
142
 			};
143
143
 			
..
..
@@ -226,8 +226,8 @@
226
226
 				nodka-lvds = <15>;
227
227
 
228
228
 				display-timings {
229
-                native-mode = <&timing0>;
230
-                timing0: timing0 {
229
+                native-mode = <&timing>;
230
+                timing: timing {
231
231
 					clock-frequency = <72500000>;
232
232
 					hactive = <1280>;
233
233
 					vactive = <800>;
..
..
@@ -244,8 +244,8 @@
244
244
 					};
245
245
 				};
246
246
 				ports {
247
-					panel_in: endpoint {
248
-					remote-endpoint = <&edp_out>;
247
+					panel_in_lvds: endpoint {
248
+					remote-endpoint = <&lvds_out>;
249
249
 						};
250
250
 					};   
251
251
 				};
..
..
@@ -312,7 +312,7 @@
312
312
  * when dsi0 is enabled
313
313
  */
314
314
 &video_phy0 {
315
-	status = "disabled";
315
+	status = "okay";
316
316
 };
317
317
 
318
318
 &dsi0 {
..
..
@@ -337,7 +337,7 @@
337
337
  */
338
338
  
339
339
 &video_phy1 {
340
-	status = "okay";
340
+	status = "disabled";
341
341
 }; 
342
342
 &dsi1 {
343
343
 	status = "disabled";
..
..
@@ -348,11 +348,11 @@
348
348
 };
349
349
 
350
350
 &dsi1_in_vp1 {
351
-	status = "okay";
351
+	status = "disabled";
352
352
 };
353
353
 
354
354
 &dsi1_panel {
355
-	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
355
+//	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
356
356
     vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
357
357
     reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
358
358
     vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
..
..
@@ -372,20 +372,11 @@
372
372
 
373
373
 &edp {
374
374
     force-hpd;
375
-    status = "okay";
376
-    ports {
377
-        port@1 {
378
-            reg = <1>;
379
-            edp_out: endpoint {
380
-                remote-endpoint = <&panel_in>;
381
-            };
382
-        };
383
-    };
375
+	status = "disabled";
384
376
 };
385
377
 
386
378
 &edp_phy {
387
-  status = "okay";
388
-
379
+	status = "disabled";
389
380
 };
390
381
 
391
382
 &edp_in_vp0 {
..
..
@@ -393,18 +384,40 @@
393
384
 };
394
385
 
395
386
 &edp_in_vp1 {
396
-    status = "okay";
387
+    status = "disabled";
397
388
 
398
389
 };
399
390
 
400
391
 &route_edp {
401
-    status = "okay";
392
+    status = "disabled";
402
393
     connect = <&vp1_out_edp>;
403
394
 };
404
395
 
405
396
 &route_edp {
397
+	status = "disabled";
398
+};
399
+
400
+&lvds {
401
+	status = "okay";
402
+	ports {
403
+		port@1 {
404
+			reg = <1>;
405
+			lvds_out:endpoint {
406
+				remote-endpoint = <&panel_in_lvds>;
407
+			};
408
+		};
409
+	};
410
+};
411
+
412
+&route_lvds{
413
+	status = "okay";
414
+	connect = <&vp1_out_lvds>;
415
+};
416
+
417
+&lvds_in_vp1 {
406
418
 	status = "okay";
407
419
 };
420
+
408
421
 /*
409
422
 *  edp_end
410
423
 */
..
..
@@ -449,7 +462,7 @@
449
462
 	phy-mode = "rgmii";
450
463
 	clock_in_out = "output";
451
464
 
452
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
465
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
453
466
 	snps,reset-active-low;
454
467
 	/* Reset time is 20ms, 100ms for rtl8211f */
455
468
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -469,7 +482,9 @@
469
482
 	rx_delay = <0x2f>;
470
483
 
471
484
 	phy-handle = <&rgmii_phy0>;
485
+	
472
486
 	status = "disabled";
487
+	
473
488
 };
474
489
 
475
490
 &gmac1 {
..
..
@@ -503,9 +518,7 @@
503
518
  * power-supply should switche to vcc3v3_lcd1_n
504
519
  * when mipi panel is connected to dsi1.
505
520
  */
506
-&gt1x {
507
-	power-supply = <&vcc3v3_lcd0_n>;
508
-};
521
+
509
522
 
510
523
 &i2c3 {
511
524
 	status = "okay";
..
..
@@ -524,7 +537,7 @@
524
537
 };
525
538
 
526
539
 &i2c4 {
527
-	status = "okay";
540
+	status = "disabled";
528
541
 	gc8034: gc8034@37 {
529
542
 		compatible = "galaxycore,gc8034";
530
543
 		status = "okay";
..
..
@@ -536,7 +549,6 @@
536
549
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
537
550
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
538
551
 		rockchip,grf = <&grf>;
539
-		power-domains = <&power RK3568_PD_VI>;
540
552
 		rockchip,camera-module-index = <0>;
541
553
 		rockchip,camera-module-facing = "back";
542
554
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -570,7 +582,7 @@
570
582
 		};
571
583
 	};
572
584
 	ov5695: ov5695@36 {
573
-		status = "okay";
585
+		status = "disabled";
574
586
 		compatible = "ovti,ov5695";
575
587
 		reg = <0x36>;
576
588
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -674,7 +686,7 @@
674
686
 							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
675
687
 							<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
676
688
 							<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
677
-							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, 
689
+							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
678
690
 							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
679
691
 							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
680
692
 							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -713,8 +725,6 @@
713
725
 		};
714
726
 	};
715
727
 };
716
-
717
-
718
728
 
719
729
 
720
730