From de20d58ea2942054e2d70bea6b7f4794adb38436 Mon Sep 17 00:00:00 2001
From: Sugar Zhang <sugar.zhang@rock-chips.com>
Date: Tue, 5 Sep 2017 18:46:52 +0800
Subject: [PATCH] arm64: dts: rockchip: enable rk1000 and hdmi sound for
 rk3368-r88

Change-Id: I8d66b85ca07eed15897dffda0def9166decaa519
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
---
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 26 +++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
index 2b9e00f1764f..f63d964ef891 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
@@ -58,18 +58,10 @@
 		pwms = <&pwm1 0 30518 0>; /* 1 / 30518 ns = 32.7675 KHz */
 	};
 
-	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 = <&i2s_8ch>;
-		};
-		simple-audio-card,codec {
-			sound-dai = <&hdmi>;
-		};
+	sound {
+		compatible = "rockchip,rk3368-hdmi-analog";
+		rockchip,cpu = <&i2s_8ch>;
+		rockchip,codec = <&rk1000_codec>, <&hdmi>;
 	};
 
 	keys: gpio-keys {
@@ -463,6 +455,16 @@
 			};
 		};
 	};
+
+	rk1000_codec: rk1000-codec@60 {
+		compatible = "rockchip,rk1000-codec";
+		reg = <0x60>;
+		#sound-dai-cells = <0>;
+		rockchip,ctl = <&rk1000_ctl>;
+		rockchip,spk-en-gpio = <&gpio3 31 GPIO_ACTIVE_LOW>;
+		rockchip,pa-en-time-ms = <5000>;
+		status = "okay";
+	};
 };
 
 &lvds {