diff options
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_analog.c | 2 | ||||
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 5bb48ee8b6c6..38ad3f7b040f 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
@@ -3256,7 +3256,7 @@ static const char *ad1884_slave_vols[] = { | |||
3256 | "Mic Playback Volume", | 3256 | "Mic Playback Volume", |
3257 | "CD Playback Volume", | 3257 | "CD Playback Volume", |
3258 | "Internal Mic Playback Volume", | 3258 | "Internal Mic Playback Volume", |
3259 | "Docking Mic Playback Volume" | 3259 | "Docking Mic Playback Volume", |
3260 | /* "Beep Playback Volume", */ | 3260 | /* "Beep Playback Volume", */ |
3261 | "IEC958 Playback Volume", | 3261 | "IEC958 Playback Volume", |
3262 | NULL | 3262 | NULL |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index b34d78b88a85..61996a2f45df 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -4413,6 +4413,24 @@ static void stac92xx_unsol_event(struct hda_codec *codec, unsigned int res) | |||
4413 | if (spec->num_pwrs > 0) | 4413 | if (spec->num_pwrs > 0) |
4414 | stac92xx_pin_sense(codec, event->nid); | 4414 | stac92xx_pin_sense(codec, event->nid); |
4415 | stac92xx_report_jack(codec, event->nid); | 4415 | stac92xx_report_jack(codec, event->nid); |
4416 | |||
4417 | switch (codec->subsystem_id) { | ||
4418 | case 0x103c308f: | ||
4419 | if (event->nid == 0xb) { | ||
4420 | int pin = AC_PINCTL_IN_EN; | ||
4421 | |||
4422 | if (get_pin_presence(codec, 0xa) | ||
4423 | && get_pin_presence(codec, 0xb)) | ||
4424 | pin |= AC_PINCTL_VREF_80; | ||
4425 | if (!get_pin_presence(codec, 0xb)) | ||
4426 | pin |= AC_PINCTL_VREF_80; | ||
4427 | |||
4428 | /* toggle VREF state based on mic + hp pin | ||
4429 | * status | ||
4430 | */ | ||
4431 | stac92xx_auto_set_pinctl(codec, 0x0a, pin); | ||
4432 | } | ||
4433 | } | ||
4416 | break; | 4434 | break; |
4417 | case STAC_VREF_EVENT: | 4435 | case STAC_VREF_EVENT: |
4418 | data = snd_hda_codec_read(codec, codec->afg, 0, | 4436 | data = snd_hda_codec_read(codec, codec->afg, 0, |