mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
..
..
@@ -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";
..
..
@@ -151,12 +172,18 @@
151
172
 	};
152
173
 
153
174
 	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";
154
179
 		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
+		};
160
187
 	};
161
188
 
162
189
 	leds: leds {
..
..
@@ -362,30 +389,6 @@
362
389
 	bus-supply = <&vdd_logic>;
363
390
 	pvtm-supply = <&vdd_cpu>;
364
391
 	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";
389
392
 };
390
393
 
391
394
 &cpu0 {
..
..
@@ -884,10 +887,10 @@
884
887
             15 05 01 29 
885
888
         ];
886
889
 
887
-        panel-exit-sequence = [
888
-                05 00 01 28
889
-                05 00 01 10
890
-        ];
890
+		panel-exit-sequence = [
891
+			05 00 01 28
892
+			05 00 01 10
893
+		];
891
894
 
892
895
          disp_timings1: display-timings {
893
896
                                         native-mode = <&dsi1_timing0>;
..
..
@@ -940,13 +943,34 @@
940
943
 	status = "okay";
941
944
 };
942
945
 
946
+&hdmi {
947
+	status = "okay";
948
+	rockchip,phy-table =
949
+		<92812500  0x8009 0x0000 0x0270>,
950
+		<165000000 0x800b 0x0000 0x026d>,
951
+		<185625000 0x800b 0x0000 0x01ed>,
952
+		<297000000 0x800b 0x0000 0x01ad>,
953
+		<594000000 0x8029 0x0000 0x0088>,
954
+		<000000000 0x0000 0x0000 0x0000>;
955
+};
943
956
 
957
+&hdmi_in_vp0 {
958
+	status = "okay";
959
+};
960
+
961
+&hdmi_in_vp1 {
962
+	status = "disabled";
963
+};
964
+
965
+&hdmi_sound {
966
+	status = "okay";
967
+};
944
968
 
945
969
 &i2c0 {
946
970
 	status = "okay";
947
971
 
948
972
 	vdd_cpu: tcs4525@1c {
949
-		compatible = "tcs,tcs452x";
973
+		compatible = "tcs,tcs4525";
950
974
 		reg = <0x1c>;
951
975
 		vin-supply = <&vcc5v0_sys>;
952
976
 		regulator-compatible = "fan53555-reg";
..
..
@@ -954,7 +978,6 @@
954
978
 		regulator-min-microvolt = <712500>;
955
979
 		regulator-max-microvolt = <1390000>;
956
980
 		regulator-init-microvolt = <900000>;
957
-		regulator-initial-mode = <1>;
958
981
 		regulator-ramp-delay = <2300>;
959
982
 		fcs,suspend-voltage-selector = <1>;
960
983
 		regulator-boot-on;
..
..
@@ -1116,8 +1139,8 @@
1116
1139
 			vccio_acodec: LDO_REG4 {
1117
1140
 				regulator-always-on;
1118
1141
 				regulator-boot-on;
1119
-				regulator-min-microvolt = <3300000>;
1120
-				regulator-max-microvolt = <3300000>;
1142
+				regulator-min-microvolt = <3000000>;
1143
+				regulator-max-microvolt = <3000000>;
1121
1144
 				regulator-name = "vccio_acodec";
1122
1145
 				regulator-state-mem {
1123
1146
 					regulator-off-in-suspend;
..
..
@@ -1231,15 +1254,6 @@
1231
1254
 
1232
1255
 &i2c1 {
1233
1256
 	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
-	};
1243
1257
 };
1244
1258
 
1245
1259
 &i2c5 {
..
..
@@ -1272,6 +1286,12 @@
1272
1286
 		     &i2s1m0_lrcktx
1273
1287
 		     &i2s1m0_sdi0
1274
1288
 		     &i2s1m0_sdo0>;
1289
+};
1290
+
1291
+&i2s3_2ch {
1292
+	pinctrl-0 = <&i2s3m0_sclk &i2s3m0_lrck &i2s3m0_sdi &i2s3m0_sdo>;
1293
+	rockchip,bclk-fs = <32>;
1294
+	status = "disabled";
1275
1295
 };
1276
1296
 
1277
1297
 &iep {
..
..
@@ -1310,6 +1330,7 @@
1310
1330
 
1311
1331
 &pinctrl {
1312
1332
 
1333
+
1313
1334
 	mxc6655xa {
1314
1335
 		mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
1315
1336
 			rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
..
..
@@ -1324,12 +1345,12 @@
1324
1345
 
1325
1346
 		soc_slppin_gpio: soc_slppin_gpio {
1326
1347
 			rockchip,pins =
1327
-				<0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low_pull_down>;
1348
+				<0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low>;
1328
1349
 		};
1329
1350
 
1330
1351
 		soc_slppin_slp: soc_slppin_slp {
1331
1352
 			rockchip,pins =
1332
-				<0 RK_PA2 1 &pcfg_pull_up>;
1353
+				<0 RK_PA2 1 &pcfg_pull_none>;
1333
1354
 		};
1334
1355
 
1335
1356
 		soc_slppin_rst: soc_slppin_rst {
..
..
@@ -1544,7 +1565,10 @@
1544
1565
 	status = "okay";
1545
1566
 };
1546
1567
 
1547
-
1568
+&route_hdmi {
1569
+	status = "okay";
1570
+	connect = <&vp0_out_hdmi>;
1571
+};
1548
1572
 
1549
1573
 &saradc {
1550
1574
 	status = "okay";
..
..
@@ -1553,15 +1577,18 @@
1553
1577
 
1554
1578
 &sdhci {
1555
1579
 	bus-width = <8>;
1556
-	supports-emmc;
1580
+	no-sdio;
1581
+	no-sd;
1557
1582
 	non-removable;
1558
1583
 	max-frequency = <200000000>;
1584
+	full-pwr-cycle-in-suspend;
1559
1585
 	status = "okay";
1560
1586
 };
1561
1587
 
1562
1588
 &sdmmc0 {
1563
1589
 	max-frequency = <150000000>;
1564
-	supports-sd;
1590
+	no-sdio;
1591
+	no-mmc;
1565
1592
 	bus-width = <4>;
1566
1593
 	cap-mmc-highspeed;
1567
1594
 	cap-sd-highspeed;
..
..
@@ -1641,15 +1668,6 @@
1641
1668
 };
1642
1669
 
1643
1670
 &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;
1653
1671
 	status = "okay";
1654
1672
 };
1655
1673
 
..
..
@@ -1682,8 +1700,8 @@
1682
1700
 
1683
1701
 &vop {
1684
1702
 	status = "okay";
1685
-	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
1686
-	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
1703
+	assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>, <&cru DCLK_VOP2>;
1704
+	assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>, <&cru PLL_GPLL>;
1687
1705
 };
1688
1706
 
1689
1707
 &vop_mmu {