aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Ranostay <mranostay@embeddedalley.com>2008-11-20 21:21:43 -0500
committerTakashi Iwai <tiwai@suse.de>2008-11-21 02:17:00 -0500
commit3a7abfd2ba26479615b81ac5e90d0122ef7f9fe0 (patch)
treeaae89c8108349c7f38b6f496b99b0c805cc5a2c3
parent0253fdcd8aec2f954c2950a7454c0a2f3207e9a1 (diff)
ALSA: hda: Add STAC_DELL_M4_3 quirk
Added STAC_DELL_M4_3 quirk for Dell systems, also reorganized the board config switch to assign number of digital muxes, microphones, and SPDIF muxes via the PCI quirk defined. Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt1
-rw-r--r--sound/pci/hda/patch_sigmatel.c26
2 files changed, 23 insertions, 4 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index e0e54a27fc10..147f1764d976 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1072,6 +1072,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
1072 ref Reference board 1072 ref Reference board
1073 dell-m4-1 Dell desktops 1073 dell-m4-1 Dell desktops
1074 dell-m4-2 Dell desktops 1074 dell-m4-2 Dell desktops
1075 dell-m4-3 Dell desktops
1075 1076
1076 STAC92HD73* 1077 STAC92HD73*
1077 ref Reference board 1078 ref Reference board
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 31a234afe1af..9047dc76b007 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -84,6 +84,7 @@ enum {
84 STAC_92HD71BXX_REF, 84 STAC_92HD71BXX_REF,
85 STAC_DELL_M4_1, 85 STAC_DELL_M4_1,
86 STAC_DELL_M4_2, 86 STAC_DELL_M4_2,
87 STAC_DELL_M4_3,
87 STAC_HP_M4, 88 STAC_HP_M4,
88 STAC_92HD71BXX_MODELS 89 STAC_92HD71BXX_MODELS
89}; 90};
@@ -1671,10 +1672,17 @@ static unsigned int dell_m4_2_pin_configs[11] = {
1671 0x40f000f0, 0x044413b0, 0x044413b0, 1672 0x40f000f0, 0x044413b0, 0x044413b0,
1672}; 1673};
1673 1674
1675static unsigned int dell_m4_3_pin_configs[11] = {
1676 0x0421101f, 0x04a11221, 0x90a70330, 0x90170110,
1677 0x40f000f0, 0x40f000f0, 0x40f000f0, 0x90a000f0,
1678 0x40f000f0, 0x044413b0, 0x044413b0,
1679};
1680
1674static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = { 1681static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = {
1675 [STAC_92HD71BXX_REF] = ref92hd71bxx_pin_configs, 1682 [STAC_92HD71BXX_REF] = ref92hd71bxx_pin_configs,
1676 [STAC_DELL_M4_1] = dell_m4_1_pin_configs, 1683 [STAC_DELL_M4_1] = dell_m4_1_pin_configs,
1677 [STAC_DELL_M4_2] = dell_m4_2_pin_configs, 1684 [STAC_DELL_M4_2] = dell_m4_2_pin_configs,
1685 [STAC_DELL_M4_3] = dell_m4_3_pin_configs,
1678 [STAC_HP_M4] = NULL, 1686 [STAC_HP_M4] = NULL,
1679}; 1687};
1680 1688
@@ -1682,6 +1690,7 @@ static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = {
1682 [STAC_92HD71BXX_REF] = "ref", 1690 [STAC_92HD71BXX_REF] = "ref",
1683 [STAC_DELL_M4_1] = "dell-m4-1", 1691 [STAC_DELL_M4_1] = "dell-m4-1",
1684 [STAC_DELL_M4_2] = "dell-m4-2", 1692 [STAC_DELL_M4_2] = "dell-m4-2",
1693 [STAC_DELL_M4_3] = "dell-m4-3",
1685 [STAC_HP_M4] = "hp-m4", 1694 [STAC_HP_M4] = "hp-m4",
1686}; 1695};
1687 1696
@@ -1717,6 +1726,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = {
1717 "unknown Dell", STAC_DELL_M4_2), 1726 "unknown Dell", STAC_DELL_M4_2),
1718 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0264, 1727 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0264,
1719 "unknown Dell", STAC_DELL_M4_2), 1728 "unknown Dell", STAC_DELL_M4_2),
1729 SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02aa,
1730 "unknown Dell", STAC_DELL_M4_3),
1720 {} /* terminator */ 1731 {} /* terminator */
1721}; 1732};
1722 1733
@@ -4571,14 +4582,21 @@ again:
4571 4582
4572 switch (spec->board_config) { 4583 switch (spec->board_config) {
4573 case STAC_HP_M4: 4584 case STAC_HP_M4:
4574 spec->num_dmics = 0;
4575 spec->num_smuxes = 0;
4576 spec->num_dmuxes = 0;
4577
4578 /* enable internal microphone */ 4585 /* enable internal microphone */
4579 stac92xx_set_config_reg(codec, 0x0e, 0x01813040); 4586 stac92xx_set_config_reg(codec, 0x0e, 0x01813040);
4580 stac92xx_auto_set_pinctl(codec, 0x0e, 4587 stac92xx_auto_set_pinctl(codec, 0x0e,
4581 AC_PINCTL_IN_EN | AC_PINCTL_VREF_80); 4588 AC_PINCTL_IN_EN | AC_PINCTL_VREF_80);
4589 /* fallthru */
4590 case STAC_DELL_M4_2:
4591 spec->num_dmics = 0;
4592 spec->num_smuxes = 0;
4593 spec->num_dmuxes = 0;
4594 break;
4595 case STAC_DELL_M4_1:
4596 case STAC_DELL_M4_3:
4597 spec->num_dmics = 1;
4598 spec->num_smuxes = 0;
4599 spec->num_dmuxes = 0;
4582 break; 4600 break;
4583 default: 4601 default:
4584 spec->num_dmics = STAC92HD71BXX_NUM_DMICS; 4602 spec->num_dmics = STAC92HD71BXX_NUM_DMICS;