rk3568 rt init

hc

2023-11-06 e3e12f52b214121840b44c91de5b3e5af5d3eb84

 kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
old mode 100755new mode 100644
..
..
@@ -103,7 +103,7 @@
103
103
 
104
104
 	backlight1: backlight1 {
105
105
 		compatible = "pwm-backlight";
106
-		pwms = <&pwm6 0 25000 0>;
106
+		pwms = <&pwm5 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
..
..
@@ -141,6 +141,27 @@
141
141
 		default-brightness-level = <200>;
142
142
 	};
143
143
 
144
+	bt_sco: bt-sco {
145
+		status = "disabled";
146
+		compatible = "delta,dfbmcs320";
147
+		#sound-dai-cells = <1>;
148
+	};
149
+
150
+	bt_sound: bt-sound {
151
+		status = "disabled";
152
+		compatible = "simple-audio-card";
153
+		simple-audio-card,format = "dsp_a";
154
+		simple-audio-card,bitclock-inversion = <0>;
155
+		simple-audio-card,mclk-fs = <256>;
156
+		simple-audio-card,name = "rockchip,bt";
157
+		simple-audio-card,cpu {
158
+			sound-dai = <&i2s3_2ch>;
159
+		};
160
+		simple-audio-card,codec {
161
+			sound-dai = <&bt_sco 1>;
162
+		};
163
+	};
164
+
144
165
 	dc_12v: dc-12v {
145
166
 		compatible = "regulator-fixed";
146
167
 		regulator-name = "dc_12v";
..
..
@@ -161,8 +182,8 @@
161
182
 
162
183
 	leds: leds {
163
184
 		compatible = "gpio-leds";
164
-		sys_led: sys_led {
165
-			gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;
185
+		work_led: work {
186
+			gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
166
187
 			linux,default-trigger = "heartbeat";
167
188
 		};
168
189
 	};
..
..
@@ -187,17 +208,15 @@
187
208
 
188
209
 	rk809_sound: rk809-sound {
189
210
 		status = "okay";
190
-		compatible = "simple-audio-card";
191
-		simple-audio-card,format = "i2s";
192
-		simple-audio-card,name = "rockchip,rk809-codec";
193
-		simple-audio-card,mclk-fs = <256>;
194
-
195
-		simple-audio-card,cpu {
196
-			sound-dai = <&i2s1_8ch>;
197
-		};
198
-		simple-audio-card,codec {
199
-			sound-dai = <&rk809_codec>;
200
-		};
211
+		compatible = "rockchip,multicodecs-card";
212
+		rockchip,card-name = "rockchip-rk809";
213
+		hp-det-gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>;
214
+		rockchip,format = "i2s";
215
+		rockchip,mclk-fs = <256>;
216
+		rockchip,cpu = <&i2s1_8ch>;
217
+		rockchip,codec = <&rk809_codec>;
218
+		pinctrl-names = "default";
219
+		pinctrl-0 = <&hp_det>;
201
220
 	};
202
221
 
203
222
 	spdif-sound {
..
..
@@ -273,8 +292,6 @@
273
292
 	vcc5v0_otg: vcc5v0-otg-regulator {
274
293
 		compatible = "regulator-fixed";
275
294
 		regulator-name = "vcc5v0_otg";
276
-		egulator-boot-on;
277
-		regulator-always-on;
278
295
 		regulator-min-microvolt = <5000000>;
279
296
 		regulator-max-microvolt = <5000000>;
280
297
 		enable-active-high;
..
..
@@ -291,7 +308,7 @@
291
308
 		regulator-min-microvolt = <3300000>;
292
309
 		regulator-max-microvolt = <3300000>;
293
310
 		enable-active-high;
294
-		gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;  //VCC3_IO_EN_GPIO0_C4_3V3
311
+		gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
295
312
 		vin-supply = <&vcc3v3_sys>;
296
313
 
297
314
 		regulator-state-mem {
..
..
@@ -328,7 +345,7 @@
328
345
 		 * - PDN (power down when low)
329
346
 		 */
330
347
 		post-power-on-delay-ms = <200>;
331
-		reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
348
+		reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
332
349
 	};
333
350
 
334
351
 	wireless_wlan: wireless-wlan {
..
..
@@ -740,262 +757,303 @@
740
757
 		status = "okay";
741
758
 		compatible = "simple-panel-dsi";
742
759
 		reg = <0>;
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>;
760
+		backlight = <&backlight1>;
761
+		reset-delay-ms = <60>;
762
+		enable-delay-ms = <60>;
763
+		prepare-delay-ms = <60>;
764
+		unprepare-delay-ms = <60>;
765
+		disable-delay-ms = <60>;
766
+		dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
767
+			MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>;
768
+		dsi,format = <MIPI_DSI_FMT_RGB888>;
769
+		dsi,lanes  = <4>;
770
+		panel-init-sequence = [
771
+			23 00 02 FE 21
772
+			23 00 02 04 00
773
+			23 00 02 00 64
774
+			23 00 02 2A 00
775
+			23 00 02 26 64
776
+			23 00 02 54 00
777
+			23 00 02 50 64
778
+			23 00 02 7B 00
779
+			23 00 02 77 64
780
+			23 00 02 A2 00
781
+			23 00 02 9D 64
782
+			23 00 02 C9 00
783
+			23 00 02 C5 64
784
+			23 00 02 01 71
785
+			23 00 02 27 71
786
+			23 00 02 51 71
787
+			23 00 02 78 71
788
+			23 00 02 9E 71
789
+			23 00 02 C6 71
790
+			23 00 02 02 89
791
+			23 00 02 28 89
792
+			23 00 02 52 89
793
+			23 00 02 79 89
794
+			23 00 02 9F 89
795
+			23 00 02 C7 89
796
+			23 00 02 03 9E
797
+			23 00 02 29 9E
798
+			23 00 02 53 9E
799
+			23 00 02 7A 9E
800
+			23 00 02 A0 9E
801
+			23 00 02 C8 9E
802
+			23 00 02 09 00
803
+			23 00 02 05 B0
804
+			23 00 02 31 00
805
+			23 00 02 2B B0
806
+			23 00 02 5A 00
807
+			23 00 02 55 B0
808
+			23 00 02 80 00
809
+			23 00 02 7C B0
810
+			23 00 02 A7 00
811
+			23 00 02 A3 B0
812
+			23 00 02 CE 00
813
+			23 00 02 CA B0
814
+			23 00 02 06 C0
815
+			23 00 02 2D C0
816
+			23 00 02 56 C0
817
+			23 00 02 7D C0
818
+			23 00 02 A4 C0
819
+			23 00 02 CB C0
820
+			23 00 02 07 CF
821
+			23 00 02 2F CF
822
+			23 00 02 58 CF
823
+			23 00 02 7E CF
824
+			23 00 02 A5 CF
825
+			23 00 02 CC CF
826
+			23 00 02 08 DD
827
+			23 00 02 30 DD
828
+			23 00 02 59 DD
829
+			23 00 02 7F DD
830
+			23 00 02 A6 DD
831
+			23 00 02 CD DD
832
+			23 00 02 0E 15
833
+			23 00 02 0A E9
834
+			23 00 02 36 15
835
+			23 00 02 32 E9
836
+			23 00 02 5F 15
837
+			23 00 02 5B E9
838
+			23 00 02 85 15
839
+			23 00 02 81 E9
840
+			23 00 02 AD 15
841
+			23 00 02 A9 E9
842
+			23 00 02 D3 15
843
+			23 00 02 CF E9
844
+			23 00 02 0B 14
845
+			23 00 02 33 14
846
+			23 00 02 5C 14
847
+			23 00 02 82 14
848
+			23 00 02 AA 14
849
+			23 00 02 D0 14
850
+			23 00 02 0C 36
851
+			23 00 02 34 36
852
+			23 00 02 5D 36
853
+			23 00 02 83 36
854
+			23 00 02 AB 36
855
+			23 00 02 D1 36
856
+			23 00 02 0D 6B
857
+			23 00 02 35 6B
858
+			23 00 02 5E 6B
859
+			23 00 02 84 6B
860
+			23 00 02 AC 6B
861
+			23 00 02 D2 6B
862
+			23 00 02 13 5A
863
+			23 00 02 0F 94
864
+			23 00 02 3B 5A
865
+			23 00 02 37 94
866
+			23 00 02 64 5A
867
+			23 00 02 60 94
868
+			23 00 02 8A 5A
869
+			23 00 02 86 94
870
+			23 00 02 B2 5A
871
+			23 00 02 AE 94
872
+			23 00 02 D8 5A
873
+			23 00 02 D4 94
874
+			23 00 02 10 D1
875
+			23 00 02 38 D1
876
+			23 00 02 61 D1
877
+			23 00 02 87 D1
878
+			23 00 02 AF D1
879
+			23 00 02 D5 D1
880
+			23 00 02 11 04
881
+			23 00 02 39 04
882
+			23 00 02 62 04
883
+			23 00 02 88 04
884
+			23 00 02 B0 04
885
+			23 00 02 D6 04
886
+			23 00 02 12 05
887
+			23 00 02 3A 05
888
+			23 00 02 63 05
889
+			23 00 02 89 05
890
+			23 00 02 B1 05
891
+			23 00 02 D7 05
892
+			23 00 02 18 AA
893
+			23 00 02 14 36
894
+			23 00 02 42 AA
895
+			23 00 02 3D 36
896
+			23 00 02 69 AA
897
+			23 00 02 65 36
898
+			23 00 02 8F AA
899
+			23 00 02 8B 36
900
+			23 00 02 B7 AA
901
+			23 00 02 B3 36
902
+			23 00 02 DD AA
903
+			23 00 02 D9 36
904
+			23 00 02 15 74
905
+			23 00 02 3F 74
906
+			23 00 02 66 74
907
+			23 00 02 8C 74
908
+			23 00 02 B4 74
909
+			23 00 02 DA 74
910
+			23 00 02 16 9F
911
+			23 00 02 40 9F
912
+			23 00 02 67 9F
913
+			23 00 02 8D 9F
914
+			23 00 02 B5 9F
915
+			23 00 02 DB 9F
916
+			23 00 02 17 DC
917
+			23 00 02 41 DC
918
+			23 00 02 68 DC
919
+			23 00 02 8E DC
920
+			23 00 02 B6 DC
921
+			23 00 02 DC DC
922
+			23 00 02 1D FF
923
+			23 00 02 19 03
924
+			23 00 02 47 FF
925
+			23 00 02 43 03
926
+			23 00 02 6E FF
927
+			23 00 02 6A 03
928
+			23 00 02 94 FF
929
+			23 00 02 90 03
930
+			23 00 02 BC FF
931
+			23 00 02 B8 03
932
+			23 00 02 E2 FF
933
+			23 00 02 DE 03
934
+			23 00 02 1A 35
935
+			23 00 02 44 35
936
+			23 00 02 6B 35
937
+			23 00 02 91 35
938
+			23 00 02 B9 35
939
+			23 00 02 DF 35
940
+			23 00 02 1B 45
941
+			23 00 02 45 45
942
+			23 00 02 6C 45
943
+			23 00 02 92 45
944
+			23 00 02 BA 45
945
+			23 00 02 E0 45
946
+			23 00 02 1C 55
947
+			23 00 02 46 55
948
+			23 00 02 6D 55
949
+			23 00 02 93 55
950
+			23 00 02 BB 55
951
+			23 00 02 E1 55
952
+			23 00 02 22 FF
953
+			23 00 02 1E 68
954
+			23 00 02 4C FF
955
+			23 00 02 48 68
956
+			23 00 02 73 FF
957
+			23 00 02 6F 68
958
+			23 00 02 99 FF
959
+			23 00 02 95 68
960
+			23 00 02 C1 FF
961
+			23 00 02 BD 68
962
+			23 00 02 E7 FF
963
+			23 00 02 E3 68
964
+			23 00 02 1F 7E
965
+			23 00 02 49 7E
966
+			23 00 02 70 7E
967
+			23 00 02 96 7E
968
+			23 00 02 BE 7E
969
+			23 00 02 E4 7E
970
+			23 00 02 20 97
971
+			23 00 02 4A 97
972
+			23 00 02 71 97
973
+			23 00 02 97 97
974
+			23 00 02 BF 97
975
+			23 00 02 E5 97
976
+			23 00 02 21 B5
977
+			23 00 02 4B B5
978
+			23 00 02 72 B5
979
+			23 00 02 98 B5
980
+			23 00 02 C0 B5
981
+			23 00 02 E6 B5
982
+			23 00 02 25 F0
983
+			23 00 02 23 E8
984
+			23 00 02 4F F0
985
+			23 00 02 4D E8
986
+			23 00 02 76 F0
987
+			23 00 02 74 E8
988
+			23 00 02 9C F0
989
+			23 00 02 9A E8
990
+			23 00 02 C4 F0
991
+			23 00 02 C2 E8
992
+			23 00 02 EA F0
993
+			23 00 02 E8 E8
994
+			23 00 02 24 FF
995
+			23 00 02 4E FF
996
+			23 00 02 75 FF
997
+			23 00 02 9B FF
998
+			23 00 02 C3 FF
999
+			23 00 02 E9 FF
1000
+			23 00 02 FE 3D
1001
+			23 00 02 00 04
1002
+			23 00 02 FE 23
1003
+			23 00 02 08 82
1004
+			23 00 02 0A 00
1005
+			23 00 02 0B 00
1006
+			23 00 02 0C 01
1007
+			23 00 02 16 00
1008
+			23 00 02 18 02
1009
+			23 00 02 1B 04
1010
+			23 00 02 19 04
1011
+			23 00 02 1C 81
1012
+			23 00 02 1F 00
1013
+			23 00 02 20 03
1014
+			23 00 02 23 04
1015
+			23 00 02 21 01
1016
+			23 00 02 54 63
1017
+			23 00 02 55 54
1018
+			23 00 02 6E 45
1019
+			23 00 02 6D 36
1020
+			23 00 02 FE 3D
1021
+			23 00 02 55 78
1022
+			23 00 02 FE 20
1023
+			23 00 02 26 30
1024
+			23 00 02 FE 3D
1025
+			23 00 02 20 71
1026
+			23 00 02 50 8F
1027
+			23 00 02 51 8F
1028
+			23 00 02 FE 00
1029
+			23 00 02 35 00
1030
+			05 78 01 11
1031
+			05 1E 01 29
1032
+		];
758
1033
 
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
-        ];
1034
+		panel-exit-sequence = [
1035
+			05 00 01 28
1036
+			05 00 01 10
1037
+		];
975
1038
 
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
-                        };
1039
+		disp_timings1: display-timings {
1040
+			native-mode = <&dsi1_timing0>;
1041
+			dsi1_timing0: timing0 {
1042
+				clock-frequency = <132000000>;
1043
+				hactive = <1080>;
1044
+				vactive = <1920>;
1045
+				hfront-porch = <15>;
1046
+				hsync-len = <2>;
1047
+				hback-porch = <30>;
1048
+				vfront-porch = <15>;
1049
+				vsync-len = <2>;
1050
+				vback-porch = <15>;
1051
+				hsync-active = <0>;
1052
+				vsync-active = <0>;
1053
+				de-active = <0>;
1054
+				pixelclk-active = <1>;
1055
+			};
1056
+		};
999
1057
 
1000
1058
 		ports {
1001
1059
 			#address-cells = <1>;
..
..
@@ -1029,7 +1087,28 @@
1029
1087
 	status = "okay";
1030
1088
 };
1031
1089
 
1090
+&hdmi {
1091
+	status = "okay";
1092
+	rockchip,phy-table =
1093
+		<92812500  0x8009 0x0000 0x0270>,
1094
+		<165000000 0x800b 0x0000 0x026d>,
1095
+		<185625000 0x800b 0x0000 0x01ed>,
1096
+		<297000000 0x800b 0x0000 0x01ad>,
1097
+		<594000000 0x8029 0x0000 0x0088>,
1098
+		<000000000 0x0000 0x0000 0x0000>;
1099
+};
1032
1100
 
1101
+&hdmi_in_vp0 {
1102
+	status = "okay";
1103
+};
1104
+
1105
+&hdmi_in_vp1 {
1106
+	status = "disabled";
1107
+};
1108
+
1109
+&hdmi_sound {
1110
+	status = "okay";
1111
+};
1033
1112
 
1034
1113
 &i2c0 {
1035
1114
 	status = "okay";
..
..
@@ -1043,7 +1122,6 @@
1043
1122
 		regulator-min-microvolt = <712500>;
1044
1123
 		regulator-max-microvolt = <1390000>;
1045
1124
 		regulator-init-microvolt = <900000>;
1046
-		regulator-initial-mode = <1>;
1047
1125
 		regulator-ramp-delay = <2300>;
1048
1126
 		fcs,suspend-voltage-selector = <1>;
1049
1127
 		regulator-boot-on;
..
..
@@ -1205,8 +1283,8 @@
1205
1283
 			vccio_acodec: LDO_REG4 {
1206
1284
 				regulator-always-on;
1207
1285
 				regulator-boot-on;
1208
-				regulator-min-microvolt = <3300000>;
1209
-				regulator-max-microvolt = <3300000>;
1286
+				regulator-min-microvolt = <3000000>;
1287
+				regulator-max-microvolt = <3000000>;
1210
1288
 				regulator-name = "vccio_acodec";
1211
1289
 				regulator-state-mem {
1212
1290
 					regulator-off-in-suspend;
..
..
@@ -1363,6 +1441,12 @@
1363
1441
 		     &i2s1m0_sdo0>;
1364
1442
 };
1365
1443
 
1444
+&i2s3_2ch {
1445
+	pinctrl-0 = <&i2s3m0_sclk &i2s3m0_lrck &i2s3m0_sdi &i2s3m0_sdo>;
1446
+	rockchip,bclk-fs = <32>;
1447
+	status = "disabled";
1448
+};
1449
+
1366
1450
 &iep {
1367
1451
 	status = "okay";
1368
1452
 };
..
..
@@ -1398,6 +1482,12 @@
1398
1482
 };
1399
1483
 
1400
1484
 &pinctrl {
1485
+
1486
+	headphone {
1487
+		hp_det: hp-det {
1488
+			rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1489
+		};
1490
+	};
1401
1491
 
1402
1492
 	mxc6655xa {
1403
1493
 		mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
..
..
@@ -1437,8 +1527,7 @@
1437
1527
 
1438
1528
 	sdio-pwrseq {
1439
1529
 		wifi_enable_h: wifi-enable-h {
1440
-			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
1441
-			//WIFI_REG_ON_H_GPIO2_B1
1530
+			rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
1442
1531
 		};
1443
1532
 	};
1444
1533
 
..
..
@@ -1487,10 +1576,6 @@
1487
1576
 };
1488
1577
 
1489
1578
 &pwm4 {
1490
-	status = "okay";
1491
-};
1492
-
1493
-&pwm6 {
1494
1579
 	status = "okay";
1495
1580
 };
1496
1581
 
..
..
@@ -1633,7 +1718,10 @@
1633
1718
 	status = "okay";
1634
1719
 };
1635
1720
 
1636
-
1721
+&route_hdmi {
1722
+	status = "okay";
1723
+	connect = <&vp0_out_hdmi>;
1724
+};
1637
1725
 
1638
1726
 &saradc {
1639
1727
 	status = "okay";
..
..
@@ -1730,15 +1818,6 @@
1730
1818
 };
1731
1819
 
1732
1820
 &usbhost_dwc3 {
1733
-//	phys = <&u2phy0_host>;
1734
-//	phy-names = "usb2-phy";
1735
-//	maximum-speed = "high-speed";
1736
-//	snps,dis_u2_susphy_quirk;
1737
-	status = "okay";
1738
-};
1739
-
1740
-&combphy1_usq {
1741
-//	rockchip,dis-u3otg1-port;
1742
1821
 	status = "okay";
1743
1822
 };
1744
1823
 
..
..
@@ -1771,8 +1850,8 @@
1771
1850
 
1772
1851
 &vop {
1773
1852
 	status = "okay";
1774
-	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
1775
-	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
1853
+	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>, <&cru DCLK_VOP2>;
1854
+	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>, <&cru PLL_GPLL>;
1776
1855
 };
1777
1856
 
1778
1857
 &vop_mmu {