Revert "asoc: tegra: cs42l73: VSPIN dapm route with DMIC event"
Rahul Mittal [Fri, 2 Nov 2012 09:10:36 +0000 (14:10 +0530)]
This reverts commit 8bd50e3f390810fffdb63d3b0a32972e09db3000
Fix for pluto DMIC audio recording ANR
Bug 1167696

Change-Id: I58edab224d6527912869e8bafa7248c82c332556
Signed-off-by: Rahul Mittal <rmittal@nvidia.com>
Reviewed-on: http://git-master/r/160833
Reviewed-by: Vijay Mali <vmali@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Dara Ramesh <dramesh@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

sound/soc/tegra/tegra_cs42l73.c

index 154f77b..76c2e5b 100644 (file)
@@ -904,11 +904,6 @@ static struct snd_soc_jack_pin tegra_cs42l73_hs_jack_pins[] = {
 };
 #endif
 
-/* FIX ME */
-static const struct snd_soc_dapm_route vspin_audio_map[] = {
-       {"VSPIN", NULL, "Int D-Mic"},
-};
-
 static int tegra_cs42l73_event_int_mic(struct snd_soc_dapm_widget *w,
                                        struct snd_kcontrol *k, int event)
 {
@@ -919,13 +914,9 @@ static int tegra_cs42l73_event_int_mic(struct snd_soc_dapm_widget *w,
 
        if (machine->dmic_reg && machine->dmic_1v8_reg) {
                if (SND_SOC_DAPM_EVENT_ON(event)) {
-                       snd_soc_dapm_add_routes(dapm,
-                                       vspin_audio_map, 1);
                        regulator_enable(machine->dmic_reg);
                        regulator_enable(machine->dmic_1v8_reg);
                } else {
-                       snd_soc_dapm_weak_routes(dapm,
-                                       vspin_audio_map, 1);
                        regulator_disable(machine->dmic_reg);
                        regulator_disable(machine->dmic_1v8_reg);
                }