forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 61598093bbdd283a7edc367d900f223070ead8d2
kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
....@@ -188,10 +188,22 @@
188188
189189 leds: leds {
190190 compatible = "gpio-leds";
191
- sys_led: sys_led {
192
- gpios = <&gpio3 RK_PD0 GPIO_ACTIVE_HIGH>;
193
- linux,default-trigger = "heartbeat";
191
+ run_led: run_led {
192
+ gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;
193
+ default-state = "on";
194
+// linux,default-trigger = "heartbeat";
194195 };
196
+ /*
197
+ sig_led: sig_led {
198
+ gpios = <&gpio4 RK_PC3 GPIO_ACTIVE_HIGH>;
199
+ default-state = "on";
200
+ };
201
+
202
+ err_led: err_led {
203
+ gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
204
+ default-state = "on";
205
+ };
206
+ */
195207 };
196208
197209 pdmics: dummy-codec {
....@@ -214,22 +226,23 @@
214226
215227 rk809_sound: rk809-sound {
216228 status = "okay";
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>;
229
+ compatible = "simple-audio-card";
230
+ simple-audio-card,format = "i2s";
231
+ simple-audio-card,name = "rockchip,rk809-codec";
232
+ simple-audio-card,mclk-fs = <256>;
233
+
234
+ simple-audio-card,cpu {
235
+ sound-dai = <&i2s1_8ch>;
236
+ };
237
+ simple-audio-card,codec {
238
+ sound-dai = <&rk809_codec>;
239
+ };
226240 };
227241
228242 spdif-sound {
229243 status = "okay";
230244 compatible = "simple-audio-card";
231245 simple-audio-card,name = "ROCKCHIP,SPDIF";
232
- simple-audio-card,mclk-fs = <128>;
233246 simple-audio-card,cpu {
234247 sound-dai = <&spdif_8ch>;
235248 };
....@@ -317,7 +330,6 @@
317330 regulator-min-microvolt = <3300000>;
318331 regulator-max-microvolt = <3300000>;
319332 enable-active-high;
320
- gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
321333 vin-supply = <&vcc3v3_sys>;
322334
323335 regulator-state-mem {
....@@ -332,7 +344,6 @@
332344 regulator-min-microvolt = <3300000>;
333345 regulator-max-microvolt = <3300000>;
334346 enable-active-high;
335
- gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
336347 vin-supply = <&vcc3v3_sys>;
337348
338349 regulator-state-mem {
....@@ -361,6 +372,8 @@
361372 compatible = "wlan-platdata";
362373 rockchip,grf = <&grf>;
363374 wifi_chip_type = "ap6398s";
375
+ clocks = <&rk809 1>;
376
+ clock-names = "ext_clock";
364377 status = "okay";
365378 };
366379
....@@ -397,6 +410,7 @@
397410 &dfi {
398411 status = "okay";
399412 };
413
+
400414
401415 &dmc {
402416 center-supply = <&vdd_logic>;
....@@ -1234,7 +1248,7 @@
12341248 };
12351249
12361250 rk809_codec: codec {
1237
- #sound-dai-cells = <1>;
1251
+ #sound-dai-cells = <0>;
12381252 compatible = "rockchip,rk809-codec", "rockchip,rk817-codec";
12391253 clocks = <&cru I2S1_MCLKOUT>;
12401254 clock-names = "mclk";
....@@ -1288,7 +1302,6 @@
12881302 };
12891303
12901304 &i2s3_2ch {
1291
- pinctrl-0 = <&i2s3m0_sclk &i2s3m0_lrck &i2s3m0_sdi &i2s3m0_sdo>;
12921305 rockchip,bclk-fs = <32>;
12931306 status = "disabled";
12941307 };
....@@ -1329,11 +1342,6 @@
13291342
13301343 &pinctrl {
13311344
1332
- headphone {
1333
- hp_det: hp-det {
1334
- rockchip,pins = <3 RK_PA1 RK_FUNC_GPIO &pcfg_pull_down>;
1335
- };
1336
- };
13371345
13381346 mxc6655xa {
13391347 mxc6655xa_irq_gpio: mxc6655xa_irq_gpio {
....@@ -1435,7 +1443,7 @@
14351443 };
14361444
14371445 &pwm7 {
1438
- status = "okay";
1446
+ status = "disabled";
14391447
14401448 compatible = "rockchip,remotectl-pwm";
14411449 remote_pwm_id = <3>;
....@@ -1610,7 +1618,7 @@
16101618 };
16111619
16121620 &spdif_8ch {
1613
- status = "okay";
1621
+ status = "disabled";
16141622 };
16151623
16161624 &tsadc {