hc
2023-11-06 e3e12f52b214121840b44c91de5b3e5af5d3eb84
kernel/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi
....@@ -35,13 +35,23 @@
3535 compatible = "simple-audio-card";
3636 simple-audio-card,format = "i2s";
3737 simple-audio-card,mclk-fs = <256>;
38
- simple-audio-card,name = "rockchip,i2s1-sound";
38
+ simple-audio-card,name = "rockchip-i2s1";
3939 simple-audio-card,cpu {
4040 sound-dai = <&i2s1_8ch>;
4141 };
4242 simple-audio-card,codec {
4343 sound-dai = <&es8311>;
4444 };
45
+ };
46
+
47
+ rk618_hdmi_sound: rk618-hdmi-sound {
48
+ status = "okay";
49
+ compatible = "rockchip,hdmi";
50
+ rockchip,mclk-fs = <128>;
51
+ rockchip,card-name = "rk618-hdmi";
52
+ rockchip,cpu = <&spdif_8ch>;
53
+ rockchip,codec = <&rk618_hdmi>;
54
+ rockchip,jack-det;
4555 };
4656
4757 vcc2v5_sys: vcc2v5-ddr {
....@@ -230,7 +240,7 @@
230240 status = "okay";
231241 };
232242
233
- hdmi {
243
+ rk618_hdmi: hdmi {
234244 compatible = "rockchip,rk618-hdmi";
235245 clocks = <&clock HDMI_CLK>;
236246 clock-names = "hdmi";
....@@ -238,6 +248,8 @@
238248 assigned-clock-parents = <&clock VIF0_CLK>;
239249 interrupt-parent = <&gpio0>;
240250 interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
251
+ rockchip,format = "spdif";
252
+ #sound-dai-cells = <0>;
241253 status = "okay";
242254
243255 ports {
....@@ -420,6 +432,20 @@
420432 status = "okay";
421433 };
422434
435
+&spdif_out {
436
+ status = "disabled";
437
+};
438
+
439
+&spdif_sound {
440
+ status = "disabled";
441
+};
442
+
443
+&spdif_8ch {
444
+ status = "okay";
445
+ pinctrl-names = "default";
446
+ pinctrl-0 = <&spdifm1_tx>;
447
+};
448
+
423449 &pinctrl {
424450 rk618 {
425451 rk618_reset: rk618-reeset {