add support mipi 1280x800_LCD

hc

2023-03-15 de7d2b82e1d37d435e0b93009a6a472b54b9d6a1

add support mipi 1280x800_LCD

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -238,7 +238,7 @@
238
238
  */
239
239
  
240
240
 &video_phy1 {
241
-	status = "disabled";
241
+	status = "okay";
242
242
 }; 
243
243
 &dsi1 {
244
244
 	status = "disabled";
..
..
@@ -249,12 +249,23 @@
249
249
 };
250
250
 
251
251
 &dsi1_in_vp1 {
252
-	status = "disabled";
252
+	status = "okay";
253
253
 };
254
254
 
255
255
 &dsi1_panel {
256
-	power-supply = <&vcc3v3_lcd1_n>;
256
+	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
257
+    vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
258
+    reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
259
+    vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
260
+    pinctrl-names = "default";
261
+    pinctrl-0 = <&lcd1_rst_gpio>;
257
262
 };
263
+
264
+&route_dsi1 {
265
+	status = "disabled";
266
+	connect = <&vp1_out_dsi1>;
267
+};
268
+
258
269
 
259
270
 /*
260
271
 *  edp_start
..
..
@@ -274,7 +285,8 @@
274
285
 };
275
286
 
276
287
 &edp_phy {
277
-    status = "okay";
288
+  status = "okay";
289
+
278
290
 };
279
291
 
280
292
 &edp_in_vp0 {
..
..
@@ -283,6 +295,7 @@
283
295
 
284
296
 &edp_in_vp1 {
285
297
     status = "okay";
298
+
286
299
 };
287
300
 
288
301
 &route_edp {
..
..
@@ -545,6 +558,13 @@
545
558
 			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
546
559
 		};
547
560
 	};
561
+	
562
+	lcd1 {
563
+        lcd1_rst_gpio: lcd1-rst-gpio {
564
+            rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
565
+        };
566
+    };
567
+		
548
568
 	nk_io_init{
549
569
 		nk_io_gpio: nk-io-gpio{
550
570
 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -591,10 +611,7 @@
591
611
 	};
592
612
 };
593
613
 
594
-&route_dsi0 {
595
-	status = "disabled";
596
-	connect = <&vp1_out_dsi0>;
597
-};
614
+
598
615
 
599
616
 
600
617
 
..
..
@@ -640,7 +657,7 @@
640
657
 };
641
658
 
642
659
 &vcc3v3_lcd1_n {
643
-	gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
660
+	gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; //MIPI_3V3EN_GPIO3_A3_d_3V3
644
661
 	enable-active-high;
645
662
 };
646
663
 
 kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
..
..
@@ -103,7 +103,7 @@
103
103
 
104
104
 	backlight1: backlight1 {
105
105
 		compatible = "pwm-backlight";
106
-		pwms = <&pwm5 0 25000 0>;
106
+		pwms = <&pwm6 0 25000 0>;
107
107
 		brightness-levels = <
108
108
 			  0  20  20  21  21  22  22  23
109
109
 			 23  24  24  25  25  26  26  27
..
..
@@ -740,303 +740,262 @@
740
740
 		status = "okay";
741
741
 		compatible = "simple-panel-dsi";
742
742
 		reg = <0>;
743
-		backlight = <&backlight1>;
744
-		reset-delay-ms = <60>;
745
-		enable-delay-ms = <60>;
746
-		prepare-delay-ms = <60>;
747
-		unprepare-delay-ms = <60>;
748
-		disable-delay-ms = <60>;
749
-		dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
750
-			MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>;
751
-		dsi,format = <MIPI_DSI_FMT_RGB888>;
752
-		dsi,lanes  = <4>;
753
-		panel-init-sequence = [
754
-			23 00 02 FE 21
755
-			23 00 02 04 00
756
-			23 00 02 00 64
757
-			23 00 02 2A 00
758
-			23 00 02 26 64
759
-			23 00 02 54 00
760
-			23 00 02 50 64
761
-			23 00 02 7B 00
762
-			23 00 02 77 64
763
-			23 00 02 A2 00
764
-			23 00 02 9D 64
765
-			23 00 02 C9 00
766
-			23 00 02 C5 64
767
-			23 00 02 01 71
768
-			23 00 02 27 71
769
-			23 00 02 51 71
770
-			23 00 02 78 71
771
-			23 00 02 9E 71
772
-			23 00 02 C6 71
773
-			23 00 02 02 89
774
-			23 00 02 28 89
775
-			23 00 02 52 89
776
-			23 00 02 79 89
777
-			23 00 02 9F 89
778
-			23 00 02 C7 89
779
-			23 00 02 03 9E
780
-			23 00 02 29 9E
781
-			23 00 02 53 9E
782
-			23 00 02 7A 9E
783
-			23 00 02 A0 9E
784
-			23 00 02 C8 9E
785
-			23 00 02 09 00
786
-			23 00 02 05 B0
787
-			23 00 02 31 00
788
-			23 00 02 2B B0
789
-			23 00 02 5A 00
790
-			23 00 02 55 B0
791
-			23 00 02 80 00
792
-			23 00 02 7C B0
793
-			23 00 02 A7 00
794
-			23 00 02 A3 B0
795
-			23 00 02 CE 00
796
-			23 00 02 CA B0
797
-			23 00 02 06 C0
798
-			23 00 02 2D C0
799
-			23 00 02 56 C0
800
-			23 00 02 7D C0
801
-			23 00 02 A4 C0
802
-			23 00 02 CB C0
803
-			23 00 02 07 CF
804
-			23 00 02 2F CF
805
-			23 00 02 58 CF
806
-			23 00 02 7E CF
807
-			23 00 02 A5 CF
808
-			23 00 02 CC CF
809
-			23 00 02 08 DD
810
-			23 00 02 30 DD
811
-			23 00 02 59 DD
812
-			23 00 02 7F DD
813
-			23 00 02 A6 DD
814
-			23 00 02 CD DD
815
-			23 00 02 0E 15
816
-			23 00 02 0A E9
817
-			23 00 02 36 15
818
-			23 00 02 32 E9
819
-			23 00 02 5F 15
820
-			23 00 02 5B E9
821
-			23 00 02 85 15
822
-			23 00 02 81 E9
823
-			23 00 02 AD 15
824
-			23 00 02 A9 E9
825
-			23 00 02 D3 15
826
-			23 00 02 CF E9
827
-			23 00 02 0B 14
828
-			23 00 02 33 14
829
-			23 00 02 5C 14
830
-			23 00 02 82 14
831
-			23 00 02 AA 14
832
-			23 00 02 D0 14
833
-			23 00 02 0C 36
834
-			23 00 02 34 36
835
-			23 00 02 5D 36
836
-			23 00 02 83 36
837
-			23 00 02 AB 36
838
-			23 00 02 D1 36
839
-			23 00 02 0D 6B
840
-			23 00 02 35 6B
841
-			23 00 02 5E 6B
842
-			23 00 02 84 6B
843
-			23 00 02 AC 6B
844
-			23 00 02 D2 6B
845
-			23 00 02 13 5A
846
-			23 00 02 0F 94
847
-			23 00 02 3B 5A
848
-			23 00 02 37 94
849
-			23 00 02 64 5A
850
-			23 00 02 60 94
851
-			23 00 02 8A 5A
852
-			23 00 02 86 94
853
-			23 00 02 B2 5A
854
-			23 00 02 AE 94
855
-			23 00 02 D8 5A
856
-			23 00 02 D4 94
857
-			23 00 02 10 D1
858
-			23 00 02 38 D1
859
-			23 00 02 61 D1
860
-			23 00 02 87 D1
861
-			23 00 02 AF D1
862
-			23 00 02 D5 D1
863
-			23 00 02 11 04
864
-			23 00 02 39 04
865
-			23 00 02 62 04
866
-			23 00 02 88 04
867
-			23 00 02 B0 04
868
-			23 00 02 D6 04
869
-			23 00 02 12 05
870
-			23 00 02 3A 05
871
-			23 00 02 63 05
872
-			23 00 02 89 05
873
-			23 00 02 B1 05
874
-			23 00 02 D7 05
875
-			23 00 02 18 AA
876
-			23 00 02 14 36
877
-			23 00 02 42 AA
878
-			23 00 02 3D 36
879
-			23 00 02 69 AA
880
-			23 00 02 65 36
881
-			23 00 02 8F AA
882
-			23 00 02 8B 36
883
-			23 00 02 B7 AA
884
-			23 00 02 B3 36
885
-			23 00 02 DD AA
886
-			23 00 02 D9 36
887
-			23 00 02 15 74
888
-			23 00 02 3F 74
889
-			23 00 02 66 74
890
-			23 00 02 8C 74
891
-			23 00 02 B4 74
892
-			23 00 02 DA 74
893
-			23 00 02 16 9F
894
-			23 00 02 40 9F
895
-			23 00 02 67 9F
896
-			23 00 02 8D 9F
897
-			23 00 02 B5 9F
898
-			23 00 02 DB 9F
899
-			23 00 02 17 DC
900
-			23 00 02 41 DC
901
-			23 00 02 68 DC
902
-			23 00 02 8E DC
903
-			23 00 02 B6 DC
904
-			23 00 02 DC DC
905
-			23 00 02 1D FF
906
-			23 00 02 19 03
907
-			23 00 02 47 FF
908
-			23 00 02 43 03
909
-			23 00 02 6E FF
910
-			23 00 02 6A 03
911
-			23 00 02 94 FF
912
-			23 00 02 90 03
913
-			23 00 02 BC FF
914
-			23 00 02 B8 03
915
-			23 00 02 E2 FF
916
-			23 00 02 DE 03
917
-			23 00 02 1A 35
918
-			23 00 02 44 35
919
-			23 00 02 6B 35
920
-			23 00 02 91 35
921
-			23 00 02 B9 35
922
-			23 00 02 DF 35
923
-			23 00 02 1B 45
924
-			23 00 02 45 45
925
-			23 00 02 6C 45
926
-			23 00 02 92 45
927
-			23 00 02 BA 45
928
-			23 00 02 E0 45
929
-			23 00 02 1C 55
930
-			23 00 02 46 55
931
-			23 00 02 6D 55
932
-			23 00 02 93 55
933
-			23 00 02 BB 55
934
-			23 00 02 E1 55
935
-			23 00 02 22 FF
936
-			23 00 02 1E 68
937
-			23 00 02 4C FF
938
-			23 00 02 48 68
939
-			23 00 02 73 FF
940
-			23 00 02 6F 68
941
-			23 00 02 99 FF
942
-			23 00 02 95 68
943
-			23 00 02 C1 FF
944
-			23 00 02 BD 68
945
-			23 00 02 E7 FF
946
-			23 00 02 E3 68
947
-			23 00 02 1F 7E
948
-			23 00 02 49 7E
949
-			23 00 02 70 7E
950
-			23 00 02 96 7E
951
-			23 00 02 BE 7E
952
-			23 00 02 E4 7E
953
-			23 00 02 20 97
954
-			23 00 02 4A 97
955
-			23 00 02 71 97
956
-			23 00 02 97 97
957
-			23 00 02 BF 97
958
-			23 00 02 E5 97
959
-			23 00 02 21 B5
960
-			23 00 02 4B B5
961
-			23 00 02 72 B5
962
-			23 00 02 98 B5
963
-			23 00 02 C0 B5
964
-			23 00 02 E6 B5
965
-			23 00 02 25 F0
966
-			23 00 02 23 E8
967
-			23 00 02 4F F0
968
-			23 00 02 4D E8
969
-			23 00 02 76 F0
970
-			23 00 02 74 E8
971
-			23 00 02 9C F0
972
-			23 00 02 9A E8
973
-			23 00 02 C4 F0
974
-			23 00 02 C2 E8
975
-			23 00 02 EA F0
976
-			23 00 02 E8 E8
977
-			23 00 02 24 FF
978
-			23 00 02 4E FF
979
-			23 00 02 75 FF
980
-			23 00 02 9B FF
981
-			23 00 02 C3 FF
982
-			23 00 02 E9 FF
983
-			23 00 02 FE 3D
984
-			23 00 02 00 04
985
-			23 00 02 FE 23
986
-			23 00 02 08 82
987
-			23 00 02 0A 00
988
-			23 00 02 0B 00
989
-			23 00 02 0C 01
990
-			23 00 02 16 00
991
-			23 00 02 18 02
992
-			23 00 02 1B 04
993
-			23 00 02 19 04
994
-			23 00 02 1C 81
995
-			23 00 02 1F 00
996
-			23 00 02 20 03
997
-			23 00 02 23 04
998
-			23 00 02 21 01
999
-			23 00 02 54 63
1000
-			23 00 02 55 54
1001
-			23 00 02 6E 45
1002
-			23 00 02 6D 36
1003
-			23 00 02 FE 3D
1004
-			23 00 02 55 78
1005
-			23 00 02 FE 20
1006
-			23 00 02 26 30
1007
-			23 00 02 FE 3D
1008
-			23 00 02 20 71
1009
-			23 00 02 50 8F
1010
-			23 00 02 51 8F
1011
-			23 00 02 FE 00
1012
-			23 00 02 35 00
1013
-			05 78 01 11
1014
-			05 1E 01 29
1015
-		];
743
+		power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
744
+		vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
745
+		reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
746
+		vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
747
+		reset-delay-ms = <200>;
748
+        enable-delay-ms = <60>;
749
+        init-delay-ms = <120>;
750
+        disable-delay-ms = <60>;
751
+        prepare-delay-ms = <120>;
752
+        unprepare-delay-ms = <120>;
753
+        backlight = <&backlight1>;
754
+        dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
755
+                MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>;
756
+        dsi,format = <MIPI_DSI_FMT_RGB888>;
757
+        dsi,lanes  = <4>;
1016
758
 
1017
-		panel-exit-sequence = [
1018
-			05 00 01 28
1019
-			05 00 01 10
1020
-		];
759
+        panel-init-sequence = [
760
+                15 00 02 E0 00
761
+                15 00 02 E1 93
762
+                15 00 02 E2 65
763
+                15 00 02 E3 F8
764
+                15 00 02 E0 01
765
+                15 00 02 00 01
766
+                15 00 02 01 36
767
+                15 00 02 03 01
768
+                15 00 02 04 36
769
+                15 00 02 12 A0
770
+                15 00 02 17 00
771
+                15 00 02 18 EF
772
+                15 00 02 19 00
773
+                15 00 02 1A 00
774
+                15 00 02 1B EF
775
+                15 00 02 1C 00
776
+                15 00 02 1F 6A
777
+                15 00 02 20 28
778
+                15 00 02 21 28
779
+                15 00 02 22 7E
780
+                15 00 02 26 DF
781
+                15 00 02 37 59
782
+                15 00 02 38 05
783
+			    15 00 02 39 02
784
+                15 00 02 3A 05
785
+                15 00 02 3C 78
786
+                15 00 02 3D FF
787
+                15 00 02 3E FF
788
+                15 00 02 3F FF
789
+                15 00 02 40 06
790
+                15 00 02 41 A0
791
+                15 00 02 43 14
792
+                15 00 02 44 0E
793
+                15 00 02 45 28
794
+                15 00 02 55 0F
795
+                15 00 02 56 01
796
+                15 00 02 57 69
797
+                15 00 02 58 0A
798
+                15 00 02 59 0A
799
+                15 00 02 5A 2B
800
+                15 00 02 5B 14
801
+                15 00 02 5D 7E
802
+                15 00 02 5E 50
803
+                15 00 02 5F 37
804
+                15 00 02 60 21
805
+                15 00 02 61 19
806
+                15 00 02 62 0B
807
+                15 00 02 63 0E
808
+                15 00 02 64 00
809
+                15 00 02 65 1A
810
+		        15 00 02 66 1B
811
+                15 00 02 67 1F
812
+                15 00 02 68 3D
813
+                15 00 02 69 31
814
+                15 00 02 6A 40
815
+                15 00 02 6B 33
816
+                15 00 02 6C 34
817
+                15 00 02 6D 26
818
+                15 00 02 6E 1B
819
+                15 00 02 6F 0F
820
+                15 00 02 70 74
821
+                15 00 02 71 59
822
+                15 00 02 72 43
823
+                15 00 02 73 36
824
+                15 00 02 74 30
825
+                15 00 02 75 1A
826
+                15 00 02 76 21
827
+                15 00 02 77 08
828
+                15 00 02 78 29
829
+                15 00 02 79 2E
830
+                15 00 02 7A 31
831
+                15 00 02 7B 54
832
+                15 00 02 7C 41
833
+                15 00 02 7D 4A
834
+                15 00 02 7E 44
835
+                15 00 02 7F 41
836
+                15 00 02 80 34
837
+                15 00 02 81 26
838
+                15 00 02 82 0F
839
+                15 00 02 E0 02
840
+                15 00 02 00 49
841
+                15 00 02 01 48
842
+                15 00 02 02 47
843
+                15 00 02 03 46
844
+                15 00 02 04 45
845
+                15 00 02 05 44
846
+                15 00 02 06 4A
847
+                15 00 02 07 4B
848
+                15 00 02 08 50
849
+                15 00 02 09 1F
850
+                15 00 02 0A 1F
851
+                15 00 02 0B 1F
852
+                15 00 02 0C 1F
853
+                15 00 02 0D 1F
854
+                15 00 02 0E 1F
855
+                15 00 02 0F 51
856
+                15 00 02 10 52
857
+		        15 00 02 11 53
858
+                15 00 02 12 40
859
+                15 00 02 13 41
860
+                15 00 02 14 42
861
+                15 00 02 15 43
862
+                15 00 02 16 49
863
+                15 00 02 17 48
864
+                15 00 02 18 47
865
+                15 00 02 19 46
866
+                15 00 02 1A 45
867
+                15 00 02 1B 44
868
+                15 00 02 1C 4A
869
+                15 00 02 1D 4B
870
+                15 00 02 1E 50
871
+                15 00 02 1F 1F
872
+                15 00 02 20 1F
873
+                15 00 02 21 1F
874
+                15 00 02 22 1F
875
+                15 00 02 23 1F
876
+                15 00 02 24 1F
877
+                15 00 02 25 51
878
+                15 00 02 26 52
879
+                15 00 02 27 53
880
+                15 00 02 28 40
881
+                15 00 02 29 41
882
+                15 00 02 2A 42
883
+                15 00 02 2B 43
884
+                15 00 02 2C 0A
885
+                15 00 02 2D 0B
886
+                15 00 02 2E 04
887
+                15 00 02 2F 05
888
+                15 00 02 30 06
889
+                15 00 02 31 07
890
+                15 00 02 32 09
891
+                15 00 02 33 08
892
+                15 00 02 34 03
893
+                15 00 02 35 1F
894
+                15 00 02 36 1F
895
+                15 00 02 37 1F
896
+                15 00 02 38 1F
897
+                15 00 02 39 1F
898
+                15 00 02 3A 1F
899
+                15 00 02 3B 02
900
+                15 00 02 3C 01
901
+                15 00 02 3D 00
902
+                15 00 02 3E 13
903
+                15 00 02 3F 12
904
+                15 00 02 40 11
905
+		        15 00 02 41 10
906
+                15 00 02 42 0A
907
+                15 00 02 43 0B
908
+                15 00 02 44 04
909
+                15 00 02 45 05
910
+                15 00 02 46 06
911
+                15 00 02 47 07
912
+                15 00 02 48 09
913
+                15 00 02 49 08
914
+                15 00 02 4A 03
915
+                15 00 02 4B 1F
916
+                15 00 02 4C 1F
917
+                15 00 02 4D 1F
918
+                15 00 02 4E 1F
919
+                15 00 02 4F 1F
920
+                15 00 02 50 1F
921
+                15 00 02 51 02
922
+                15 00 02 52 01
923
+                15 00 02 53 00
924
+                15 00 02 54 13
925
+                15 00 02 55 12
926
+                15 00 02 56 11
927
+                15 00 02 57 10
928
+                15 00 02 58 40
929
+                15 00 02 59 00
930
+                15 00 02 5A 00
931
+                15 00 02 5B 30
932
+                15 00 02 5C 07
933
+                15 00 02 5D 40
934
+                15 00 02 5E 01
935
+                15 00 02 5F 02
936
+                15 00 02 60 40
937
+                15 00 02 61 01
938
+                15 00 02 62 02
939
+                15 00 02 63 70
940
+                15 00 02 64 6B
941
+                15 00 02 65 75
942
+                15 00 02 66 0B
943
+                15 00 02 67 74
944
+                15 00 02 68 01
945
+                15 00 02 69 64
946
+                15 00 02 6A 65
947
+                15 00 02 6B 00
948
+                15 00 02 6C 00
949
+                15 00 02 6D 04
950
+                15 00 02 6E 04
951
+                15 00 02 6F 89
952
+                15 00 02 70 00
953
+		       15 00 02 71 00
954
+                15 00 02 72 06
955
+                15 00 02 73 7B
956
+                15 00 02 74 00
957
+                15 00 02 75 3C
958
+                15 00 02 76 00
959
+                15 00 02 77 0D
960
+                15 00 02 78 2C
961
+                15 00 02 79 00
962
+                15 00 02 7A 00
963
+                15 00 02 7B 00
964
+                15 00 02 7C 00
965
+                15 00 02 7D 03
966
+                15 00 02 7E 7B
967
+                15 00 02 E0 04
968
+                15 00 02 09 14
969
+                15 00 02 E0 00
970
+                15 00 02 E6 02
971
+                15 00 02 E7 0C
972
+                15 78 02 11 00
973
+                15 05 02 29 00
974
+        ];
1021
975
 
1022
-		disp_timings1: display-timings {
1023
-			native-mode = <&dsi1_timing0>;
1024
-			dsi1_timing0: timing0 {
1025
-				clock-frequency = <132000000>;
1026
-				hactive = <1080>;
1027
-				vactive = <1920>;
1028
-				hfront-porch = <15>;
1029
-				hsync-len = <2>;
1030
-				hback-porch = <30>;
1031
-				vfront-porch = <15>;
1032
-				vsync-len = <2>;
1033
-				vback-porch = <15>;
1034
-				hsync-active = <0>;
1035
-				vsync-active = <0>;
1036
-				de-active = <0>;
1037
-				pixelclk-active = <1>;
1038
-			};
1039
-		};
976
+        panel-exit-sequence = [
977
+                05 00 01 28
978
+                05 00 01 10
979
+        ];
980
+
981
+         disp_timings1: display-timings {
982
+                                        native-mode = <&dsi1_timing0>;
983
+                                        dsi1_timing0: timing0 {
984
+                                        clock-frequency = <69000000>;
985
+                                        hactive = <800>;
986
+                                        vactive = <1280>;
987
+                                        hfront-porch = <32>;
988
+                                        hsync-len = <20>;
989
+                                        hback-porch = <20>;
990
+                                        vfront-porch = <16>;
991
+                                        vsync-len = <5>;
992
+                                        vback-porch = <12>;
993
+                                        hsync-active = <0>;
994
+                                        vsync-active = <0>;
995
+                                        de-active = <0>;
996
+                                        pixelclk-active = <1>;
997
+                                };
998
+                        };
1040
999
 
1041
1000
 		ports {
1042
1001
 			#address-cells = <1>;
..
..
@@ -1531,6 +1490,10 @@
1531
1490
 	status = "okay";
1532
1491
 };
1533
1492
 
1493
+&pwm6 {
1494
+	status = "okay";
1495
+};
1496
+
1534
1497
 &pwm5 {
1535
1498
 	status = "okay";
1536
1499
 };
 kernel/arch/arm64/boot/dts/rockchip/rk3568.dtsi
..
..
@@ -22,6 +22,7 @@
22
22
 	#address-cells = <2>;
23
23
 	#size-cells = <2>;
24
24
 
25
+
25
26
 	aliases {
26
27
 		csi2dphy0 = &csi2_dphy0;
27
28
 		csi2dphy1 = &csi2_dphy1;
..
..
@@ -253,10 +254,10 @@
253
254
 				logo,kernel = "logo_kernel.bmp";
254
255
 				logo,mode = "center";
255
256
 				charge_logo,mode = "center";
256
-				connect = <&vp0_out_dsi1>;
257
+				connect = <&vp1_out_dsi1>;
257
258
 			};
258
259
 			route_edp: route-edp {
259
-				status = "okay";
260
+				status = "disabled";
260
261
 				logo,uboot = "logo.bmp";
261
262
 				logo,kernel = "logo_kernel.bmp";
262
263
 				logo,mode = "center";
..
..
@@ -264,7 +265,7 @@
264
265
 				connect = <&vp1_out_edp>;
265
266
 			};
266
267
 			route_hdmi: route-hdmi {
267
-				status = "okay";
268
+				status = "disabled";
268
269
 				logo,uboot = "logo.bmp";
269
270
 				logo,kernel = "logo_kernel.bmp";
270
271
 				logo,mode = "center";
 u-boot/arch/arm/mach-rockchip/kernel_dtb.c
..
..
@@ -287,7 +287,7 @@
287
287
 	printf("Can't increase blob size: %s\n", fdt_strerror(ret));
288
288
 	return ret;
289
289
 }
290
-
290
+#if 0
291
291
 static int fdt_fixup_panel_init_sequence(void *fdt, int node,const struct display_fixup_data *data)
292
292
 {
293
293
    #if 0
..
..
@@ -345,6 +345,7 @@
345
345
 	printf("Can't increase blob size: %s\n", fdt_strerror(ret));
346
346
 	return ret;
347
347
 }
348
+#endif
348
349
 
349
350
 static int fdt_fixup_setprop_u32(void *fdt, int node, const char *name, u32 data)
350
351
 {
..
..
@@ -391,12 +392,14 @@
391
392
 static void fdt_fixup_panel_node(void *blob, int node, const char *name,
392
393
 				 const struct display_fixup_data *data)
393
394
 {
395
+/*
394
396
 	if (!strcmp(name, "dsi")) {
395
397
 		fdt_setprop_u32(blob, node, "dsi,flags", data->flags);
396
398
 		fdt_setprop_u32(blob, node, "dsi,format", data->format);
397
399
 		fdt_setprop_u32(blob, node, "dsi,lanes", data->lanes);
398
400
 		fdt_fixup_panel_init_sequence(blob, node,data);
399
401
 	}
402
+*/
400
403
 	fdt_fixup_setprop_u32(blob, node, "prepare-delay-ms", data->delay_prepare);
401
404
 	fdt_fixup_setprop_u32(blob, node, "enable-delay-ms", data->delay_enable);
402
405
 	fdt_fixup_setprop_u32(blob, node, "disable-delay-ms", data->delay_disable);
..
..
@@ -488,16 +491,16 @@
488
491
 static void fdt_fixup_display_route(void *blob, const struct display_fixup_data *data)
489
492
 {
490
493
 	if (data->type == PANEL_TYPE_DSI) {
491
-		fdt_fixup_display_sub_route(blob, "dsi", FDT_STATUS_OKAY, data);
494
+		fdt_fixup_display_sub_route(blob, "dsi1", FDT_STATUS_OKAY, data);
492
495
 		fdt_fixup_display_sub_route(blob, "edp", FDT_STATUS_DISABLED, data);
493
496
 		fdt_fixup_display_sub_route(blob, "lvds", FDT_STATUS_DISABLED, data);
494
497
 	} else if (data->type == PANEL_TYPE_EDP) {
495
-		fdt_fixup_display_sub_route(blob, "dsi", FDT_STATUS_DISABLED, data);
498
+		fdt_fixup_display_sub_route(blob, "dsi1", FDT_STATUS_DISABLED, data);
496
499
 		fdt_fixup_display_sub_route(blob, "edp", FDT_STATUS_OKAY, data);
497
500
 		fdt_fixup_display_sub_route(blob, "lvds", FDT_STATUS_DISABLED, data);
498
501
 	} else if (data->type == PANEL_TYPE_LVDS) {
499
502
 		fdt_fixup_display_sub_route(blob, "lvds", FDT_STATUS_OKAY, data);
500
-	  fdt_fixup_display_sub_route(blob, "dsi", FDT_STATUS_DISABLED, data);
503
+	  	fdt_fixup_display_sub_route(blob, "dsi1", FDT_STATUS_DISABLED, data);
501
504
 		fdt_fixup_display_sub_route(blob, "edp", FDT_STATUS_DISABLED, data);
502
505
 	}
503
506
 }
 u-boot/drivers/video/drm/rockchip_panel.c
..
..
@@ -69,6 +69,8 @@
69
69
 	struct gpio_desc reset_gpio;
70
70
 	struct gpio_desc edp_bl_on;
71
71
 	struct gpio_desc edp_bl_en;
72
+	struct gpio_desc vcc_5v;
73
+	struct gpio_desc vddio_mipi;
72
74
 
73
75
 	struct gpio_desc lvds_gpio0;
74
76
 	struct gpio_desc lvds_gpio1;
..
..
@@ -283,6 +285,19 @@
283
285
 
284
286
 	if (priv->prepared)
285
287
 		return;
288
+	/*mipi */
289
+	if (dm_gpio_is_valid(&priv->vddio_mipi))
290
+               dm_gpio_set_value(&priv->vddio_mipi, 1);
291
+        mdelay(20);
292
+
293
+        if (dm_gpio_is_valid(&priv->vcc_5v))
294
+                dm_gpio_set_value(&priv->vcc_5v, 1);
295
+
296
+        ret = dm_gpio_get_value(&priv->vcc_5v);
297
+                printf("troy test get vcc_5v : %d \n",ret);
298
+        ret = dm_gpio_get_value(&priv->vddio_mipi);
299
+                printf("troy test get vddio-mipi : %d \n",ret);
300
+        /*mipi end*/
286
301
 	
287
302
 	/*7511 LVDS IO Control start*/
288
303
 	printk("nodka_lvds_index = %d\n",plat->lvds_index);
..
..
@@ -500,6 +515,20 @@
500
515
 	int ret;
501
516
 	const char *cmd_type;
502
517
 
518
+	ret = gpio_request_by_name(dev, "vcc-5v-gpio", 0,
519
+                                   &priv->vcc_5v, GPIOD_IS_OUT);
520
+        if (ret && ret != -ENOENT) {
521
+                printf("%s: Cannot get vcc-5v-gpio: %d\n", __func__, ret);
522
+                return ret;
523
+        }
524
+
525
+        ret = gpio_request_by_name(dev, "vddio-mipi", 0,
526
+                                   &priv->vddio_mipi, GPIOD_IS_OUT);
527
+        if (ret && ret != -ENOENT) {
528
+                printf("%s: Cannot get vddio-mipi: %d\n", __func__, ret);
529
+                return ret;
530
+	}
531
+
503
532
 	ret = gpio_request_by_name(dev, "edp-bl-gpios", 0,
504
533
 				   &priv->edp_bl_on, GPIOD_IS_OUT);
505
534
 	if (ret && ret != -ENOENT) {