Skip to content

Commit

Permalink
arm64: dts: rock-5-itx: Fix hdmiin audio
Browse files Browse the repository at this point in the history
  • Loading branch information
Joshua-Riek committed Dec 14, 2023
1 parent 20ee0e6 commit 54c8fad
Showing 1 changed file with 12 additions and 19 deletions.
31 changes: 12 additions & 19 deletions arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
dp0_sound: dp0-sound {
status = "okay";
compatible = "rockchip,hdmi";
rockchip,card-name= "rockchip-dp0";
rockchip,card-name = "rockchip-dp0";
rockchip,mclk-fs = <512>;
rockchip,cpu = <&spdif_tx2>;
rockchip,codec = <&dp0 1>;
Expand All @@ -124,7 +124,7 @@
dp1_sound: dp1-sound {
status = "okay";
compatible = "rockchip,hdmi";
rockchip,card-name= "rockchip,dp1";
rockchip,card-name = "rockchip-dp1";
rockchip,mclk-fs = <512>;
rockchip,cpu = <&spdif_tx5>;
rockchip,codec = <&dp1 1>;
Expand Down Expand Up @@ -244,24 +244,16 @@
};
};

hdmiin_dc: hdmiin-dc {
compatible = "rockchip,dummy-codec";
#sound-dai-cells = <0>;
};

hdmiin-sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,name = "rockchip,hdmiin";
simple-audio-card,bitclock-master = <&dailink0_master>;
simple-audio-card,frame-master = <&dailink0_master>;
status = "okay";
simple-audio-card,cpu {
sound-dai = <&i2s7_8ch>;
};
dailink0_master: simple-audio-card,codec {
sound-dai = <&hdmiin_dc>;
};
compatible = "rockchip,hdmi";
rockchip,mclk-fs = <128>;
rockchip,format = "i2s";
rockchip,bitclock-master = <&hdmirx_ctrler>;
rockchip,frame-master = <&hdmirx_ctrler>;
rockchip,card-name = "rockchip-hdmiin";
rockchip,cpu = <&i2s7_8ch>;
rockchip,codec = <&hdmirx_ctrler 0>;
rockchip,jack-det;
};
};

Expand Down Expand Up @@ -620,6 +612,7 @@
&hdmirx_ctrler {
status = "okay";

#sound-dai-cells = <1>;
/* Effective level used to trigger HPD: 0-low, 1-high */
hpd-trigger-level = <1>;
hdmirx-det-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>;
Expand Down

0 comments on commit 54c8fad

Please sign in to comment.