add lvds1024*800

hc

2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -89,10 +89,108 @@
89
89
 		regulator-boot-on;
90
90
     	};
91
91
 #endif
92
-
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_LOW>;//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
+#if 0			
93
191
 	    nk_io_init {
94
192
                 compatible = "nk_io_control";
95
-				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
193
+//				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
96
194
                 hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
97
195
                 hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
98
196
                 vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
..
..
@@ -108,7 +206,7 @@
108
206
 				pinctrl-names = "default";
109
207
 				pinctrl-0 = <&nk_io_gpio>;				
110
208
         };
111
-		
209
+#endif	
112
210
 		panel: panel {
113
211
 				compatible = "simple-panel";
114
212
 				backlight = <&backlight>;
..
..
@@ -128,8 +226,8 @@
128
226
 				nodka-lvds = <15>;
129
227
 
130
228
 				display-timings {
131
-                native-mode = <&timing0>;
132
-                timing0: timing0 {
229
+                native-mode = <&timing>;
230
+                timing: timing {
133
231
 					clock-frequency = <72500000>;
134
232
 					hactive = <1280>;
135
233
 					vactive = <800>;
..
..
@@ -146,8 +244,8 @@
146
244
 					};
147
245
 				};
148
246
 				ports {
149
-					panel_in: endpoint {
150
-					remote-endpoint = <&edp_out>;
247
+					panel_in_lvds: endpoint {
248
+					remote-endpoint = <&lvds_out>;
151
249
 						};
152
250
 					};   
153
251
 				};
..
..
@@ -214,7 +312,7 @@
214
312
  * when dsi0 is enabled
215
313
  */
216
314
 &video_phy0 {
217
-	status = "disabled";
315
+	status = "okay";
218
316
 };
219
317
 
220
318
 &dsi0 {
..
..
@@ -239,7 +337,7 @@
239
337
  */
240
338
  
241
339
 &video_phy1 {
242
-	status = "okay";
340
+	status = "disabled";
243
341
 }; 
244
342
 &dsi1 {
245
343
 	status = "disabled";
..
..
@@ -250,11 +348,11 @@
250
348
 };
251
349
 
252
350
 &dsi1_in_vp1 {
253
-	status = "okay";
351
+	status = "disabled";
254
352
 };
255
353
 
256
354
 &dsi1_panel {
257
-	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
355
+//	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
258
356
     vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
259
357
     reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
260
358
     vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
..
..
@@ -274,20 +372,11 @@
274
372
 
275
373
 &edp {
276
374
     force-hpd;
277
-    status = "okay";
278
-    ports {
279
-        port@1 {
280
-            reg = <1>;
281
-            edp_out: endpoint {
282
-                remote-endpoint = <&panel_in>;
283
-            };
284
-        };
285
-    };
375
+	status = "disabled";
286
376
 };
287
377
 
288
378
 &edp_phy {
289
-  status = "okay";
290
-
379
+	status = "disabled";
291
380
 };
292
381
 
293
382
 &edp_in_vp0 {
..
..
@@ -295,18 +384,40 @@
295
384
 };
296
385
 
297
386
 &edp_in_vp1 {
298
-    status = "okay";
387
+    status = "disabled";
299
388
 
300
389
 };
301
390
 
302
391
 &route_edp {
303
-    status = "okay";
392
+    status = "disabled";
304
393
     connect = <&vp1_out_edp>;
305
394
 };
306
395
 
307
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 {
308
418
 	status = "okay";
309
419
 };
420
+
310
421
 /*
311
422
 *  edp_end
312
423
 */
..
..
@@ -351,7 +462,7 @@
351
462
 	phy-mode = "rgmii";
352
463
 	clock_in_out = "output";
353
464
 
354
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
465
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
355
466
 	snps,reset-active-low;
356
467
 	/* Reset time is 20ms, 100ms for rtl8211f */
357
468
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -371,7 +482,9 @@
371
482
 	rx_delay = <0x2f>;
372
483
 
373
484
 	phy-handle = <&rgmii_phy0>;
485
+	
374
486
 	status = "disabled";
487
+	
375
488
 };
376
489
 
377
490
 &gmac1 {
..
..
@@ -405,9 +518,7 @@
405
518
  * power-supply should switche to vcc3v3_lcd1_n
406
519
  * when mipi panel is connected to dsi1.
407
520
  */
408
-&gt1x {
409
-	power-supply = <&vcc3v3_lcd0_n>;
410
-};
521
+
411
522
 
412
523
 &i2c3 {
413
524
 	status = "okay";
..
..
@@ -426,7 +537,7 @@
426
537
 };
427
538
 
428
539
 &i2c4 {
429
-	status = "okay";
540
+	status = "disabled";
430
541
 	gc8034: gc8034@37 {
431
542
 		compatible = "galaxycore,gc8034";
432
543
 		status = "okay";
..
..
@@ -438,7 +549,6 @@
438
549
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
439
550
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
440
551
 		rockchip,grf = <&grf>;
441
-		power-domains = <&power RK3568_PD_VI>;
442
552
 		rockchip,camera-module-index = <0>;
443
553
 		rockchip,camera-module-facing = "back";
444
554
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -472,7 +582,7 @@
472
582
 		};
473
583
 	};
474
584
 	ov5695: ov5695@36 {
475
-		status = "okay";
585
+		status = "disabled";
476
586
 		compatible = "ovti,ov5695";
477
587
 		reg = <0x36>;
478
588
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -615,8 +725,6 @@
615
725
 		};
616
726
 	};
617
727
 };
618
-
619
-
620
728
 
621
729
 
622
730