From 65bacce134b2855a1b3b66e18ff5334d21c08c8b Mon Sep 17 00:00:00 2001
From: wlq <wlq@rock-chips.com>
Date: Thu, 23 Feb 2017 09:15:13 +0800
Subject: [PATCH] arm64: dts: rk3399: sapphire-excavator: enabled hdmi sound

Change-Id: If95f0b885aa3afdbaa985b4b39628502075be90e
Signed-off-by: wlq <wlq@rock-chips.com>
---
 .../rk3399-sapphire-excavator-edp.dts         | 69 +++++++++++++------
 .../boot/dts/rockchip/rk3399-sapphire.dtsi    |  2 +-
 2 files changed, 50 insertions(+), 21 deletions(-)

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 d4d609f3449f..08cc37536bb5 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator-edp.dts
@@ -44,6 +44,7 @@
 
 #include "rk3399-excavator-sapphire.dtsi"
 #include "rk3399-android.dtsi"
+#include "rk3399-vop-clk-set.dtsi"
 
 / {
 	model = "Rockchip RK3399 Excavator Board edp (Android)";
@@ -65,10 +66,48 @@
 	test-power {
 		status = "okay";
 	};
+
+	rt5651 {
+		status = "okay";
+	};
 };
 
 &backlight {
 	status = "okay";
+	enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
+};
+
+&edp {
+	status = "okay";
+
+	ports {
+		edp_out: port@1 {
+			reg = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			edp_out_panel: endpoint@0 {
+				reg = <0>;
+				remote-endpoint = <&panel_in_edp>;
+			};
+		};
+	};
+};
+
+&edp_in_vopl {
+	status = "disabled";
+};
+
+&hdmi {
+	status = "okay";
+};
+
+&hdmi_in_vopb {
+	status = "disabled";
+};
+
+&hdmi_sound {
+	status = "okay";
 };
 
 &i2s2 {
@@ -88,21 +127,18 @@
 	};
 };
 
-&edp {
-	status = "okay";
+&vopb {
+	assigned-clocks = <&cru DCLK_VOP0_DIV>;
+	assigned-clock-parents = <&cru PLL_CPLL>;
+};
 
-	ports {
-		edp_out: port@1 {
-			reg = <1>;
-			#address-cells = <1>;
-			#size-cells = <0>;
+&vopl {
+	assigned-clocks = <&cru DCLK_VOP1_DIV>;
+	assigned-clock-parents = <&cru PLL_VPLL>;
+};
 
-			edp_out_panel: endpoint@0 {
-				reg = <0>;
-				remote-endpoint = <&panel_in_edp>;
-			};
-		};
-	};
+&route_edp {
+	status = "okay";
 };
 
 &pinctrl {
@@ -113,10 +149,3 @@
 	};
 };
 
-&backlight{
-	enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
-};
-
-&route_edp {
-	status = "okay";
-};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
index 43caa3514983..2574d30fe15e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -111,7 +111,7 @@
 			sound-dai = <&i2s2>;
 		};
 		simple-audio-card,codec {
-			sound-dai = <&dw_hdmi_audio>;
+			sound-dai = <&hdmi>;
 		};
 	};
 
-- 
2.34.1