From: Sugar Zhang <sugar.zhang@rock-chips.com>
Date: Thu, 9 Mar 2017 07:47:07 +0000 (+0800)
Subject: ARM64: dts: rk3399 box: enable hdmi_dp_sound
X-Git-Tag: firefly_0821_release~376
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=96d9f37fa54324d4e85c070fc7aba23e1af9f460;p=firefly-linux-kernel-4.4.55.git

ARM64: dts: rk3399 box: enable hdmi_dp_sound

Change-Id: I04bdec75510b3e47a62a5093fdbd6ec66926e282
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
---

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
index b34e3bdbffb3..63044f075c6f 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
@@ -131,20 +131,6 @@
 		#sound-dai-cells = <0>;
 	};
 
-	hdmi_sound: hdmi-sound {
-		status = "okay";
-		compatible = "simple-audio-card";
-		simple-audio-card,format = "i2s";
-		simple-audio-card,mclk-fs = <256>;
-		simple-audio-card,name = "rockchip,hdmi";
-		simple-audio-card,cpu {
-			sound-dai = <&i2s2>;
-		};
-		simple-audio-card,codec {
-			sound-dai = <&hdmi>;
-		};
-	};
-
 	sdio_pwrseq: sdio-pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		clocks = <&rk808 1>;
@@ -191,6 +177,10 @@
 	};
 };
 
+&hdmi_dp_sound {
+	status = "okay";
+};
+
 &sdmmc {
 	clock-frequency = <100000000>;
 	clock-freq-min-max = <100000 100000000>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts
index 39636620812f..f01fb0cece95 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-box.dts
@@ -54,11 +54,7 @@
 	};
 };
 
-&dw_hdmi_audio {
-	status = "okay";
-};
-
-&hdmi_sound {
+&hdmi_dp_sound {
 	status = "okay";
 };