From b7b36e0653d03bc03efdf84010fdaf6625eadbc2 Mon Sep 17 00:00:00 2001 From: Hongming Zou Date: Sat, 11 Feb 2023 10:39:49 +0800 Subject: [PATCH] ARM: dts: rockchip: rk3036-evb1: add support multi-sounds and spdif-sound Change-Id: Id0f7286003f08aeb0632a28cf1f08c1f2799010b Signed-off-by: Hongming Zou --- arch/arm/boot/dts/rk3036-evb1-ddr3-v10.dts | 64 ++++++++++++++++++++-- 1 file changed, 59 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/rk3036-evb1-ddr3-v10.dts b/arch/arm/boot/dts/rk3036-evb1-ddr3-v10.dts index 9884deec143a..2936812493f5 100644 --- a/arch/arm/boot/dts/rk3036-evb1-ddr3-v10.dts +++ b/arch/arm/boot/dts/rk3036-evb1-ddr3-v10.dts @@ -22,12 +22,60 @@ reg = <0x60000000 0x20000000>; }; - multi_sound: multi-sound { + multi_sounds: multi-sounds { status = "okay"; - compatible = "rockchip,multicodecs-card"; - rockchip,card-name = "rockchip,hdmi-codec"; - rockchip,cpu = <&i2s>; - rockchip,codec = <&acodec>, <&hdmi>; + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,name = "rockchip,rk3036-sounds"; + simple-audio-card,dai-link@0 { + format = "i2s"; + cpu { + sound-dai = <&i2s>; + }; + codec { + sound-dai = <&acodec>; + }; + }; + simple-audio-card,dai-link@1 { + format = "i2s"; + cpu { + sound-dai = <&i2s>; + }; + codec { + sound-dai = <&hdmi>; + }; + }; + simple-audio-card,dai-link@2 { + format = "i2s"; + cpu { + sound-dai = <&i2s>; + }; + codec { + sound-dai = <&es8311>; + }; + }; + }; + + spdiftx_codec: spdiftx-codec { + status = "okay"; + compatible = "linux,spdif-dit"; + #sound-dai-cells = <0>; + }; + + spdif_sound: spdif-sound { + status = "okay"; + compatible = "simple-audio-card"; + simple-audio-card,name = "rockchip,spdif-sound"; + simple-audio-card,dai-link { + mclk-fs = <256>; + cpu { + sound-dai = <&spdif_tx>; + }; + codec { + sound-dai = <&spdiftx_codec>; + }; + }; }; vdd_arm: vdd-arm-regulator { @@ -118,6 +166,7 @@ }; &hdmi { + #sound-dai-cells = <0>; status = "okay"; }; @@ -437,6 +486,11 @@ status = "okay"; }; +&spdif_tx { + status = "okay"; + #sound-dai-cells = <0>; +}; + &pinctrl { usb { host_vbus_drv: host-vbus-drv {