From 96d2abbde3f29d9c3a6d3f1d5ef3bcdcec48f020 Mon Sep 17 00:00:00 2001 From: xuhuicong Date: Wed, 24 Aug 2016 22:56:17 +0800 Subject: [PATCH] ARM64: dts: rk3399: enable cdn_dp_fb for box Change-Id: Idf28d25381b20e1a92193a3a825405a6ef41dfa5 Signed-off-by: xuhuicong --- arch/arm64/boot/dts/rockchip/rk3399-android.dtsi | 11 ----------- arch/arm64/boot/dts/rockchip/rk3399-box.dtsi | 12 +++++++++++- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi index faa71bda3795..0e963032c667 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi @@ -200,17 +200,6 @@ sound-dai = <&cdn_dp_fb 0>; }; }; - - simple-audio-card,dai-link@1 { - format = "spdif"; - cpu { - sound-dai = <&spdif>; - }; - - codec { - sound-dai = <&cdn_dp_fb 1>; - }; - }; }; vpu: vpu_service@ff650000 { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi index 0b77d2de768a..1d5d6cbecb21 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi @@ -147,7 +147,7 @@ }; hdmi_sound: hdmi-sound { - status = "okay"; + status = "disabled"; compatible = "simple-audio-card"; simple-audio-card,format = "i2s"; simple-audio-card,mclk-fs = <256>; @@ -957,6 +957,16 @@ rockchip,hdmi_video_source = ; }; +&cdn_dp_sound { + status = "okay"; +}; + +&cdn_dp_fb { + status = "okay"; + extcon = <&fusb0>; + phys = <&tcphy0 0>; +}; + &i2s2 { status = "okay"; }; -- 2.34.1