From: Gongwei Chen <gongwei.chen@amlogic.com>
Date: Fri, 31 May 2019 06:59:10 +0000 (+0800)
Subject: audio: Speaker has no sound [1/1]
X-Git-Tag: khadas-vims-v0.9.6-release~420
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2aa2061f6ec84ce19b17fbb886fd24487004e408;p=platform%2Fkernel%2Flinux-amlogic.git

audio: Speaker has no sound [1/1]

PD#IPTV-3107

Problem:
Speaker has no sound

Solution:
modify dts and ad82584f

Verify:
Verify by Android P S905D3 AC202

Change-Id: I92ddb6a86b31dcd2c37311a0fc9b1a2cefc29d4e
Signed-off-by: GongWei Chen <gongwei.chen@amlogic.com>
---

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
index 67146fd..e2b2b04 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202.dts
@@ -1107,7 +1107,6 @@
 		reg = <0x31>;
 		status = "okay";
 		reset_pin = <&gpio_ao GPIOAO_9 0>;
-		enable_pin = <&gpio GPIOC_4 0>;
 		no_mclk;
 	};
 
@@ -1163,6 +1162,12 @@
 		 */
 		samesource_sel = <3>;
 
+		/*enable default mclk(12.288M), before extern codec start*/
+		start_clk_enable = <1>;
+
+		/*tdm clk tuning enable*/
+		clk_tuning_enable = <1>;
+
 		status = "okay";
 	};
 
@@ -1252,6 +1257,9 @@
 		pinctrl-names = "spdif_pins";
 		pinctrl-0 = <&spdifout>;/* bob remove &spdifin*/
 
+		/*spdif clk tuning enable*/
+		clk_tuning_enable = <1>;
+
 		status = "okay";
 	};
 	spdifb: spdif@1 {
diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
index 915627e..f612910 100644
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
@@ -1107,7 +1107,6 @@
 		reg = <0x31>;
 		status = "okay";
 		reset_pin = <&gpio_ao GPIOAO_9 0>;
-		enable_pin = <&gpio GPIOC_4 0>;
 		no_mclk;
 	};
 
@@ -1163,6 +1162,12 @@
 		 */
 		samesource_sel = <3>;
 
+		/*enable default mclk(12.288M), before extern codec start*/
+		start_clk_enable = <1>;
+
+		/*tdm clk tuning enable*/
+		clk_tuning_enable = <1>;
+
 		status = "okay";
 	};
 
@@ -1252,6 +1257,9 @@
 		pinctrl-names = "spdif_pins";
 		pinctrl-0 = <&spdifout>;/* bob remove &spdifin*/
 
+		/*spdif clk tuning enable*/
+		clk_tuning_enable = <1>;
+
 		status = "okay";
 	};
 	spdifb: spdif@1 {
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
index 83ba0d9..50571ce 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202.dts
@@ -1106,7 +1106,6 @@
 		reg = <0x31>;
 		status = "okay";
 		reset_pin = <&gpio_ao GPIOAO_9 0>;
-		enable_pin = <&gpio GPIOC_4 0>;
 		no_mclk;
 	};
 
@@ -1254,6 +1253,9 @@
 		pinctrl-names = "spdif_pins";
 		pinctrl-0 = <&spdifout>;/* bob remove &spdifin*/
 
+		/*spdif clk tuning enable*/
+		clk_tuning_enable = <1>;
+
 		status = "okay";
 	};
 	spdifb: spdif@1 {
diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
index ec91a2d..a901082 100644
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac202_1g.dts
@@ -1106,7 +1106,6 @@
 		reg = <0x31>;
 		status = "okay";
 		reset_pin = <&gpio_ao GPIOAO_9 0>;
-		enable_pin = <&gpio GPIOC_4 0>;
 		no_mclk;
 	};
 
@@ -1160,6 +1159,12 @@
 		 */
 		samesource_sel = <3>;
 
+		/*enable default mclk(12.288M), before extern codec start*/
+		start_clk_enable = <1>;
+
+		/*tdm clk tuning enable*/
+		clk_tuning_enable = <1>;
+
 		status = "okay";
 	};
 
@@ -1249,6 +1254,9 @@
 		pinctrl-names = "spdif_pins";
 		pinctrl-0 = <&spdifout>;/* bob remove &spdifin*/
 
+		/*spdif clk tuning enable*/
+		clk_tuning_enable = <1>;
+
 		status = "okay";
 	};
 	spdifb: spdif@1 {
diff --git a/sound/soc/codecs/amlogic/ad82584f.c b/sound/soc/codecs/amlogic/ad82584f.c
index d0aaa05..aa87176 100644
--- a/sound/soc/codecs/amlogic/ad82584f.c
+++ b/sound/soc/codecs/amlogic/ad82584f.c
@@ -600,7 +600,7 @@ struct ad82584f_priv {
 	unsigned char Ch2_vol;
 	unsigned char master_vol;
 	unsigned char mute_val;
-	unsigned int inited;
+
 #ifdef CONFIG_HAS_EARLYSUSPEND
 	struct early_suspend early_suspend;
 #endif
@@ -699,7 +699,6 @@ static int ad82584f_set_bias_level(struct snd_soc_codec *codec,
 	return 0;
 }
 
-static int ad82584f_init(struct snd_soc_codec *codec);
 static int ad82584f_prepare(struct snd_pcm_substream *substream,
 				struct snd_soc_dai *dai)
 {
@@ -714,14 +713,6 @@ static int ad82584f_prepare(struct snd_pcm_substream *substream,
 
 	/*unmute,default power-on is mute.*/
 	snd_soc_write(codec, 0x02, 0x00);
-#else
-	struct snd_soc_codec *codec = dai->codec;
-	struct ad82584f_priv *ad82584f = snd_soc_codec_get_drvdata(codec);
-
-	if (ad82584f->inited == 0) {
-		ad82584f_init(codec);
-		ad82584f->inited = 1;
-	}
 #endif
 	return 0;
 
@@ -772,6 +763,7 @@ static int reset_ad82584f_GPIO(struct snd_soc_codec *codec)
 	struct ad82584f_priv *ad82584f = snd_soc_codec_get_drvdata(codec);
 	struct ad82584f_platform_data *pdata = ad82584f->pdata;
 	int ret = 0;
+
 	if (pdata->reset_pin < 0)
 		return 0;
 
@@ -1008,7 +1000,7 @@ static int ad82584f_i2c_probe(struct i2c_client *i2c,
 		return -ENOMEM;
 	}
 	ad82584f->pdata = pdata;
-	ad82584f->inited = 0;
+
 	ad82584f_parse_dt(ad82584f, i2c->dev.of_node);
 
 	ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_ad82584f,