From: Zhe Wang <Zhe.Wang@amlogic.com>
Date: Mon, 15 Apr 2019 08:32:43 +0000 (+0800)
Subject: audio: AB311 bringup, init 2 AMPs AD82584f [1/1]
X-Git-Tag: hardkernel-4.9.236-104~1423
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6fc1d727ca016532ab2b4bade7f7ba01e32ec3c;p=platform%2Fkernel%2Flinux-amlogic.git

audio: AB311 bringup, init 2 AMPs AD82584f [1/1]

PD#SWPL-7174

Problem:
spk is out of work on AB311

Solution:
bringup AMP ad82584f

Verify:
AB311

Change-Id: I8771fc204b19eeebed5247ec4c8984acbf004372
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>
---

diff --git a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
index 8cafa90..c2eb5ba 100644
--- a/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
+++ b/arch/arm/boot/dts/amlogic/tm2_t962e2_ab311.dts
@@ -320,12 +320,12 @@
 			};
 			tdmacodec: codec {
 				//sound-dai = <&dummy_codec>;
-				sound-dai = </*&ad82584f*/ &tl1_codec>;
+				prefix-names = "AMP", "AMP1";
+				sound-dai = <&ad82584f &ad82584f1 &tl1_codec>;
 			};
 		};
 
 		aml-audio-card,dai-link@1 {
-			status = "disabled";
 
 			format = "i2s";
 			mclk-fs = <256>;
@@ -1444,8 +1444,8 @@
 
 		pinctrl-names = "spdif_pins",
 				"spdif_pins_mute";
-		pinctrl-0 = <&spdifout_a>;
-		pinctrl-1 = <&spdifout_a_mute>;
+		pinctrl-0 = <&spdifin_a>;
+		//pinctrl-1 = <&spdifout_a_mute>;
 
 		/*
 		 * whether do asrc for pcm and resample a or b
@@ -1764,14 +1764,21 @@
 	pinctrl-0=<&i2c3_h1_pins>;
 	clock-frequency = <400000>;
 
-	ad82584f: ad82584f@62 {
+	ad82584f: ad82584f@60 {
 		compatible = "ESMT, ad82584f";
 		#sound-dai-cells = <0>;
-		reg = <0x31>;
-		status = "disabled";
+		reg = <0x30>;
+		status = "okay";
 		reset_pin = <&gpio GPIOH_13 0>;
 		no_mclk;
 	};
+	ad82584f1: ad82584f@62 {
+		compatible = "ESMT, ad82584f";
+		#sound-dai-cells = <0>;
+		reg = <0x31>;
+		status = "okay";
+		no_mclk;
+	};
 };
 
 &sd_emmc_c {
@@ -1870,8 +1877,8 @@
 
 &ethmac {
 	status = "okay";
-	pinctrl-names = "internal_eth_pins";
-	pinctrl-0 = <&internal_eth_pins>;
+	//pinctrl-names = "internal_eth_pins";
+	//pinctrl-0 = <&internal_eth_pins>;
 	mc_val = <0x4be04>;
 
 	internal_phy=<1>;
diff --git a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
index c29d582..a779ab6 100644
--- a/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
+++ b/arch/arm64/boot/dts/amlogic/tm2_t962e2_ab311.dts
@@ -316,7 +316,8 @@
 			};
 			tdmacodec: codec {
 				//sound-dai = <&dummy_codec>;
-				sound-dai = </*&ad82584f*/ &tl1_codec>;
+				prefix-names = "AMP", "AMP1";
+				sound-dai = <&ad82584f &ad82584f1 &tl1_codec>;
 			};
 		};
 
@@ -1441,8 +1442,8 @@
 
 		pinctrl-names = "spdif_pins",
 				"spdif_pins_mute";
-		pinctrl-0 = <&spdifout_a>;
-		pinctrl-1 = <&spdifout_a_mute>;
+		pinctrl-0 = <&spdifin_a>;
+		//pinctrl-1 = <&spdifout_a_mute>;
 
 		/*
 		 * whether do asrc for pcm and resample a or b
@@ -1756,14 +1757,22 @@
 	pinctrl-0=<&i2c3_h1_pins>;
 	clock-frequency = <400000>;
 
-	ad82584f: ad82584f@62 {
+	ad82584f: ad82584f@60 {
 		compatible = "ESMT, ad82584f";
 		#sound-dai-cells = <0>;
-		reg = <0x31>;
-		status = "disabled";
+		reg = <0x30>;
+		status = "okay";
 		reset_pin = <&gpio GPIOH_13 0>;
 		no_mclk;
 	};
+
+	ad82584f1: ad82584f@62 {
+		compatible = "ESMT, ad82584f";
+		#sound-dai-cells = <0>;
+		reg = <0x31>;
+		status = "okay";
+		no_mclk;
+	};
 };
 
 
@@ -1863,8 +1872,8 @@
 
 &ethmac {
 	status = "okay";
-	pinctrl-names = "internal_eth_pins";
-	pinctrl-0 = <&internal_eth_pins>;
+	//pinctrl-names = "internal_eth_pins";
+	//pinctrl-0 = <&internal_eth_pins>;
 	mc_val = <0x4be04>;
 
 	internal_phy=<1>;