forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87 
 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";
....@@ -151,12 +172,18 @@
151172 	};
152173 
153174 	hdmi_sound: hdmi-sound {
175
+		compatible = "simple-audio-card";
176
+		simple-audio-card,format = "i2s";
177
+		simple-audio-card,mclk-fs = <128>;
178
+		simple-audio-card,name = "rockchip,hdmi";
154179 		status = "disabled";
155
-		compatible = "rockchip,hdmi";
156
-		rockchip,mclk-fs = <128>;
157
-		rockchip,card-name = "rockchip,hdmi";
158
-		rockchip,cpu = <&i2s0_8ch>;
159
-		rockchip,codec = <&hdmi>;
180
+
181
+		simple-audio-card,cpu {
182
+				sound-dai = <&i2s0_8ch>;
183
+		};
184
+		simple-audio-card,codec {
185
+				sound-dai = <&hdmi>;
186
+		};
160187 	};
161188 
162189 	leds: leds {
....@@ -187,23 +214,22 @@
187214 
188215 	rk809_sound: rk809-sound {
189216 		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
-		};
217
+		compatible = "rockchip,multicodecs-card";
218
+		rockchip,card-name = "rockchip-rk809";
219
+		hp-det-gpio = <&gpio3 RK_PA1 GPIO_ACTIVE_LOW>;
220
+		rockchip,format = "i2s";
221
+		rockchip,mclk-fs = <256>;
222
+		rockchip,cpu = <&i2s1_8ch>;
223
+		rockchip,codec = <&rk809_codec>;
224
+		pinctrl-names = "default";
225
+		pinctrl-0 = <&hp_det>;
201226 	};
202227 
203228 	spdif-sound {
204229 		status = "okay";
205230 		compatible = "simple-audio-card";
206231 		simple-audio-card,name = "ROCKCHIP,SPDIF";
232
+		simple-audio-card,mclk-fs = <128>;
207233 		simple-audio-card,cpu {
208234 				sound-dai = <&spdif_8ch>;
209235 		};
....@@ -362,30 +388,6 @@
362388 	bus-supply = <&vdd_logic>;
363389 	pvtm-supply = <&vdd_cpu>;
364390 	status = "okay";
365
-};
366
-
367
-&can0 {
368
-	assigned-clocks = <&cru CLK_CAN0>;
369
-	assigned-clock-rates = <150000000>;
370
-	pinctrl-names = "default";
371
-	pinctrl-0 = <&can0m1_pins>;
372
-	status = "disabled";
373
-};
374
-
375
-&can1 {
376
-	assigned-clocks = <&cru CLK_CAN1>;
377
-	assigned-clock-rates = <150000000>;
378
-	pinctrl-names = "default";
379
-	pinctrl-0 = <&can1m1_pins>;
380
-	status = "disabled";
381
-};
382
-
383
-&can2 {
384
-	assigned-clocks = <&cru CLK_CAN2>;
385
-	assigned-clock-rates = <150000000>;
386
-	pinctrl-names = "default";
387
-	pinctrl-0 = <&can2m1_pins>;
388
-	status = "disabled";
389391 };
390392 
391393 &cpu0 {
....@@ -884,10 +886,10 @@
884886             15 05 01 29 
885887         ];
886888 
887
-        panel-exit-sequence = [
888
-                05 00 01 28
889
-                05 00 01 10
890
-        ];
889
+		panel-exit-sequence = [
890
+			05 00 01 28
891
+			05 00 01 10
892
+		];
891893 
892894          disp_timings1: display-timings {
893895                                         native-mode = <&dsi1_timing0>;
....@@ -940,13 +942,34 @@
940942 	status = "okay";
941943 };
942944 
945
+&hdmi {
946
+	status = "okay";
947
+	rockchip,phy-table =
948
+		<92812500  0x8009 0x0000 0x0270>,
949
+		<165000000 0x800b 0x0000 0x026d>,
950
+		<185625000 0x800b 0x0000 0x01ed>,
951
+		<297000000 0x800b 0x0000 0x01ad>,
952
+		<594000000 0x8029 0x0000 0x0088>,
953
+		<000000000 0x0000 0x0000 0x0000>;
954
+};
943955 
956
+&hdmi_in_vp0 {
957
+	status = "okay";
958
+};
959
+
960
+&hdmi_in_vp1 {
961
+	status = "disabled";
962
+};
963
+
964
+&hdmi_sound {
965
+	status = "okay";
966
+};
944967 
945968 &i2c0 {
946969 	status = "okay";
947970 
948971 	vdd_cpu: tcs4525@1c {
949
-		compatible = "tcs,tcs452x";
972
+		compatible = "tcs,tcs4525";
950973 		reg = <0x1c>;
951974 		vin-supply = <&vcc5v0_sys>;
952975 		regulator-compatible = "fan53555-reg";
....@@ -954,7 +977,6 @@
954977 		regulator-min-microvolt = <712500>;
955978 		regulator-max-microvolt = <1390000>;
956979 		regulator-init-microvolt = <900000>;
957
-		regulator-initial-mode = <1>;
958980 		regulator-ramp-delay = <2300>;
959981 		fcs,suspend-voltage-selector = <1>;
960982 		regulator-boot-on;
....@@ -1116,8 +1138,8 @@
11161138 			vccio_acodec: LDO_REG4 {
11171139 				regulator-always-on;
11181140 				regulator-boot-on;
1119
-				regulator-min-microvolt = <3300000>;
1120
-				regulator-max-microvolt = <3300000>;
1141
+				regulator-min-microvolt = <3000000>;
1142
+				regulator-max-microvolt = <3000000>;
11211143 				regulator-name = "vccio_acodec";
11221144 				regulator-state-mem {
11231145 					regulator-off-in-suspend;
....@@ -1212,7 +1234,7 @@
12121234 		};
12131235 
12141236 		rk809_codec: codec {
1215
-			#sound-dai-cells = <0>;
1237
+			#sound-dai-cells = <1>;
12161238 			compatible = "rockchip,rk809-codec", "rockchip,rk817-codec";
12171239 			clocks = <&cru I2S1_MCLKOUT>;
12181240 			clock-names = "mclk";
....@@ -1231,15 +1253,6 @@
12311253 
12321254 &i2c1 {
12331255 	status = "okay";
1234
-
1235
-	gt1x: gt1x@14 {
1236
-		compatible = "goodix,gt1x";
1237
-		reg = <0x14>;
1238
-		pinctrl-names = "default";
1239
-		pinctrl-0 = <&touch_gpio>;
1240
-		goodix,rst-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
1241
-		goodix,irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>;
1242
-	};
12431256 };
12441257 
12451258 &i2c5 {
....@@ -1272,6 +1285,12 @@
12721285 		     &i2s1m0_lrcktx
12731286 		     &i2s1m0_sdi0
12741287 		     &i2s1m0_sdo0>;
1288
+};
1289
+
1290
+&i2s3_2ch {
1291
+	pinctrl-0 = <&i2s3m0_sclk &i2s3m0_lrck &i2s3m0_sdi &i2s3m0_sdo>;
1292
+	rockchip,bclk-fs = <32>;
1293
+	status = "disabled";
12751294 };
12761295 
12771296 &iep {
....@@ -1310,6 +1329,12 @@
13101329 
13111330 &pinctrl {
13121331 
1332
+	headphone {
1333
+		hp_det: hp-det {
1334
+			rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1335
+		};
1336
+	};
1337
+
13131338 	mxc6655xa {
13141339 		mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
13151340 			rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
....@@ -1324,12 +1349,12 @@
13241349 
13251350 		soc_slppin_gpio: soc_slppin_gpio {
13261351 			rockchip,pins =
1327
-				<0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low_pull_down>;
1352
+				<0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low>;
13281353 		};
13291354 
13301355 		soc_slppin_slp: soc_slppin_slp {
13311356 			rockchip,pins =
1332
-				<0 RK_PA2 1 &pcfg_pull_up>;
1357
+				<0 RK_PA2 1 &pcfg_pull_none>;
13331358 		};
13341359 
13351360 		soc_slppin_rst: soc_slppin_rst {
....@@ -1544,7 +1569,10 @@
15441569 	status = "okay";
15451570 };
15461571 
1547
-
1572
+&route_hdmi {
1573
+	status = "okay";
1574
+	connect = <&vp0_out_hdmi>;
1575
+};
15481576 
15491577 &saradc {
15501578 	status = "okay";
....@@ -1553,15 +1581,18 @@
15531581 
15541582 &sdhci {
15551583 	bus-width = <8>;
1556
-	supports-emmc;
1584
+	no-sdio;
1585
+	no-sd;
15571586 	non-removable;
15581587 	max-frequency = <200000000>;
1588
+	full-pwr-cycle-in-suspend;
15591589 	status = "okay";
15601590 };
15611591 
15621592 &sdmmc0 {
15631593 	max-frequency = <150000000>;
1564
-	supports-sd;
1594
+	no-sdio;
1595
+	no-mmc;
15651596 	bus-width = <4>;
15661597 	cap-mmc-highspeed;
15671598 	cap-sd-highspeed;
....@@ -1641,15 +1672,6 @@
16411672 };
16421673 
16431674 &usbhost_dwc3 {
1644
-//	phys = <&u2phy0_host>;
1645
-//	phy-names = "usb2-phy";
1646
-//	maximum-speed = "high-speed";
1647
-//	snps,dis_u2_susphy_quirk;
1648
-	status = "okay";
1649
-};
1650
-
1651
-&combphy1_usq {
1652
-//	rockchip,dis-u3otg1-port;
16531675 	status = "okay";
16541676 };
16551677 
....@@ -1682,8 +1704,8 @@
16821704 
16831705 &vop {
16841706 	status = "okay";
1685
-	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
1686
-	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
1707
+	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>, <&cru DCLK_VOP2>;
1708
+	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>, <&cru PLL_GPLL>;
16871709 };
16881710 
16891711 &vop_mmu {