shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

arm64: dts: rockchip: rk3588-*: Enable HDMI Jack

Browse Source 
This patch use rockchip-hdmi machine driver instead of
simple-card to support jack detection.

And also replace card name ',' to '-' to support pluseaudio.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I0e085225e89847671e958d0985d678240fdd6295
This commit is contained in:
Sugar Zhang
2023-03-14 15:45:11 +08:00
committed by Tao Huang
parent 53222b0849
commit fcd99057b0
2 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi
View File

@@ -50,32 +50,22 @@
hdmi0_sound: hdmi0-sound {
status = "disabled";
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,mclk-fs = <128>;
simple-audio-card,name = "rockchip,hdmi0";
simple-audio-card,cpu {
sound-dai = <&i2s5_8ch>;
};
simple-audio-card,codec {
sound-dai = <&hdmi0>;
};
compatible = "rockchip,hdmi";
rockchip,mclk-fs = <128>;
rockchip,card-name = "rockchip-hdmi0";
rockchip,cpu = <&i2s5_8ch>;
rockchip,codec = <&hdmi0>;
rockchip,jack-det;
};
hdmi1_sound: hdmi1-sound {
status = "disabled";
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,mclk-fs = <128>;
simple-audio-card,name = "rockchip,hdmi1";
simple-audio-card,cpu {
sound-dai = <&i2s6_8ch>;
};
simple-audio-card,codec {
sound-dai = <&hdmi1>;
};
compatible = "rockchip,hdmi";
rockchip,mclk-fs = <128>;
rockchip,card-name = "rockchip-hdmi1";
rockchip,cpu = <&i2s6_8ch>;
rockchip,codec = <&hdmi1>;
rockchip,jack-det;
};
test-power {

17
arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi
View File

@@ -96,17 +96,12 @@
hdmi0_sound: hdmi0-sound {
status = "disabled";
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,mclk-fs = <128>;
simple-audio-card,name = "rockchip,hdmi0";
simple-audio-card,cpu {
sound-dai = <&i2s5_8ch>;
};
simple-audio-card,codec {
sound-dai = <&hdmi0>;
};
compatible = "rockchip,hdmi";
rockchip,mclk-fs = <128>;
rockchip,card-name = "rockchip-hdmi0";
rockchip,cpu = <&i2s5_8ch>;
rockchip,codec = <&hdmi0>;
rockchip,jack-det;
};
spdif_tx1_dc: spdif-tx1-dc {