aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/sound/alsa/HD-Audio-Models.txt1
-rw-r--r--sound/pci/hda/patch_sigmatel.c14
2 files changed, 13 insertions, 2 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index 809d72b8eff1..a46ddb85e83a 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -244,6 +244,7 @@ STAC9227/9228/9229/927x
244 5stack-no-fp D965 5stack without front panel 244 5stack-no-fp D965 5stack without front panel
245 dell-3stack Dell Dimension E520 245 dell-3stack Dell Dimension E520
246 dell-bios Fixes with Dell BIOS setup 246 dell-bios Fixes with Dell BIOS setup
247 dell-bios-amic Fixes with Dell BIOS setup including analog mic
247 volknob Fixes with volume-knob widget 0x24 248 volknob Fixes with volume-knob widget 0x24
248 auto BIOS setup (default) 249 auto BIOS setup (default)
249 250
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 {
158 STAC_D965_VERBS, 158 STAC_D965_VERBS,
159 STAC_DELL_3ST, 159 STAC_DELL_3ST,
160 STAC_DELL_BIOS, 160 STAC_DELL_BIOS,
161 STAC_DELL_BIOS_AMIC,
161 STAC_DELL_BIOS_SPDIF, 162 STAC_DELL_BIOS_SPDIF,
162 STAC_927X_DELL_DMIC, 163 STAC_927X_DELL_DMIC,
163 STAC_927X_VOLKNOB, 164 STAC_927X_VOLKNOB,
@@ -3228,8 +3229,6 @@ static const struct hda_fixup stac927x_fixups[] = {
3228 [STAC_DELL_BIOS] = { 3229 [STAC_DELL_BIOS] = {
3229 .type = HDA_FIXUP_PINS, 3230 .type = HDA_FIXUP_PINS,
3230 .v.pins = (const struct hda_pintbl[]) { 3231 .v.pins = (const struct hda_pintbl[]) {
3231 /* configure the analog microphone on some laptops */
3232 { 0x0c, 0x90a79130 },
3233 /* correct the front output jack as a hp out */ 3232 /* correct the front output jack as a hp out */
3234 { 0x0f, 0x0227011f }, 3233 { 0x0f, 0x0227011f },
3235 /* correct the front input jack as a mic */ 3234 /* correct the front input jack as a mic */
@@ -3239,6 +3238,16 @@ static const struct hda_fixup stac927x_fixups[] = {
3239 .chained = true, 3238 .chained = true,
3240 .chain_id = STAC_927X_DELL_DMIC, 3239 .chain_id = STAC_927X_DELL_DMIC,
3241 }, 3240 },
3241 [STAC_DELL_BIOS_AMIC] = {
3242 .type = HDA_FIXUP_PINS,
3243 .v.pins = (const struct hda_pintbl[]) {
3244 /* configure the analog microphone on some laptops */
3245 { 0x0c, 0x90a79130 },
3246 {}
3247 },
3248 .chained = true,
3249 .chain_id = STAC_DELL_BIOS,
3250 },
3242 [STAC_DELL_BIOS_SPDIF] = { 3251 [STAC_DELL_BIOS_SPDIF] = {
3243 .type = HDA_FIXUP_PINS, 3252 .type = HDA_FIXUP_PINS,
3244 .v.pins = (const struct hda_pintbl[]) { 3253 .v.pins = (const struct hda_pintbl[]) {
@@ -3267,6 +3276,7 @@ static const struct hda_model_fixup stac927x_models[] = {
3267 { .id = STAC_D965_5ST_NO_FP, .name = "5stack-no-fp" }, 3276 { .id = STAC_D965_5ST_NO_FP, .name = "5stack-no-fp" },
3268 { .id = STAC_DELL_3ST, .name = "dell-3stack" }, 3277 { .id = STAC_DELL_3ST, .name = "dell-3stack" },
3269 { .id = STAC_DELL_BIOS, .name = "dell-bios" }, 3278 { .id = STAC_DELL_BIOS, .name = "dell-bios" },
3279 { .id = STAC_DELL_BIOS_AMIC, .name = "dell-bios-amic" },
3270 { .id = STAC_927X_VOLKNOB, .name = "volknob" }, 3280 { .id = STAC_927X_VOLKNOB, .name = "volknob" },
3271 {} 3281 {}
3272}; 3282};