From fcd99057b0e63e669342cd6c62b25fbbb851d53e Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Tue, 14 Mar 2023 15:45:11 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3588-*: Enable HDMI Jack 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 Change-Id: I0e085225e89847671e958d0985d678240fdd6295 --- arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi | 34 +++++++------------ arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi | 17 ++++------ 2 files changed, 18 insertions(+), 33 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi index c39c3252ee4b..d9f69e07dd70 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-nvr.dtsi @@ -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 { diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi index c8a1ded05051..6db4c5734836 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi @@ -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 {