From 41fc10da8d9d57ced722ac843edc98ec6e5ec8b3 Mon Sep 17 00:00:00 2001
From: Sugar Zhang <sugar.zhang@rock-chips.com>
Date: Mon, 24 Sep 2018 15:35:16 +0800
Subject: [PATCH] arm64: dts: rockchip: rk1808: enable rk809 sound and vad
 sound for i2s

Change-Id: I671db6107e1486312411b44b4fb8ac352400be1a
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
---
 .../boot/dts/rockchip/rk1808-evb-v10.dts      | 31 +++++++++++++++++++
 arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi  | 22 +++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts
index 6c636f83a24c..1ee5fc7324d5 100644
--- a/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk1808-evb-v10.dts
@@ -14,6 +14,14 @@ / {
 	chosen {
 		bootargs = "earlycon=uart8250,mmio32,0xff550000 console=ttyFIQ0 root=/dev/mmcblk1p8 rootfstype=ext4 rootwait swiotlb=1 kpti=0";
 	};
+
+	vad-sound {
+		status = "okay";
+		compatible = "rockchip,multicodecs-card";
+		rockchip,card-name = "rockchip,rk1808-vad";
+		rockchip,cpu = <&i2s0>;
+		rockchip,codec = <&vad>;
+	};
 };
 
 &display_subsystem {
@@ -113,14 +121,37 @@ timing0: timing0 {
 	};
 };
 
+&i2s0 {
+	status = "okay";
+	#sound-dai-cells = <0>;
+};
+
+&i2s1 {
+	status = "okay";
+	#sound-dai-cells = <0>;
+};
+
 &mipi_dphy {
 	status = "okay";
 };
 
+&rk809_sound {
+	status = "okay";
+};
+
 &route_dsi {
 	status = "disabled";
 };
 
+&vad {
+	status = "okay";
+	rockchip,audio-src = <&i2s0>;
+	rockchip,buffer-time-ms = <200>;
+	rockchip,det-channel = <0>;
+	rockchip,mode = <1>;
+	#sound-dai-cells = <0>;
+};
+
 &vop_lite {
 	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi
index 8dcaa75e0902..3b2b2e712e55 100644
--- a/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk1808-evb.dtsi
@@ -124,6 +124,28 @@ ramoops: ramoops {
 		memory-region = <&ramoops_mem>;
 	};
 
+	rk809_sound: rk809-sound {
+		status = "disabled";
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,name = "rockchip,rk809-codec";
+		simple-audio-card,mclk-fs = <256>;
+		simple-audio-card,widgets =
+			"Microphone", "Mic Jack",
+			"Headphone", "Headphone Jack";
+		simple-audio-card,routing =
+			"Mic Jack", "MICBIAS1",
+			"IN1P", "Mic Jack",
+			"Headphone Jack", "HPOL",
+			"Headphone Jack", "HPOR";
+		simple-audio-card,cpu {
+			sound-dai = <&i2s1>;
+		};
+		simple-audio-card,codec {
+			sound-dai = <&rk809_codec>;
+		};
+	};
+
 	sdio_pwrseq: sdio-pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		pinctrl-names = "default";