diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-09-21 11:40:48 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-09-21 11:40:48 -0400 |
commit | 5e09416f3676af1730af773afc477c2cea26a2c1 (patch) | |
tree | 9dda0dd333681d6174eebfcea01e6c8962adc62e | |
parent | 265a02478db5217eda8063004ded1ef0a461c240 (diff) | |
parent | 0f9f1ee9d1412d45a22bfd69dfd4d4324b506e9e (diff) |
Merge branch 'fix/hda' into topic/hda
-rw-r--r-- | sound/pci/hda/patch_analog.c | 1 | ||||
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 05db1cfcd8b8..507523d5ed42 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
@@ -3642,6 +3642,7 @@ static struct snd_pci_quirk ad1984_cfg_tbl[] = { | |||
3642 | /* Lenovo Thinkpad T61/X61 */ | 3642 | /* Lenovo Thinkpad T61/X61 */ |
3643 | SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1984_THINKPAD), | 3643 | SND_PCI_QUIRK_VENDOR(0x17aa, "Lenovo Thinkpad", AD1984_THINKPAD), |
3644 | SND_PCI_QUIRK(0x1028, 0x0214, "Dell T3400", AD1984_DELL_DESKTOP), | 3644 | SND_PCI_QUIRK(0x1028, 0x0214, "Dell T3400", AD1984_DELL_DESKTOP), |
3645 | SND_PCI_QUIRK(0x1028, 0x0233, "Dell Latitude E6400", AD1984_DELL_DESKTOP), | ||
3645 | {} | 3646 | {} |
3646 | }; | 3647 | }; |
3647 | 3648 | ||
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index f5ccba0fd189..f2a30447f26f 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -14710,6 +14710,7 @@ static int alc269_resume(struct hda_codec *codec) | |||
14710 | 14710 | ||
14711 | enum { | 14711 | enum { |
14712 | ALC269_FIXUP_SONY_VAIO, | 14712 | ALC269_FIXUP_SONY_VAIO, |
14713 | ALC269_FIXUP_DELL_M101Z, | ||
14713 | }; | 14714 | }; |
14714 | 14715 | ||
14715 | static const struct alc_fixup alc269_fixups[] = { | 14716 | static const struct alc_fixup alc269_fixups[] = { |
@@ -14719,11 +14720,20 @@ static const struct alc_fixup alc269_fixups[] = { | |||
14719 | {} | 14720 | {} |
14720 | } | 14721 | } |
14721 | }, | 14722 | }, |
14723 | [ALC269_FIXUP_DELL_M101Z] = { | ||
14724 | .verbs = (const struct hda_verb[]) { | ||
14725 | /* Enables internal speaker */ | ||
14726 | {0x20, AC_VERB_SET_COEF_INDEX, 13}, | ||
14727 | {0x20, AC_VERB_SET_PROC_COEF, 0x4040}, | ||
14728 | {} | ||
14729 | } | ||
14730 | }, | ||
14722 | }; | 14731 | }; |
14723 | 14732 | ||
14724 | static struct snd_pci_quirk alc269_fixup_tbl[] = { | 14733 | static struct snd_pci_quirk alc269_fixup_tbl[] = { |
14725 | SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), | 14734 | SND_PCI_QUIRK(0x104d, 0x9071, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), |
14726 | SND_PCI_QUIRK(0x104d, 0x9077, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), | 14735 | SND_PCI_QUIRK(0x104d, 0x9077, "Sony VAIO", ALC269_FIXUP_SONY_VAIO), |
14736 | SND_PCI_QUIRK(0x1028, 0x0470, "Dell M101z", ALC269_FIXUP_DELL_M101Z), | ||
14727 | {} | 14737 | {} |
14728 | }; | 14738 | }; |
14729 | 14739 | ||