From f6af151bc09ed5a82aaa5f88f52ffbe73acd7630 Mon Sep 17 00:00:00 2001
From: Sugar Zhang <sugar.zhang@rock-chips.com>
Date: Fri, 3 Aug 2018 19:41:20 +0800
Subject: [PATCH] arm64: dts: rockchip: rk3308-evb-amic-*: enable vad card
 default

Change-Id: I71958666fdb860952f33e68ab247b014b0b3a9f1
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
---
 .../boot/dts/rockchip/rk3308-evb-amic-v10.dts      | 14 ++++++++++++--
 .../boot/dts/rockchip/rk3308-evb-amic-v11.dts      | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts
index a2ee26b73f73..3b95d43c3900 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v10.dts
@@ -13,7 +13,7 @@
 	compatible = "rockchip,rk3308-evb-amic-v10", "rockchip,rk3308";
 
 	vad_acodec_sound: vad-acodec-sound {
-		status = "disabled";
+		status = "okay";
 		compatible = "rockchip,multicodecs-card";
 		rockchip,card-name = "rockchip,rk3308-vad";
 		rockchip,codec-hp-det;
@@ -23,6 +23,15 @@
 	};
 };
 
+&acodec {
+	rockchip,no-deep-low-power;
+	rockchip,en-always-grps = <0 1 2 3>;
+};
+
+&acodec_sound {
+	status = "disabled";
+};
+
 &bluetooth_sound {
 	status = "okay";
 };
@@ -38,8 +47,9 @@
 };
 
 &vad {
-	status = "disabled";
+	status = "okay";
 	rockchip,audio-src = <&i2s_8ch_2>;
+	rockchip,buffer-time-ms = <200>;
 	rockchip,mode = <1>;
 	#sound-dai-cells = <0>;
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts
index 387497f15e39..05bda2f38919 100644
--- a/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3308-evb-amic-v11.dts
@@ -12,7 +12,7 @@
 	compatible = "rockchip,rk3308-evb-amic-v11", "rockchip,rk3308";
 
 	vad_acodec_sound: vad-acodec-sound {
-		status = "disabled";
+		status = "okay";
 		compatible = "rockchip,multicodecs-card";
 		rockchip,card-name = "rockchip,rk3308-vad";
 		rockchip,codec-hp-det;
@@ -22,6 +22,15 @@
 	};
 };
 
+&acodec {
+	rockchip,no-deep-low-power;
+	rockchip,en-always-grps = <0 1 2 3>;
+};
+
+&acodec_sound {
+	status = "disabled";
+};
+
 &bluetooth_sound {
 	status = "okay";
 };
@@ -37,8 +46,9 @@
 };
 
 &vad {
-	status = "disabled";
+	status = "okay";
 	rockchip,audio-src = <&i2s_8ch_2>;
+	rockchip,buffer-time-ms = <200>;
 	rockchip,mode = <1>;
 	#sound-dai-cells = <0>;
 };