From 27f039b43ada8d0301867505ce9a91d8b5c604bc Mon Sep 17 00:00:00 2001 From: Jianhui Wang Date: Thu, 24 Jan 2019 16:02:31 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3399-sapphire-excavator-edp: modify sound adapter HDMI sound use i2s2 & dp sound use spdif Change-Id: Id4ee15d3eb67dad1372f733ecf16182cc6488835 Signed-off-by: Jianhui Wang --- .../dts/rockchip/rk3399-sapphire-excavator-edp.dts | 12 ++++++++++++ arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts index 725e39f10556..417746709537 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts @@ -69,6 +69,18 @@ }; }; +&dp_sound { + status = "disabled"; +}; + +&hdmi_dp_sound { + status = "disabled"; +}; + +&hdmi_sound { + status = "okay"; +}; + &isp0 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi index 5728818893c2..9d8297c5cc41 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -100,6 +100,13 @@ #sound-dai-cells = <0>; }; + dp_sound: dp-sound { + status = "disabled"; + compatible = "rockchip,cdndp-sound"; + rockchip,cpu = <&spdif>; + rockchip,codec = <&cdn_dp 1>; + }; + hdmi_sound: hdmi-sound { status = "disabled"; compatible = "simple-audio-card";