commit 0dd8241b6fdbb60bff8c918f7f1f41c378a3d485
author Harmandeep Singh <hsingh@codeaurora.org> Fri Nov 11 09:46:17 2011 -0800
committer Harmandeep Singh <hsingh@codeaurora.org> Fri Nov 11 10:10:10 2011 -0800
tree 359c0412bb5c83c04aeacc2ee36863d01f9ecb5a
parent d468568da26db4570f14abb64f3dbc0725626ead

ASoC: msm8960: fix for pop noise coming on liquid device while playback

Pop noise was observed during playback of any audio clip, GPIO's
to power top and bottom speaker amplifier for liquid and other
devices were swapped.

Made a fix to initialize the GPIO values according to the
hardware.

CRs-Fixed: 310879
Change-Id: Ib72796c2fcbd93c450cb5fb022a54633d6742bcd
Signed-off-by: Harmandeep Singh <hsingh@codeaurora.org>

sound/soc/msm/msm8960.c

diff --git a/sound/soc/msm/msm8960.c b/sound/soc/msm/msm8960.c
index d129fb2..0082339 100644
--- a/sound/soc/msm/msm8960.c
+++ b/sound/soc/msm/msm8960.c
@@ -32,8 +32,6 @@
 #define PM8921_GPIO_BASE		NR_GPIO_IRQS
 #define PM8921_GPIO_PM_TO_SYS(pm_gpio)  (pm_gpio - 1 + PM8921_GPIO_BASE)
 
-#define TOP_SPK_PAMP_GPIO (PM8921_GPIO_PM_TO_SYS(18))
-#define BOTTOM_SPK_PAMP_GPIO (PM8921_GPIO_PM_TO_SYS(19))
 #define MSM8960_SPK_ON 1
 #define MSM8960_SPK_OFF 0
 
@@ -53,6 +51,8 @@
 #define GPIO_AUX_PCM_SYNC 65
 #define GPIO_AUX_PCM_CLK 66
 
+static u32 top_spk_pamp_gpio  = PM8921_GPIO_PM_TO_SYS(18);
+static u32 bottom_spk_pamp_gpio = PM8921_GPIO_PM_TO_SYS(19);
 static int msm8960_spk_control;
 static int msm8960_ext_bottom_spk_pamp;
 static int msm8960_ext_top_spk_pamp;
@@ -96,38 +96,38 @@
 			function       = PM_GPIO_FUNC_NORMAL,
 	};
 
-	if (spk_amp_gpio == BOTTOM_SPK_PAMP_GPIO) {
+	if (spk_amp_gpio == bottom_spk_pamp_gpio) {
 
-		ret = gpio_request(BOTTOM_SPK_PAMP_GPIO, "BOTTOM_SPK_AMP");
+		ret = gpio_request(bottom_spk_pamp_gpio, "BOTTOM_SPK_AMP");
 		if (ret) {
 			pr_err("%s: Error requesting BOTTOM SPK AMP GPIO %u\n",
-				__func__, BOTTOM_SPK_PAMP_GPIO);
+				__func__, bottom_spk_pamp_gpio);
 			return;
 		}
-		ret = pm8xxx_gpio_config(BOTTOM_SPK_PAMP_GPIO, &param);
+		ret = pm8xxx_gpio_config(bottom_spk_pamp_gpio, &param);
 		if (ret)
 			pr_err("%s: Failed to configure Bottom Spk Ampl"
-				" gpio %u\n", __func__, BOTTOM_SPK_PAMP_GPIO);
+				" gpio %u\n", __func__, bottom_spk_pamp_gpio);
 		else {
 			pr_debug("%s: enable Bottom spkr amp gpio\n", __func__);
-			gpio_direction_output(BOTTOM_SPK_PAMP_GPIO, 1);
+			gpio_direction_output(bottom_spk_pamp_gpio, 1);
 		}
 
-	} else if (spk_amp_gpio == TOP_SPK_PAMP_GPIO) {
+	} else if (spk_amp_gpio == top_spk_pamp_gpio) {
 
-		ret = gpio_request(TOP_SPK_PAMP_GPIO, "TOP_SPK_AMP");
+		ret = gpio_request(top_spk_pamp_gpio, "TOP_SPK_AMP");
 		if (ret) {
 			pr_err("%s: Error requesting GPIO %d\n", __func__,
-				TOP_SPK_PAMP_GPIO);
+				top_spk_pamp_gpio);
 			return;
 		}
-		ret = pm8xxx_gpio_config(TOP_SPK_PAMP_GPIO, &param);
+		ret = pm8xxx_gpio_config(top_spk_pamp_gpio, &param);
 		if (ret)
 			pr_err("%s: Failed to configure Top Spk Ampl"
-				" gpio %u\n", __func__, TOP_SPK_PAMP_GPIO);
+				" gpio %u\n", __func__, top_spk_pamp_gpio);
 		else {
 			pr_debug("%s: enable Top spkr amp gpio\n", __func__);
-			gpio_direction_output(TOP_SPK_PAMP_GPIO, 1);
+			gpio_direction_output(top_spk_pamp_gpio, 1);
 		}
 	} else {
 		pr_err("%s: ERROR : Invalid External Speaker Ampl GPIO."
@@ -153,7 +153,7 @@
 		if ((msm8960_ext_bottom_spk_pamp & BOTTOM_SPK_AMP_POS) &&
 			(msm8960_ext_bottom_spk_pamp & BOTTOM_SPK_AMP_NEG)) {
 
-			msm8960_enable_ext_spk_amp_gpio(BOTTOM_SPK_PAMP_GPIO);
+			msm8960_enable_ext_spk_amp_gpio(bottom_spk_pamp_gpio);
 			pr_debug("%s: slepping 4 ms after turning on external "
 				" Bottom Speaker Ampl\n", __func__);
 			usleep_range(4000, 4000);
@@ -174,7 +174,7 @@
 		if ((msm8960_ext_top_spk_pamp & TOP_SPK_AMP_POS) &&
 			(msm8960_ext_top_spk_pamp & TOP_SPK_AMP_NEG)) {
 
-			msm8960_enable_ext_spk_amp_gpio(TOP_SPK_PAMP_GPIO);
+			msm8960_enable_ext_spk_amp_gpio(top_spk_pamp_gpio);
 			pr_debug("%s: sleeping 4 ms after turning on "
 				" external Top Speaker Ampl\n", __func__);
 			usleep_range(4000, 4000);
@@ -194,8 +194,8 @@
 		if (!msm8960_ext_bottom_spk_pamp)
 			return;
 
-		gpio_direction_output(BOTTOM_SPK_PAMP_GPIO, 0);
-		gpio_free(BOTTOM_SPK_PAMP_GPIO);
+		gpio_direction_output(bottom_spk_pamp_gpio, 0);
+		gpio_free(bottom_spk_pamp_gpio);
 		msm8960_ext_bottom_spk_pamp = 0;
 
 		pr_debug("%s: sleeping 4 ms after turning off external Bottom"
@@ -208,8 +208,8 @@
 		if (!msm8960_ext_top_spk_pamp)
 			return;
 
-		gpio_direction_output(TOP_SPK_PAMP_GPIO, 0);
-		gpio_free(TOP_SPK_PAMP_GPIO);
+		gpio_direction_output(top_spk_pamp_gpio, 0);
+		gpio_free(top_spk_pamp_gpio);
 		msm8960_ext_top_spk_pamp = 0;
 
 		pr_debug("%s: sleeping 4 ms after turning off external Top"
@@ -577,6 +577,11 @@
 
 	pr_debug("%s()\n", __func__);
 
+	if (machine_is_msm8960_liquid()) {
+		top_spk_pamp_gpio = (PM8921_GPIO_PM_TO_SYS(19));
+		bottom_spk_pamp_gpio = (PM8921_GPIO_PM_TO_SYS(18));
+	}
+
 	rtd->pmdown_time = 0;
 
 	err = snd_soc_add_controls(codec, tabla_msm8960_controls,