From bcd526456fafb8935df7d9500d0f57b1c278897b Mon Sep 17 00:00:00 2001
From: Binyuan Lan <lby@rock-chips.com>
Date: Wed, 16 Dec 2020 09:34:02 +0000
Subject: [PATCH] arm64: dts: rockchip: Fixed sound card configuration for
 rk3566-rk817-tablet-rkg11

Signed-off-by: Binyuan Lan <lby@rock-chips.com>
Change-Id: Ic51409e9e0e05459277292b14801cdde79046230
---
 .../rockchip/rk3566-rk817-tablet-rkg11.dts    | 43 +++++++++++++++++--
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts
index 9d7a10246920..13e89445fb05 100644
--- a/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-rk817-tablet-rkg11.dts
@@ -87,6 +87,21 @@
 		status = "okay";
 	};
 
+	es7210_sound: es7210-sound {
+		status = "okay";
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,mclk-fs = <256>;
+		simple-audio-card,name = "rockchip,es7210";
+
+		simple-audio-card,cpu {
+			sound-dai = <&i2s1_8ch>;
+		};
+		simple-audio-card,codec {
+			sound-dai = <&es7210>;
+		};
+	};
+
 	vccsys: vccsys {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc3v8_sys";
@@ -660,6 +675,18 @@
 			enable-gpios = <&gpio0 RK_PC0 GPIO_ACTIVE_HIGH>;
 		};
 	};
+
+	es7210: es7210@43 {
+		#sound-dai-cells = <0>;
+		compatible = "ES7210_MicArray_0";
+		reg = <0x43>;
+		clocks = <&cru I2S1_MCLKOUT_RX>;
+		clock-names = "mclk";
+		assigned-clocks = <&cru I2S1_MCLKOUT_RX>;
+		assigned-clock-parents = <&cru CLK_I2S1_8CH_RX>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&i2s1m0_mclk>;
+	};
 };
 
 &i2c2 {
@@ -816,16 +843,24 @@
 &i2s1_8ch {
 	status = "okay";
 	#sound-dai-cells = <0>;
+	rockchip,clk-trcm = <2>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2s1m0_sclkrx
+		     &i2s1m0_lrckrx
+		     &i2s1m0_sdi0
+		     &i2s1m0_sdi1
+		     &i2s1m0_sdi2
+		     &i2s1m0_sdi3>;
 };
 
 &i2s3_2ch {
 	status = "okay";
-	rockchip,clk-trcm = <2>;
+	rockchip,clk-trcm = <1>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2s3m1_sclk
-			     &i2s3m1_lrck
-			     &i2s3m1_sdi
-			     &i2s3m1_sdo>;
+		     &i2s3m1_lrck
+		     &i2s3m1_sdi
+		     &i2s3m1_sdo>;
 };
 
 &jpegd {