From b16920aaa402b71a9f54dc204a62fdc56a0de584 Mon Sep 17 00:00:00 2001
From: Zhe Wang <Zhe.Wang@amlogic.com>
Date: Fri, 13 Apr 2018 21:52:45 +0800
Subject: [PATCH] dts: axg: fixed audio dts error of U211 & U221

PD#163841: change dts for U211 & U221

Change-Id: I49e3a5fb7d740aa77e277f97c1fea14bd9b9da71
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
---
 .../boot/dts/amlogic/g12a_s905x2_u211.dts     | 35 +++++++++----------
 .../boot/dts/amlogic/g12a_s905y2_u221.dts     |  8 ++---
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts
index bdfecfda6121..3a36b8dce983 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts
@@ -544,7 +544,7 @@
 			};
 			tdmbcodec: codec {
 				sound-dai = <&dummy_codec &dummy_codec
-				&amlogic_codec &ad82584f_62>;
+					&amlogic_codec>;
 			};
 		};
 
@@ -752,7 +752,7 @@
 };
 
 &i2c3 {
-	status = "okay";
+	status = "disabled";
 	pinctrl-names="default";
 	pinctrl-0=<&i2c3_master_pins2>;
 	clock-frequency = <100000>; /* default 100k */
@@ -762,7 +762,7 @@
 		compatible = "ESMT, ad82584f";
 		#sound-dai-cells = <0>;
 		reg = <0x31>;
-		status = "okay";
+		status = "disabled";
 		reset_pin = <&gpio GPIOA_5 0>;
 	};
 
@@ -864,7 +864,7 @@
 
 		interrupt-names = "irq_spdifin";
 		pinctrl-names = "spdif_pins";
-		pinctrl-0 = <&spdifout &spdifin>;
+		pinctrl-0 = <&spdifout>;
 		status = "okay";
 	};
 	aml_spdif_b: spdif_b {
@@ -1050,14 +1050,12 @@
 	};
 
 	/* GPIOH_4 */
-	/*
-	 * spdifout: spdifout {
-	 *	mux {
-	 *		groups = "spdif_out_h";
-	 *		function = "spdif_out";
-	 *	};
-	 *};
-	 */
+	spdifout: spdifout {
+		mux {
+			groups = "spdif_out_h";
+			function = "spdif_out";
+		};
+	};
 
 	pdmin: pdmin {
 		mux { /* gpioa_5, gpioa_6, gpioa_7, gpioa_8, gpioa_9*/
@@ -1073,12 +1071,13 @@
 
 }; /* end of pinctrl_periphs */
 &pinctrl_aobus {
-	spdifout: spdifout {
-		mux { /* gpiao_10 */
-			groups = "spdif_out_ao";
-			function = "spdif_out_ao";
-		};
-	};
+	/*gpiao_10*/
+	/*spdifout: spdifout {			  */
+	/*	mux {						  */
+	/*		groups = "spdif_out_ao";  */
+	/*		function = "spdif_out_ao";*/
+	/*	};							  */
+	/*};							  */
 };  /* end of pinctrl_aobus */
 
 &audio_data {
diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts
index 32fc792e5f9b..318249613639 100644
--- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts
+++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_u221.dts
@@ -520,7 +520,7 @@
 			};
 			tdmbcodec: codec {
 				sound-dai = <&dummy_codec &dummy_codec
-				&amlogic_codec &ad82584f_62>;
+					&amlogic_codec>;
 			};
 		};
 
@@ -728,7 +728,7 @@
 };
 
 &i2c3 {
-	status = "okay";
+	status = "disabled";
 	pinctrl-names="default";
 	pinctrl-0=<&i2c3_master_pins2>;
 	clock-frequency = <100000>; /* default 100k */
@@ -738,7 +738,7 @@
 		compatible = "ESMT, ad82584f";
 		#sound-dai-cells = <0>;
 		reg = <0x31>;
-		status = "okay";
+		status = "disabled";
 		reset_pin = <&gpio GPIOA_5 0>;
 	};
 
@@ -840,7 +840,7 @@
 
 		interrupt-names = "irq_spdifin";
 		pinctrl-names = "spdif_pins";
-		pinctrl-0 = <&spdifout &spdifin>;
+		/*pinctrl-0 = <&spdifout &spdifin>;*/
 		status = "okay";
 	};
 	aml_spdif_b: spdif_b {