add lvds1024*800

hc

2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -93,6 +93,9 @@
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>;	
..
..
@@ -134,7 +137,7 @@
134
137
 			};
135
138
 			
136
139
 			hp_en {
137
-				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
138
141
 				gpio_function = <0>;
139
142
 			};
140
143
 			
..
..
@@ -142,6 +145,47 @@
142
145
 				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
143
146
 				gpio_function = <0>;
144
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
145
189
 		};
146
190
 #if 0			
147
191
 	    nk_io_init {
..
..
@@ -182,8 +226,8 @@
182
226
 				nodka-lvds = <15>;
183
227
 
184
228
 				display-timings {
185
-                native-mode = <&timing0>;
186
-                timing0: timing0 {
229
+                native-mode = <&timing>;
230
+                timing: timing {
187
231
 					clock-frequency = <72500000>;
188
232
 					hactive = <1280>;
189
233
 					vactive = <800>;
..
..
@@ -200,8 +244,8 @@
200
244
 					};
201
245
 				};
202
246
 				ports {
203
-					panel_in: endpoint {
204
-					remote-endpoint = <&edp_out>;
247
+					panel_in_lvds: endpoint {
248
+					remote-endpoint = <&lvds_out>;
205
249
 						};
206
250
 					};   
207
251
 				};
..
..
@@ -268,7 +312,7 @@
268
312
  * when dsi0 is enabled
269
313
  */
270
314
 &video_phy0 {
271
-	status = "disabled";
315
+	status = "okay";
272
316
 };
273
317
 
274
318
 &dsi0 {
..
..
@@ -293,7 +337,7 @@
293
337
  */
294
338
  
295
339
 &video_phy1 {
296
-	status = "okay";
340
+	status = "disabled";
297
341
 }; 
298
342
 &dsi1 {
299
343
 	status = "disabled";
..
..
@@ -304,11 +348,11 @@
304
348
 };
305
349
 
306
350
 &dsi1_in_vp1 {
307
-	status = "okay";
351
+	status = "disabled";
308
352
 };
309
353
 
310
354
 &dsi1_panel {
311
-	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
355
+//	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
312
356
     vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
313
357
     reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
314
358
     vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
..
..
@@ -328,20 +372,11 @@
328
372
 
329
373
 &edp {
330
374
     force-hpd;
331
-    status = "okay";
332
-    ports {
333
-        port@1 {
334
-            reg = <1>;
335
-            edp_out: endpoint {
336
-                remote-endpoint = <&panel_in>;
337
-            };
338
-        };
339
-    };
375
+	status = "disabled";
340
376
 };
341
377
 
342
378
 &edp_phy {
343
-  status = "okay";
344
-
379
+	status = "disabled";
345
380
 };
346
381
 
347
382
 &edp_in_vp0 {
..
..
@@ -349,18 +384,40 @@
349
384
 };
350
385
 
351
386
 &edp_in_vp1 {
352
-    status = "okay";
387
+    status = "disabled";
353
388
 
354
389
 };
355
390
 
356
391
 &route_edp {
357
-    status = "okay";
392
+    status = "disabled";
358
393
     connect = <&vp1_out_edp>;
359
394
 };
360
395
 
361
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 {
362
418
 	status = "okay";
363
419
 };
420
+
364
421
 /*
365
422
 *  edp_end
366
423
 */
..
..
@@ -405,7 +462,7 @@
405
462
 	phy-mode = "rgmii";
406
463
 	clock_in_out = "output";
407
464
 
408
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
465
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
409
466
 	snps,reset-active-low;
410
467
 	/* Reset time is 20ms, 100ms for rtl8211f */
411
468
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -425,7 +482,9 @@
425
482
 	rx_delay = <0x2f>;
426
483
 
427
484
 	phy-handle = <&rgmii_phy0>;
485
+	
428
486
 	status = "disabled";
487
+	
429
488
 };
430
489
 
431
490
 &gmac1 {
..
..
@@ -459,9 +518,7 @@
459
518
  * power-supply should switche to vcc3v3_lcd1_n
460
519
  * when mipi panel is connected to dsi1.
461
520
  */
462
-&gt1x {
463
-	power-supply = <&vcc3v3_lcd0_n>;
464
-};
521
+
465
522
 
466
523
 &i2c3 {
467
524
 	status = "okay";
..
..
@@ -480,7 +537,7 @@
480
537
 };
481
538
 
482
539
 &i2c4 {
483
-	status = "okay";
540
+	status = "disabled";
484
541
 	gc8034: gc8034@37 {
485
542
 		compatible = "galaxycore,gc8034";
486
543
 		status = "okay";
..
..
@@ -492,7 +549,6 @@
492
549
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
493
550
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
494
551
 		rockchip,grf = <&grf>;
495
-		power-domains = <&power RK3568_PD_VI>;
496
552
 		rockchip,camera-module-index = <0>;
497
553
 		rockchip,camera-module-facing = "back";
498
554
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -526,7 +582,7 @@
526
582
 		};
527
583
 	};
528
584
 	ov5695: ov5695@36 {
529
-		status = "okay";
585
+		status = "disabled";
530
586
 		compatible = "ovti,ov5695";
531
587
 		reg = <0x36>;
532
588
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -669,8 +725,6 @@
669
725
 		};
670
726
 	};
671
727
 };
672
-
673
-
674
728
 
675
729
 
676
730