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 = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
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 {
....@@ -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;
....@@ -1425,6 +1441,12 @@
14251441 &i2s1m0_sdo0>;
14261442 };
14271443
1444
+&i2s3_2ch {
1445
+ pinctrl-0 = <&i2s3m0_sclk &i2s3m0_lrck &i2s3m0_sdi &i2s3m0_sdo>;
1446
+ rockchip,bclk-fs = <32>;
1447
+ status = "disabled";
1448
+};
1449
+
14281450 &iep {
14291451 status = "okay";
14301452 };
....@@ -1460,6 +1482,12 @@
14601482 };
14611483
14621484 &pinctrl {
1485
+
1486
+ headphone {
1487
+ hp_det: hp-det {
1488
+ rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1489
+ };
1490
+ };
14631491
14641492 mxc6655xa {
14651493 mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
....@@ -1499,8 +1527,7 @@
14991527
15001528 sdio-pwrseq {
15011529 wifi_enable_h: wifi-enable-h {
1502
- rockchip,pins = <2 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
1503
- //WIFI_REG_ON_H_GPIO2_B1
1530
+ rockchip,pins = <3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
15041531 };
15051532 };
15061533
....@@ -1791,15 +1818,6 @@
17911818 };
17921819
17931820 &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;
18031821 status = "okay";
18041822 };
18051823
....@@ -1832,8 +1850,8 @@
18321850
18331851 &vop {
18341852 status = "okay";
1835
- assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>;
1836
- 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>;
18371855 };
18381856
18391857 &vop_mmu {