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