forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-11-22 9ca5fbcb63a8dcaee0527f96afb91dc4b4bd8fa9 
 kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
....@@ -141,6 +141,27 @@
141141 		default-brightness-level = <200>;
142142 	};
143143 
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
+
144165 	dc_12v: dc-12v {
145166 		compatible = "regulator-fixed";
146167 		regulator-name = "dc_12v";
....@@ -187,17 +208,15 @@
187208 
188209 	rk809_sound: rk809-sound {
189210 		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>;
201220 	};
202221 
203222 	spdif-sound {
....@@ -273,8 +292,6 @@
273292 	vcc5v0_otg: vcc5v0-otg-regulator {
274293 		compatible = "regulator-fixed";
275294 		regulator-name = "vcc5v0_otg";
276
-		egulator-boot-on;
277
-		regulator-always-on;
278295 		regulator-min-microvolt = <5000000>;
279296 		regulator-max-microvolt = <5000000>;
280297 		enable-active-high;
....@@ -335,22 +352,11 @@
335352 		compatible = "wlan-platdata";
336353 		rockchip,grf = <&grf>;
337354 		wifi_chip_type = "ap6398s";
338
-		status = "okay";
355
+		status = "disabled";
339356 	};
340357 
341358 	wireless_bluetooth: wireless-bluetooth {
342
-		compatible = "bluetooth-platdata";
343
-		clocks = <&rk809 1>;
344
-		clock-names = "ext_clock";
345
-		//wifi-bt-power-toggle;
346
-		uart_rts_gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
347
-		pinctrl-names = "default", "rts_gpio";
348
-		pinctrl-0 = <&uart8m0_rtsn>;
349
-		pinctrl-1 = <&uart8_gpios>;
350
-		BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
351
-		BT,wake_gpio     = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
352
-		BT,wake_host_irq = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
353
-		status = "okay";
359
+		status = "disabled";
354360 	};
355361 
356362 	test-power {
....@@ -740,262 +746,303 @@
740746 		status = "okay";
741747 		compatible = "simple-panel-dsi";
742748 		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>;
749
+		backlight = <&backlight1>;
750
+		reset-delay-ms = <60>;
751
+		enable-delay-ms = <60>;
752
+		prepare-delay-ms = <60>;
753
+		unprepare-delay-ms = <60>;
754
+		disable-delay-ms = <60>;
755
+		dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
756
+			MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>;
757
+		dsi,format = <MIPI_DSI_FMT_RGB888>;
758
+		dsi,lanes  = <4>;
759
+		panel-init-sequence = [
760
+			23 00 02 FE 21
761
+			23 00 02 04 00
762
+			23 00 02 00 64
763
+			23 00 02 2A 00
764
+			23 00 02 26 64
765
+			23 00 02 54 00
766
+			23 00 02 50 64
767
+			23 00 02 7B 00
768
+			23 00 02 77 64
769
+			23 00 02 A2 00
770
+			23 00 02 9D 64
771
+			23 00 02 C9 00
772
+			23 00 02 C5 64
773
+			23 00 02 01 71
774
+			23 00 02 27 71
775
+			23 00 02 51 71
776
+			23 00 02 78 71
777
+			23 00 02 9E 71
778
+			23 00 02 C6 71
779
+			23 00 02 02 89
780
+			23 00 02 28 89
781
+			23 00 02 52 89
782
+			23 00 02 79 89
783
+			23 00 02 9F 89
784
+			23 00 02 C7 89
785
+			23 00 02 03 9E
786
+			23 00 02 29 9E
787
+			23 00 02 53 9E
788
+			23 00 02 7A 9E
789
+			23 00 02 A0 9E
790
+			23 00 02 C8 9E
791
+			23 00 02 09 00
792
+			23 00 02 05 B0
793
+			23 00 02 31 00
794
+			23 00 02 2B B0
795
+			23 00 02 5A 00
796
+			23 00 02 55 B0
797
+			23 00 02 80 00
798
+			23 00 02 7C B0
799
+			23 00 02 A7 00
800
+			23 00 02 A3 B0
801
+			23 00 02 CE 00
802
+			23 00 02 CA B0
803
+			23 00 02 06 C0
804
+			23 00 02 2D C0
805
+			23 00 02 56 C0
806
+			23 00 02 7D C0
807
+			23 00 02 A4 C0
808
+			23 00 02 CB C0
809
+			23 00 02 07 CF
810
+			23 00 02 2F CF
811
+			23 00 02 58 CF
812
+			23 00 02 7E CF
813
+			23 00 02 A5 CF
814
+			23 00 02 CC CF
815
+			23 00 02 08 DD
816
+			23 00 02 30 DD
817
+			23 00 02 59 DD
818
+			23 00 02 7F DD
819
+			23 00 02 A6 DD
820
+			23 00 02 CD DD
821
+			23 00 02 0E 15
822
+			23 00 02 0A E9
823
+			23 00 02 36 15
824
+			23 00 02 32 E9
825
+			23 00 02 5F 15
826
+			23 00 02 5B E9
827
+			23 00 02 85 15
828
+			23 00 02 81 E9
829
+			23 00 02 AD 15
830
+			23 00 02 A9 E9
831
+			23 00 02 D3 15
832
+			23 00 02 CF E9
833
+			23 00 02 0B 14
834
+			23 00 02 33 14
835
+			23 00 02 5C 14
836
+			23 00 02 82 14
837
+			23 00 02 AA 14
838
+			23 00 02 D0 14
839
+			23 00 02 0C 36
840
+			23 00 02 34 36
841
+			23 00 02 5D 36
842
+			23 00 02 83 36
843
+			23 00 02 AB 36
844
+			23 00 02 D1 36
845
+			23 00 02 0D 6B
846
+			23 00 02 35 6B
847
+			23 00 02 5E 6B
848
+			23 00 02 84 6B
849
+			23 00 02 AC 6B
850
+			23 00 02 D2 6B
851
+			23 00 02 13 5A
852
+			23 00 02 0F 94
853
+			23 00 02 3B 5A
854
+			23 00 02 37 94
855
+			23 00 02 64 5A
856
+			23 00 02 60 94
857
+			23 00 02 8A 5A
858
+			23 00 02 86 94
859
+			23 00 02 B2 5A
860
+			23 00 02 AE 94
861
+			23 00 02 D8 5A
862
+			23 00 02 D4 94
863
+			23 00 02 10 D1
864
+			23 00 02 38 D1
865
+			23 00 02 61 D1
866
+			23 00 02 87 D1
867
+			23 00 02 AF D1
868
+			23 00 02 D5 D1
869
+			23 00 02 11 04
870
+			23 00 02 39 04
871
+			23 00 02 62 04
872
+			23 00 02 88 04
873
+			23 00 02 B0 04
874
+			23 00 02 D6 04
875
+			23 00 02 12 05
876
+			23 00 02 3A 05
877
+			23 00 02 63 05
878
+			23 00 02 89 05
879
+			23 00 02 B1 05
880
+			23 00 02 D7 05
881
+			23 00 02 18 AA
882
+			23 00 02 14 36
883
+			23 00 02 42 AA
884
+			23 00 02 3D 36
885
+			23 00 02 69 AA
886
+			23 00 02 65 36
887
+			23 00 02 8F AA
888
+			23 00 02 8B 36
889
+			23 00 02 B7 AA
890
+			23 00 02 B3 36
891
+			23 00 02 DD AA
892
+			23 00 02 D9 36
893
+			23 00 02 15 74
894
+			23 00 02 3F 74
895
+			23 00 02 66 74
896
+			23 00 02 8C 74
897
+			23 00 02 B4 74
898
+			23 00 02 DA 74
899
+			23 00 02 16 9F
900
+			23 00 02 40 9F
901
+			23 00 02 67 9F
902
+			23 00 02 8D 9F
903
+			23 00 02 B5 9F
904
+			23 00 02 DB 9F
905
+			23 00 02 17 DC
906
+			23 00 02 41 DC
907
+			23 00 02 68 DC
908
+			23 00 02 8E DC
909
+			23 00 02 B6 DC
910
+			23 00 02 DC DC
911
+			23 00 02 1D FF
912
+			23 00 02 19 03
913
+			23 00 02 47 FF
914
+			23 00 02 43 03
915
+			23 00 02 6E FF
916
+			23 00 02 6A 03
917
+			23 00 02 94 FF
918
+			23 00 02 90 03
919
+			23 00 02 BC FF
920
+			23 00 02 B8 03
921
+			23 00 02 E2 FF
922
+			23 00 02 DE 03
923
+			23 00 02 1A 35
924
+			23 00 02 44 35
925
+			23 00 02 6B 35
926
+			23 00 02 91 35
927
+			23 00 02 B9 35
928
+			23 00 02 DF 35
929
+			23 00 02 1B 45
930
+			23 00 02 45 45
931
+			23 00 02 6C 45
932
+			23 00 02 92 45
933
+			23 00 02 BA 45
934
+			23 00 02 E0 45
935
+			23 00 02 1C 55
936
+			23 00 02 46 55
937
+			23 00 02 6D 55
938
+			23 00 02 93 55
939
+			23 00 02 BB 55
940
+			23 00 02 E1 55
941
+			23 00 02 22 FF
942
+			23 00 02 1E 68
943
+			23 00 02 4C FF
944
+			23 00 02 48 68
945
+			23 00 02 73 FF
946
+			23 00 02 6F 68
947
+			23 00 02 99 FF
948
+			23 00 02 95 68
949
+			23 00 02 C1 FF
950
+			23 00 02 BD 68
951
+			23 00 02 E7 FF
952
+			23 00 02 E3 68
953
+			23 00 02 1F 7E
954
+			23 00 02 49 7E
955
+			23 00 02 70 7E
956
+			23 00 02 96 7E
957
+			23 00 02 BE 7E
958
+			23 00 02 E4 7E
959
+			23 00 02 20 97
960
+			23 00 02 4A 97
961
+			23 00 02 71 97
962
+			23 00 02 97 97
963
+			23 00 02 BF 97
964
+			23 00 02 E5 97
965
+			23 00 02 21 B5
966
+			23 00 02 4B B5
967
+			23 00 02 72 B5
968
+			23 00 02 98 B5
969
+			23 00 02 C0 B5
970
+			23 00 02 E6 B5
971
+			23 00 02 25 F0
972
+			23 00 02 23 E8
973
+			23 00 02 4F F0
974
+			23 00 02 4D E8
975
+			23 00 02 76 F0
976
+			23 00 02 74 E8
977
+			23 00 02 9C F0
978
+			23 00 02 9A E8
979
+			23 00 02 C4 F0
980
+			23 00 02 C2 E8
981
+			23 00 02 EA F0
982
+			23 00 02 E8 E8
983
+			23 00 02 24 FF
984
+			23 00 02 4E FF
985
+			23 00 02 75 FF
986
+			23 00 02 9B FF
987
+			23 00 02 C3 FF
988
+			23 00 02 E9 FF
989
+			23 00 02 FE 3D
990
+			23 00 02 00 04
991
+			23 00 02 FE 23
992
+			23 00 02 08 82
993
+			23 00 02 0A 00
994
+			23 00 02 0B 00
995
+			23 00 02 0C 01
996
+			23 00 02 16 00
997
+			23 00 02 18 02
998
+			23 00 02 1B 04
999
+			23 00 02 19 04
1000
+			23 00 02 1C 81
1001
+			23 00 02 1F 00
1002
+			23 00 02 20 03
1003
+			23 00 02 23 04
1004
+			23 00 02 21 01
1005
+			23 00 02 54 63
1006
+			23 00 02 55 54
1007
+			23 00 02 6E 45
1008
+			23 00 02 6D 36
1009
+			23 00 02 FE 3D
1010
+			23 00 02 55 78
1011
+			23 00 02 FE 20
1012
+			23 00 02 26 30
1013
+			23 00 02 FE 3D
1014
+			23 00 02 20 71
1015
+			23 00 02 50 8F
1016
+			23 00 02 51 8F
1017
+			23 00 02 FE 00
1018
+			23 00 02 35 00
1019
+			05 78 01 11
1020
+			05 1E 01 29
1021
+		];
7581022 
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
-        ];
1023
+		panel-exit-sequence = [
1024
+			05 00 01 28
1025
+			05 00 01 10
1026
+		];
9751027 
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
-                        };
1028
+		disp_timings1: display-timings {
1029
+			native-mode = <&dsi1_timing0>;
1030
+			dsi1_timing0: timing0 {
1031
+				clock-frequency = <132000000>;
1032
+				hactive = <1080>;
1033
+				vactive = <1920>;
1034
+				hfront-porch = <15>;
1035
+				hsync-len = <2>;
1036
+				hback-porch = <30>;
1037
+				vfront-porch = <15>;
1038
+				vsync-len = <2>;
1039
+				vback-porch = <15>;
1040
+				hsync-active = <0>;
1041
+				vsync-active = <0>;
1042
+				de-active = <0>;
1043
+				pixelclk-active = <1>;
1044
+			};
1045
+		};
9991046 
10001047 		ports {
10011048 			#address-cells = <1>;
....@@ -1029,7 +1076,28 @@
10291076 	status = "okay";
10301077 };
10311078 
1079
+&hdmi {
1080
+	status = "okay";
1081
+	rockchip,phy-table =
1082
+		<92812500  0x8009 0x0000 0x0270>,
1083
+		<165000000 0x800b 0x0000 0x026d>,
1084
+		<185625000 0x800b 0x0000 0x01ed>,
1085
+		<297000000 0x800b 0x0000 0x01ad>,
1086
+		<594000000 0x8029 0x0000 0x0088>,
1087
+		<000000000 0x0000 0x0000 0x0000>;
1088
+};
10321089 
1090
+&hdmi_in_vp0 {
1091
+	status = "okay";
1092
+};
1093
+
1094
+&hdmi_in_vp1 {
1095
+	status = "disabled";
1096
+};
1097
+
1098
+&hdmi_sound {
1099
+	status = "okay";
1100
+};
10331101 
10341102 &i2c0 {
10351103 	status = "okay";
....@@ -1043,7 +1111,6 @@
10431111 		regulator-min-microvolt = <712500>;
10441112 		regulator-max-microvolt = <1390000>;
10451113 		regulator-init-microvolt = <900000>;
1046
-		regulator-initial-mode = <1>;
10471114 		regulator-ramp-delay = <2300>;
10481115 		fcs,suspend-voltage-selector = <1>;
10491116 		regulator-boot-on;
....@@ -1205,8 +1272,8 @@
12051272 			vccio_acodec: LDO_REG4 {
12061273 				regulator-always-on;
12071274 				regulator-boot-on;
1208
-				regulator-min-microvolt = <3300000>;
1209
-				regulator-max-microvolt = <3300000>;
1275
+				regulator-min-microvolt = <3000000>;
1276
+				regulator-max-microvolt = <3000000>;
12101277 				regulator-name = "vccio_acodec";
12111278 				regulator-state-mem {
12121279 					regulator-off-in-suspend;
....@@ -1320,15 +1387,6 @@
13201387 
13211388 &i2c1 {
13221389 	status = "okay";
1323
-
1324
-	gt1x: gt1x@14 {
1325
-		compatible = "goodix,gt1x";
1326
-		reg = <0x14>;
1327
-		pinctrl-names = "default";
1328
-		pinctrl-0 = <&touch_gpio>;
1329
-		goodix,rst-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
1330
-		goodix,irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>;
1331
-	};
13321390 };
13331391 
13341392 &i2c5 {
....@@ -1361,6 +1419,12 @@
13611419 		     &i2s1m0_lrcktx
13621420 		     &i2s1m0_sdi0
13631421 		     &i2s1m0_sdo0>;
1422
+};
1423
+
1424
+&i2s3_2ch {
1425
+	pinctrl-0 = <&i2s3m0_sclk &i2s3m0_lrck &i2s3m0_sdi &i2s3m0_sdo>;
1426
+	rockchip,bclk-fs = <32>;
1427
+	status = "disabled";
13641428 };
13651429 
13661430 &iep {
....@@ -1398,6 +1462,12 @@
13981462 };
13991463 
14001464 &pinctrl {
1465
+
1466
+	headphone {
1467
+		hp_det: hp-det {
1468
+			rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1469
+		};
1470
+	};
14011471 
14021472 	mxc6655xa {
14031473 		mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
....@@ -1438,7 +1508,6 @@
14381508 	sdio-pwrseq {
14391509 		wifi_enable_h: wifi-enable-h {
14401510 			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
1441
-			//WIFI_REG_ON_H_GPIO2_B1
14421511 		};
14431512 	};
14441513 
....@@ -1452,11 +1521,6 @@
14521521 		};
14531522 	};
14541523 
1455
-	wireless-bluetooth {
1456
-		uart8_gpios: uart8-gpios {
1457
-			rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
1458
-		};
1459
-	};
14601524 };
14611525 
14621526  /*
....@@ -1499,7 +1563,7 @@
14991563 };
15001564 
15011565 &pwm7 {
1502
-	status = "okay";
1566
+	status = "disabled";
15031567 
15041568 	compatible = "rockchip,remotectl-pwm";
15051569 	remote_pwm_id = <3>;
....@@ -1633,7 +1697,10 @@
16331697 	status = "okay";
16341698 };
16351699 
1636
-
1700
+&route_hdmi {
1701
+	status = "okay";
1702
+	connect = <&vp0_out_hdmi>;
1703
+};
16371704 
16381705 &saradc {
16391706 	status = "okay";
....@@ -1720,7 +1787,7 @@
17201787 };
17211788 
17221789 &usbdrd_dwc3 {
1723
-	dr_mode = "otg";
1790
+	dr_mode = "host";
17241791 	extcon = <&usb2phy0>;
17251792 	status = "okay";
17261793 };
....@@ -1730,15 +1797,6 @@
17301797 };
17311798 
17321799 &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;
17421800 	status = "okay";
17431801 };
17441802 
....@@ -1771,8 +1829,8 @@
17711829 
17721830 &vop {
17731831 	status = "okay";
1774
-	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
1775
-	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
1832
+	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>, <&cru DCLK_VOP2>;
1833
+	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>, <&cru PLL_GPLL>;
17761834 };
17771835 
17781836 &vop_mmu {