commit f573e9a2763db76150775e7482f5a463affd4421
author Linux Build Service Account <lnxbuild@localhost> Mon Sep 30 11:11:22 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Sep 30 11:11:20 2013 -0700
tree 8d203f477372b4d71e22126233502e40309c4629
parent 3f2f2338b5ee13039d9023bf2e7b47be1e9829b5
parent 76fcfc65a370c19f26c8ac49f887e7616c38f19a

Merge "ASoC: msm8x10-wcd: Pull TX2 to micbias whenever micbias is enabled"

sound/soc/codecs/msm8x10-wcd.c

diff --git a/sound/soc/codecs/msm8x10-wcd.c b/sound/soc/codecs/msm8x10-wcd.c
index a76efbb..4e3df21 100644
--- a/sound/soc/codecs/msm8x10-wcd.c
+++ b/sound/soc/codecs/msm8x10-wcd.c
@@ -1602,6 +1602,9 @@
 			snd_soc_update_bits(codec, micb_int_reg, 0x10, 0x10);
 		else if (strnstr(w->name, internal3_text, 30))
 			snd_soc_update_bits(codec, micb_int_reg, 0x2, 0x2);
+
+		/* Always pull up TxFe for TX2 to Micbias */
+		snd_soc_update_bits(codec, micb_int_reg, 0x04, 0x04);
 		break;
 	case SND_SOC_DAPM_POST_PMU:
 		usleep_range(20000, 20100);
@@ -1619,6 +1622,8 @@
 		else if (strnstr(w->name, internal3_text, 30))
 			snd_soc_update_bits(codec, micb_int_reg, 0x2, 0x0);
 
+		/* Disable pull up TxFe for TX2 to Micbias */
+		snd_soc_update_bits(codec, micb_int_reg, 0x04, 0x00);
 		break;
 	}
 	return 0;