aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt1
-rw-r--r--sound/pci/hda/patch_sigmatel.c14
2 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 241e26c4ff92..68c3bbd7d6db 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -975,6 +975,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
975 ref Reference board 975 ref Reference board
976 3stack D965 3stack 976 3stack D965 3stack
977 5stack D965 5stack + SPDIF 977 5stack D965 5stack + SPDIF
978 dell-3stack Dell E520
978 979
979 STAC9872 980 STAC9872
980 vaio Setup for VAIO FE550G/SZ110 981 vaio Setup for VAIO FE550G/SZ110
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 5ca430cc399a..87a36e9d6546 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -80,6 +80,7 @@ enum {
80 STAC_D965_REF, 80 STAC_D965_REF,
81 STAC_D965_3ST, 81 STAC_D965_3ST,
82 STAC_D965_5ST, 82 STAC_D965_5ST,
83 STAC_DELL_3ST,
83 STAC_927X_MODELS 84 STAC_927X_MODELS
84}; 85};
85 86
@@ -719,16 +720,25 @@ static unsigned int d965_5st_pin_configs[14] = {
719 0x40000100, 0x40000100 720 0x40000100, 0x40000100
720}; 721};
721 722
723static unsigned int dell_3st_pin_configs[14] = {
724 0x02211230, 0x02a11220, 0x01a19040, 0x01114210,
725 0x01111212, 0x01116211, 0x01813050, 0x01112214,
726 0x403003fa, 0x40000100, 0x40000100, 0x404003fb,
727 0x40c003fc, 0x40000100
728};
729
722static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = { 730static unsigned int *stac927x_brd_tbl[STAC_927X_MODELS] = {
723 [STAC_D965_REF] = ref927x_pin_configs, 731 [STAC_D965_REF] = ref927x_pin_configs,
724 [STAC_D965_3ST] = d965_3st_pin_configs, 732 [STAC_D965_3ST] = d965_3st_pin_configs,
725 [STAC_D965_5ST] = d965_5st_pin_configs, 733 [STAC_D965_5ST] = d965_5st_pin_configs,
734 [STAC_DELL_3ST] = dell_3st_pin_configs,
726}; 735};
727 736
728static const char *stac927x_models[STAC_927X_MODELS] = { 737static const char *stac927x_models[STAC_927X_MODELS] = {
729 [STAC_D965_REF] = "ref", 738 [STAC_D965_REF] = "ref",
730 [STAC_D965_3ST] = "3stack", 739 [STAC_D965_3ST] = "3stack",
731 [STAC_D965_5ST] = "5stack", 740 [STAC_D965_5ST] = "5stack",
741 [STAC_DELL_3ST] = "dell-3stack",
732}; 742};
733 743
734static struct snd_pci_quirk stac927x_cfg_tbl[] = { 744static struct snd_pci_quirk stac927x_cfg_tbl[] = {
@@ -755,6 +765,10 @@ static struct snd_pci_quirk stac927x_cfg_tbl[] = {
755 SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2003, "Intel D965", STAC_D965_3ST), 765 SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2003, "Intel D965", STAC_D965_3ST),
756 SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2002, "Intel D965", STAC_D965_3ST), 766 SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2002, "Intel D965", STAC_D965_3ST),
757 SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2001, "Intel D965", STAC_D965_3ST), 767 SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2001, "Intel D965", STAC_D965_3ST),
768 /* Dell 3 stack systems */
769 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01dd, "Dell E520", STAC_DELL_3ST),
770 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01ed, "Dell ", STAC_DELL_3ST),
771 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x01f4, "Dell ", STAC_DELL_3ST),
758 /* 965 based 5 stack systems */ 772 /* 965 based 5 stack systems */
759 SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2301, "Intel D965", STAC_D965_5ST), 773 SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2301, "Intel D965", STAC_D965_5ST),
760 SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2302, "Intel D965", STAC_D965_5ST), 774 SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2302, "Intel D965", STAC_D965_5ST),