summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorVijay Mali <vmali@nvidia.com>2013-02-05 18:26:35 +0530
committerMandar Padmawar <mpadmawar@nvidia.com>2013-02-06 05:40:57 -0800
commitaa96d4bcf679d80963ba11c3a73d5918bfc95943 (patch)
treed5b203c991d61df2c6b15c7c52e812e7166aa574 /sound
parentd844483506f82efb7bb12206ff98f5cd80a4d436 (diff)
asoc: AIC3262: Fix headset detection failure during bootup
Remove codec driver call for headset detection. On Pluto headset detection is done using AP GPIO pin. Remove unused code. For bug 1228726 Change-Id: I4be5a0c89375749919eb3222293564318bde9547 Signed-off-by: Vijay Mali <vmali@nvidia.com> Reviewed-on: http://git-master/r/197463 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Rahul Mittal <rmittal@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Scott Peterson <speterson@nvidia.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/tegra/tegra_aic326x.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/tegra/tegra_aic326x.c b/sound/soc/tegra/tegra_aic326x.c
index a5ab8c1140d4..8cd04b715d6d 100644
--- a/sound/soc/tegra/tegra_aic326x.c
+++ b/sound/soc/tegra/tegra_aic326x.c
@@ -1195,9 +1195,11 @@ static int tegra_aic326x_init(struct snd_soc_pcm_runtime *rtd)
machine->gpio_requested |= GPIO_HP_DET;
}
+#ifndef CONFIG_ARCH_TEGRA_11x_SOC
/* update jack status during boot */
aic3262_hs_jack_detect(codec, &tegra_aic326x_hp_jack,
SND_JACK_HEADSET);
+#endif
/* Add call mode switch control */
ret = snd_ctl_add(codec->card->snd_card,
@@ -1210,10 +1212,6 @@ static int tegra_aic326x_init(struct snd_soc_pcm_runtime *rtd)
if (ret < 0)
return ret;
-/* snd_soc_dapm_force_enable_pin(dapm, "Mic Bias Ext");
- snd_soc_dapm_force_enable_pin(dapm,"Mic Bias Int");
- snd_soc_dapm_sync(dapm); */
-
return 0;
}