From e3eeb98a0e563f08a667a34b70cf2a36badeb4e7 Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Thu, 4 Nov 2021 11:15:54 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3588-evb: Add dsm/spdif sound node Signed-off-by: Sugar Zhang Change-Id: Id6092de38839391cdf006b3d633de04699777ffe --- arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi | 18 +++++++++ .../boot/dts/rockchip/rk3588-evb5-lp4.dtsi | 39 +++++++++++++++++++ arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi | 18 +++++++++ .../boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi | 14 +++++++ .../boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi | 14 +++++++ 5 files changed, 103 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi index dbdcab60f858..fbe0a01378f5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb.dtsi @@ -52,6 +52,24 @@ }; }; + spdif_tx1_dc: spdif-tx1-dc { + status = "disabled"; + compatible = "linux,spdif-dit"; + #sound-dai-cells = <0>; + }; + + spdif_tx1_sound: spdif-tx1-sound { + status = "disabled"; + compatible = "simple-audio-card"; + simple-audio-card,name = "rockchip,spdif-tx1"; + simple-audio-card,cpu { + sound-dai = <&spdif_tx1>; + }; + simple-audio-card,codec { + sound-dai = <&spdif_tx1_dc>; + }; + }; + test-power { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb5-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb5-lp4.dtsi index e3661054735b..0e6953f107a6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb5-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb5-lp4.dtsi @@ -9,6 +9,21 @@ #include "rk806-double.dtsi" / { + dsm_sound: dsm-sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,name = "rockchip,dsm-sound"; + simple-audio-card,bitclock-master = <&sndcodec>; + simple-audio-card,frame-master = <&sndcodec>; + sndcpu: simple-audio-card,cpu { + sound-dai = <&i2s3_2ch>; + }; + sndcodec: simple-audio-card,codec { + sound-dai = <&acdcdig_dsm>; + }; + }; + pcie20_avdd0v85: pcie20-avdd0v85 { compatible = "regulator-fixed"; regulator-name = "pcie20_avdd0v85"; @@ -57,6 +72,10 @@ }; }; +&acdcdig_dsm { + status = "okay"; +}; + &i2c6 { status = "okay"; gt1x: gt1x@14 { @@ -69,6 +88,12 @@ }; }; +&i2s3_2ch { + status = "okay"; + /delete-property/ pinctrl-names; + /delete-property/ pinctrl-0; +}; + &pcie2x1l0 { reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_pcie30>; @@ -110,6 +135,20 @@ }; }; +&spdif_tx1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&spdif1m0_tx>; +}; + +&spdif_tx1_dc { + status = "okay"; +}; + +&spdif_tx1_sound { + status = "okay"; +}; + &usbdp_phy0 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi index fb863b027bed..d2142dd962ab 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb.dtsi @@ -48,6 +48,24 @@ status = "okay"; }; + spdif_tx1_dc: spdif-tx1-dc { + status = "disabled"; + compatible = "linux,spdif-dit"; + #sound-dai-cells = <0>; + }; + + spdif_tx1_sound: spdif-tx1-sound { + status = "disabled"; + compatible = "simple-audio-card"; + simple-audio-card,name = "rockchip,spdif-tx1"; + simple-audio-card,cpu { + sound-dai = <&spdif_tx1>; + }; + simple-audio-card,codec { + sound-dai = <&spdif_tx1_dc>; + }; + }; + vcc12v_dcin: vcc12v-dcin { compatible = "regulator-fixed"; regulator-name = "vcc12v_dcin"; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi index 524f81402c5c..92e50bca1b77 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi @@ -302,6 +302,20 @@ }; }; +&spdif_tx1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&spdif1m1_tx>; +}; + +&spdif_tx1_dc { + status = "okay"; +}; + +&spdif_tx1_sound { + status = "okay"; +}; + &u2phy2_host { phy-supply = <&vcc5v0_host>; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi index b4f1b79ba916..9c7e811013f1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi @@ -262,6 +262,20 @@ }; }; +&spdif_tx1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&spdif1m1_tx>; +}; + +&spdif_tx1_dc { + status = "okay"; +}; + +&spdif_tx1_sound { + status = "okay"; +}; + &u2phy2_host { phy-supply = <&vcc5v0_host>; };