diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-09-14 09:42:18 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-09-14 09:42:18 -0400 |
commit | 6e34c033210bb86b3f5f45fd6497f74150bdf620 (patch) | |
tree | 161949283303eef93324569f8e16d9f3268cb9d0 | |
parent | 5f380eb1eff2031b5101a64c76b54cca8e1c7079 (diff) |
ALSA: hda - Add support for HP dv6
Add the quirk entry for HP dv6. Also add a workaround for the headphone
detection by setting hp_detect=1 beforehand. Without this, the driver
won't do auto-muting because BIOS doesn't give any HP pin but only a
line-out pin.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index fe2ba764d344..cc0e26c69978 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -1690,6 +1690,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = { | |||
1690 | "HP mini 1000", STAC_HP_M4), | 1690 | "HP mini 1000", STAC_HP_M4), |
1691 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361b, | 1691 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x361b, |
1692 | "HP HDX", STAC_HP_HDX), /* HDX16 */ | 1692 | "HP HDX", STAC_HP_HDX), /* HDX16 */ |
1693 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x3620, | ||
1694 | "HP dv6", STAC_HP_DV5), | ||
1693 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x7010, | 1695 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xfff0, 0x7010, |
1694 | "HP", STAC_HP_DV5), | 1696 | "HP", STAC_HP_DV5), |
1695 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233, | 1697 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0233, |
@@ -5383,6 +5385,11 @@ again: | |||
5383 | case STAC_HP_DV5: | 5385 | case STAC_HP_DV5: |
5384 | snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010); | 5386 | snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010); |
5385 | stac92xx_auto_set_pinctl(codec, 0x0d, AC_PINCTL_OUT_EN); | 5387 | stac92xx_auto_set_pinctl(codec, 0x0d, AC_PINCTL_OUT_EN); |
5388 | /* HP dv6 gives the headphone pin as a line-out. Thus we | ||
5389 | * need to set hp_detect flag here to force to enable HP | ||
5390 | * detection. | ||
5391 | */ | ||
5392 | spec->hp_detect = 1; | ||
5386 | break; | 5393 | break; |
5387 | case STAC_HP_HDX: | 5394 | case STAC_HP_HDX: |
5388 | spec->num_dmics = 1; | 5395 | spec->num_dmics = 1; |