aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorMatthew Ranostay <mranostay@embeddedalley.com>2007-09-17 18:52:38 -0400
committerJaroslav Kysela <perex@perex.cz>2007-10-16 10:50:53 -0400
commitb44ef2f1544a0a8d3d8907890662924082d0f1fa (patch)
tree3a0de88b04b1722936c47d6d12891d960f526873 /sound/pci
parent3723e2d25151f919e55da98f89a2787802ad5494 (diff)
[ALSA] hda: More subsystem id BIOS changes
More laptop BIOS changes the subsystem id for STAC9205 cards if the microphone is toggled on/off in the settings. The patch removes the old STAC_9205_M43xx and use STAC_9205_DELL_M43. Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_sigmatel.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 2feb0f2e38c3..27360d278bcf 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -57,7 +57,6 @@ enum {
57 STAC_9205_DELL_M42, 57 STAC_9205_DELL_M42,
58 STAC_9205_DELL_M43, 58 STAC_9205_DELL_M43,
59 STAC_9205_DELL_M44, 59 STAC_9205_DELL_M44,
60 STAC_9205_M43xx,
61 STAC_9205_MODELS 60 STAC_9205_MODELS
62}; 61};
63 62
@@ -1163,7 +1162,6 @@ static unsigned int *stac9205_brd_tbl[STAC_9205_MODELS] = {
1163 [STAC_9205_DELL_M42] = dell_9205_m42_pin_configs, 1162 [STAC_9205_DELL_M42] = dell_9205_m42_pin_configs,
1164 [STAC_9205_DELL_M43] = dell_9205_m43_pin_configs, 1163 [STAC_9205_DELL_M43] = dell_9205_m43_pin_configs,
1165 [STAC_9205_DELL_M44] = dell_9205_m44_pin_configs, 1164 [STAC_9205_DELL_M44] = dell_9205_m44_pin_configs,
1166 [STAC_9205_M43xx] = NULL,
1167}; 1165};
1168 1166
1169static const char *stac9205_models[STAC_9205_MODELS] = { 1167static const char *stac9205_models[STAC_9205_MODELS] = {
@@ -1182,7 +1180,9 @@ static struct snd_pci_quirk stac9205_cfg_tbl[] = {
1182 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f2, 1180 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f2,
1183 "unknown Dell", STAC_9205_DELL_M42), 1181 "unknown Dell", STAC_9205_DELL_M42),
1184 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f8, 1182 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f8,
1185 "Dell Precision", STAC_9205_M43xx), 1183 "Dell Precision", STAC_9205_DELL_M43),
1184 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021c,
1185 "Dell Precision", STAC_9205_DELL_M43),
1186 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f9, 1186 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f9,
1187 "Dell Precision", STAC_9205_DELL_M43), 1187 "Dell Precision", STAC_9205_DELL_M43),
1188 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021b, 1188 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x021b,
@@ -2807,7 +2807,6 @@ static int patch_stac9205(struct hda_codec *codec)
2807 spec->multiout.dac_nids = spec->dac_nids; 2807 spec->multiout.dac_nids = spec->dac_nids;
2808 2808
2809 switch (spec->board_config){ 2809 switch (spec->board_config){
2810 case STAC_9205_M43xx:
2811 case STAC_9205_DELL_M43: 2810 case STAC_9205_DELL_M43:
2812 /* Enable SPDIF in/out */ 2811 /* Enable SPDIF in/out */
2813 stac92xx_set_config_reg(codec, 0x1f, 0x01441030); 2812 stac92xx_set_config_reg(codec, 0x1f, 0x01441030);