hc
2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920
kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
....@@ -226,8 +226,8 @@
226226 nodka-lvds = <15>;
227227
228228 display-timings {
229
- native-mode = <&timing0>;
230
- timing0: timing0 {
229
+ native-mode = <&timing>;
230
+ timing: timing {
231231 clock-frequency = <72500000>;
232232 hactive = <1280>;
233233 vactive = <800>;
....@@ -244,8 +244,8 @@
244244 };
245245 };
246246 ports {
247
- panel_in: endpoint {
248
- remote-endpoint = <&edp_out>;
247
+ panel_in_lvds: endpoint {
248
+ remote-endpoint = <&lvds_out>;
249249 };
250250 };
251251 };
....@@ -312,7 +312,7 @@
312312 * when dsi0 is enabled
313313 */
314314 &video_phy0 {
315
- status = "disabled";
315
+ status = "okay";
316316 };
317317
318318 &dsi0 {
....@@ -337,7 +337,7 @@
337337 */
338338
339339 &video_phy1 {
340
- status = "okay";
340
+ status = "disabled";
341341 };
342342 &dsi1 {
343343 status = "disabled";
....@@ -348,11 +348,11 @@
348348 };
349349
350350 &dsi1_in_vp1 {
351
- status = "okay";
351
+ status = "disabled";
352352 };
353353
354354 &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
356356 vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
357357 reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
358358 vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
....@@ -372,20 +372,11 @@
372372
373373 &edp {
374374 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
-
384
- };
375
+ status = "disabled";
385376 };
386377
387378 &edp_phy {
388
- status = "okay";
379
+ status = "disabled";
389380 };
390381
391382 &edp_in_vp0 {
....@@ -393,18 +384,40 @@
393384 };
394385
395386 &edp_in_vp1 {
396
- status = "okay";
387
+ status = "disabled";
397388
398389 };
399390
400391 &route_edp {
401
- status = "okay";
392
+ status = "disabled";
402393 connect = <&vp1_out_edp>;
403394 };
404395
405396 &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 {
406418 status = "okay";
407419 };
420
+
408421 /*
409422 * edp_end
410423 */