ARM64: dts: rk3399: enable cdn_dp_fb for box

Change-Id: Idf28d25381b20e1a92193a3a825405a6ef41dfa5
Signed-off-by: xuhuicong <xhc@rock-chips.com>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi
index faa71bda379572d603be135a1855add4c07fb7b9..0e963032c667f387352cc79a2920346d701c7acb 100644 (file)
--- 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 0b77d2de768a11087a38ee87062d5e7784bb9329..1d5d6cbecb21677e79eda6efdb6f72dae8597040 100644 (file)
--- 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 = <DISPLAY_SOURCE_LCDC0>;
 };
 
+&cdn_dp_sound {
+       status = "okay";
+};
+
+&cdn_dp_fb {
+       status = "okay";
+       extcon = <&fusb0>;
+       phys = <&tcphy0 0>;
+};
+
 &i2s2 {
        status = "okay";
 };