hc
2023-11-06 e3e12f52b214121840b44c91de5b3e5af5d3eb84
kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
old mode 100755new mode 100644
....@@ -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";
....@@ -161,8 +182,8 @@
161182
162183 leds: leds {
163184 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>;
166187 linux,default-trigger = "heartbeat";
167188 };
168189 };
....@@ -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 = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
311
+ gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
295312 vin-supply = <&vcc3v3_sys>;
296313
297314 regulator-state-mem {
....@@ -328,7 +345,7 @@
328345 * - PDN (power down when low)
329346 */
330347 post-power-on-delay-ms = <200>;
331
- reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
348
+ reset-gpios = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>;
332349 };
333350
334351 wireless_wlan: wireless-wlan {
....@@ -1070,7 +1087,28 @@
10701087 status = "okay";
10711088 };
10721089
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
+};
10731100
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
+};
10741112
10751113 &i2c0 {
10761114 status = "okay";
....@@ -1084,7 +1122,6 @@
10841122 regulator-min-microvolt = <712500>;
10851123 regulator-max-microvolt = <1390000>;
10861124 regulator-init-microvolt = <900000>;
1087
- regulator-initial-mode = <1>;
10881125 regulator-ramp-delay = <2300>;
10891126 fcs,suspend-voltage-selector = <1>;
10901127 regulator-boot-on;
....@@ -1246,8 +1283,8 @@
12461283 vccio_acodec: LDO_REG4 {
12471284 regulator-always-on;
12481285 regulator-boot-on;
1249
- regulator-min-microvolt = <3300000>;
1250
- regulator-max-microvolt = <3300000>;
1286
+ regulator-min-microvolt = <3000000>;
1287
+ regulator-max-microvolt = <3000000>;
12511288 regulator-name = "vccio_acodec";
12521289 regulator-state-mem {
12531290 regulator-off-in-suspend;
....@@ -1404,6 +1441,12 @@
14041441 &i2s1m0_sdo0>;
14051442 };
14061443
1444
+&i2s3_2ch {
1445
+ pinctrl-0 = <&i2s3m0_sclk &i2s3m0_lrck &i2s3m0_sdi &i2s3m0_sdo>;
1446
+ rockchip,bclk-fs = <32>;
1447
+ status = "disabled";
1448
+};
1449
+
14071450 &iep {
14081451 status = "okay";
14091452 };
....@@ -1439,6 +1482,12 @@
14391482 };
14401483
14411484 &pinctrl {
1485
+
1486
+ headphone {
1487
+ hp_det: hp-det {
1488
+ rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1489
+ };
1490
+ };
14421491
14431492 mxc6655xa {
14441493 mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
....@@ -1478,8 +1527,7 @@
14781527
14791528 sdio-pwrseq {
14801529 wifi_enable_h: wifi-enable-h {
1481
- rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
1482
- //WIFI_REG_ON_H_GPIO2_B1
1530
+ rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
14831531 };
14841532 };
14851533
....@@ -1670,7 +1718,10 @@
16701718 status = "okay";
16711719 };
16721720
1673
-
1721
+&route_hdmi {
1722
+ status = "okay";
1723
+ connect = <&vp0_out_hdmi>;
1724
+};
16741725
16751726 &saradc {
16761727 status = "okay";
....@@ -1767,15 +1818,6 @@
17671818 };
17681819
17691820 &usbhost_dwc3 {
1770
-// phys = <&u2phy0_host>;
1771
-// phy-names = "usb2-phy";
1772
-// maximum-speed = "high-speed";
1773
-// snps,dis_u2_susphy_quirk;
1774
- status = "okay";
1775
-};
1776
-
1777
-&combphy1_usq {
1778
-// rockchip,dis-u3otg1-port;
17791821 status = "okay";
17801822 };
17811823
....@@ -1808,8 +1850,8 @@
18081850
18091851 &vop {
18101852 status = "okay";
1811
- assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
1812
- 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>;
18131855 };
18141856
18151857 &vop_mmu {