ALSA: hda - Remove analog mic pin override from STAC9228 dell-bios quirk

The current fixup for dell-bios model with STAC9228 codec contains the
override of pin 0x0c for analog mic.  But this is actually just adding
a bogus pin and confuses the parser.  Better to remove it for the
auto-mic switching.

Meanwhile, for a possible regression, keep the old configuration as
model=dell-bios-amic, so that people can test it again quickly.

Tested on Dell 1420n laptop.

Reported-and-tested-by: Eric Shattow <lucent@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 12 insertions, 2 deletions

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index e2f83591161b..8f6c35753810 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -158,6 +158,7 @@ enum {
         STAC_D965_VERBS,
         STAC_DELL_3ST,
         STAC_DELL_BIOS,
+        STAC_DELL_BIOS_AMIC,
         STAC_DELL_BIOS_SPDIF,
         STAC_927X_DELL_DMIC,
         STAC_927X_VOLKNOB,
@@ -3228,8 +3229,6 @@ static const struct hda_fixup stac927x_fixups[] = {
         [STAC_DELL_BIOS] = {
                 .type = HDA_FIXUP_PINS,
                 .v.pins = (const struct hda_pintbl[]) {
-                        /* configure the analog microphone on some laptops */
-                        { 0x0c, 0x90a79130 },
                         /* correct the front output jack as a hp out */
                         { 0x0f, 0x0227011f },
                         /* correct the front input jack as a mic */
@@ -3239,6 +3238,16 @@ static const struct hda_fixup stac927x_fixups[] = {
                 .chained = true,
                 .chain_id = STAC_927X_DELL_DMIC,
         },
+        [STAC_DELL_BIOS_AMIC] = {
+                .type = HDA_FIXUP_PINS,
+                .v.pins = (const struct hda_pintbl[]) {
+                        /* configure the analog microphone on some laptops */
+                        { 0x0c, 0x90a79130 },
+                        {}
+                },
+                .chained = true,
+                .chain_id = STAC_DELL_BIOS,
+        },
         [STAC_DELL_BIOS_SPDIF] = {
                 .type = HDA_FIXUP_PINS,
                 .v.pins = (const struct hda_pintbl[]) {
@@ -3267,6 +3276,7 @@ static const struct hda_model_fixup stac927x_models[] = {
         { .id = STAC_D965_5ST_NO_FP, .name = "5stack-no-fp" },
         { .id = STAC_DELL_3ST, .name = "dell-3stack" },
         { .id = STAC_DELL_BIOS, .name = "dell-bios" },
+        { .id = STAC_DELL_BIOS_AMIC, .name = "dell-bios-amic" },
         { .id = STAC_927X_VOLKNOB, .name = "volknob" },
         {}
 };