forked from ~ljy/RK356X_SDK_RELEASE

hc
2023-11-20 69d6da3c1c63675524a25e7dc92a4f43c4164cef
kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
....@@ -103,7 +103,7 @@
103103
104104 backlight1: backlight1 {
105105 compatible = "pwm-backlight";
106
- pwms = <&pwm5 0 25000 0>;
106
+ pwms = <&pwm6 0 25000 0>;
107107 brightness-levels = <
108108 0 20 20 21 21 22 22 23
109109 23 24 24 25 25 26 26 27
....@@ -139,6 +139,27 @@
139139 248 249 250 251 252 253 254 255
140140 >;
141141 default-brightness-level = <200>;
142
+ };
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
+ };
142163 };
143164
144165 dc_12v: 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;
....@@ -291,7 +308,7 @@
291308 regulator-min-microvolt = <3300000>;
292309 regulator-max-microvolt = <3300000>;
293310 enable-active-high;
294
- gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
311
+ gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
295312 vin-supply = <&vcc3v3_sys>;
296313
297314 regulator-state-mem {
....@@ -1105,7 +1122,6 @@
11051122 regulator-min-microvolt = <712500>;
11061123 regulator-max-microvolt = <1390000>;
11071124 regulator-init-microvolt = <900000>;
1108
- regulator-initial-mode = <1>;
11091125 regulator-ramp-delay = <2300>;
11101126 fcs,suspend-voltage-selector = <1>;
11111127 regulator-boot-on;
....@@ -1267,8 +1283,8 @@
12671283 vccio_acodec: LDO_REG4 {
12681284 regulator-always-on;
12691285 regulator-boot-on;
1270
- regulator-min-microvolt = <3300000>;
1271
- regulator-max-microvolt = <3300000>;
1286
+ regulator-min-microvolt = <3000000>;
1287
+ regulator-max-microvolt = <3000000>;
12721288 regulator-name = "vccio_acodec";
12731289 regulator-state-mem {
12741290 regulator-off-in-suspend;
....@@ -1382,15 +1398,6 @@
13821398
13831399 &i2c1 {
13841400 status = "okay";
1385
-
1386
- gt1x: gt1x@14 {
1387
- compatible = "goodix,gt1x";
1388
- reg = <0x14>;
1389
- pinctrl-names = "default";
1390
- pinctrl-0 = <&touch_gpio>;
1391
- goodix,rst-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
1392
- goodix,irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>;
1393
- };
13941401 };
13951402
13961403 &i2c5 {
....@@ -1423,6 +1430,12 @@
14231430 &i2s1m0_lrcktx
14241431 &i2s1m0_sdi0
14251432 &i2s1m0_sdo0>;
1433
+};
1434
+
1435
+&i2s3_2ch {
1436
+ pinctrl-0 = <&i2s3m0_sclk &i2s3m0_lrck &i2s3m0_sdi &i2s3m0_sdo>;
1437
+ rockchip,bclk-fs = <32>;
1438
+ status = "disabled";
14261439 };
14271440
14281441 &iep {
....@@ -1460,6 +1473,12 @@
14601473 };
14611474
14621475 &pinctrl {
1476
+
1477
+ headphone {
1478
+ hp_det: hp-det {
1479
+ rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1480
+ };
1481
+ };
14631482
14641483 mxc6655xa {
14651484 mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
....@@ -1500,7 +1519,6 @@
15001519 sdio-pwrseq {
15011520 wifi_enable_h: wifi-enable-h {
15021521 rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
1503
- //WIFI_REG_ON_H_GPIO2_B1
15041522 };
15051523 };
15061524
....@@ -1549,6 +1567,10 @@
15491567 };
15501568
15511569 &pwm4 {
1570
+ status = "okay";
1571
+};
1572
+
1573
+&pwm6 {
15521574 status = "okay";
15531575 };
15541576
....@@ -1791,15 +1813,6 @@
17911813 };
17921814
17931815 &usbhost_dwc3 {
1794
-// phys = <&u2phy0_host>;
1795
-// phy-names = "usb2-phy";
1796
-// maximum-speed = "high-speed";
1797
-// snps,dis_u2_susphy_quirk;
1798
- status = "okay";
1799
-};
1800
-
1801
-&combphy1_usq {
1802
-// rockchip,dis-u3otg1-port;
18031816 status = "okay";
18041817 };
18051818
....@@ -1832,8 +1845,8 @@
18321845
18331846 &vop {
18341847 status = "okay";
1835
- assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
1836
- assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>;
1848
+ assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>, <&cru DCLK_VOP2>;
1849
+ assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>, <&cru PLL_GPLL>;
18371850 };
18381851
18391852 &vop_mmu {