diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-11-21 02:27:04 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-11-21 02:27:04 -0500 |
commit | 75a287d9a35a825cb758d2f8d8df93d41f9f8e3e (patch) | |
tree | 7aacf881315a16695e35ca810434e42666d26a55 | |
parent | 1725b82a6e2721612a3572d0336f51f1f1c3cf54 (diff) | |
parent | 3a7abfd2ba26479615b81ac5e90d0122ef7f9fe0 (diff) |
Merge branch 'topic/fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_sigmatel.c
-rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 1 | ||||
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 26 |
2 files changed, 23 insertions, 4 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index e55081fdc8ab..1b7e36af0f0e 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
@@ -1078,6 +1078,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
1078 | ref Reference board | 1078 | ref Reference board |
1079 | dell-m4-1 Dell desktops | 1079 | dell-m4-1 Dell desktops |
1080 | dell-m4-2 Dell desktops | 1080 | dell-m4-2 Dell desktops |
1081 | dell-m4-3 Dell desktops | ||
1081 | 1082 | ||
1082 | STAC92HD73* | 1083 | STAC92HD73* |
1083 | ref Reference board | 1084 | ref Reference board |
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index c346c77e3068..a501c9121649 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -83,6 +83,7 @@ enum { | |||
83 | STAC_92HD71BXX_REF, | 83 | STAC_92HD71BXX_REF, |
84 | STAC_DELL_M4_1, | 84 | STAC_DELL_M4_1, |
85 | STAC_DELL_M4_2, | 85 | STAC_DELL_M4_2, |
86 | STAC_DELL_M4_3, | ||
86 | STAC_HP_M4, | 87 | STAC_HP_M4, |
87 | STAC_92HD71BXX_MODELS | 88 | STAC_92HD71BXX_MODELS |
88 | }; | 89 | }; |
@@ -1721,10 +1722,17 @@ static unsigned int dell_m4_2_pin_configs[11] = { | |||
1721 | 0x40f000f0, 0x044413b0, 0x044413b0, | 1722 | 0x40f000f0, 0x044413b0, 0x044413b0, |
1722 | }; | 1723 | }; |
1723 | 1724 | ||
1725 | static unsigned int dell_m4_3_pin_configs[11] = { | ||
1726 | 0x0421101f, 0x04a11221, 0x90a70330, 0x90170110, | ||
1727 | 0x40f000f0, 0x40f000f0, 0x40f000f0, 0x90a000f0, | ||
1728 | 0x40f000f0, 0x044413b0, 0x044413b0, | ||
1729 | }; | ||
1730 | |||
1724 | static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = { | 1731 | static unsigned int *stac92hd71bxx_brd_tbl[STAC_92HD71BXX_MODELS] = { |
1725 | [STAC_92HD71BXX_REF] = ref92hd71bxx_pin_configs, | 1732 | [STAC_92HD71BXX_REF] = ref92hd71bxx_pin_configs, |
1726 | [STAC_DELL_M4_1] = dell_m4_1_pin_configs, | 1733 | [STAC_DELL_M4_1] = dell_m4_1_pin_configs, |
1727 | [STAC_DELL_M4_2] = dell_m4_2_pin_configs, | 1734 | [STAC_DELL_M4_2] = dell_m4_2_pin_configs, |
1735 | [STAC_DELL_M4_3] = dell_m4_3_pin_configs, | ||
1728 | [STAC_HP_M4] = NULL, | 1736 | [STAC_HP_M4] = NULL, |
1729 | }; | 1737 | }; |
1730 | 1738 | ||
@@ -1732,6 +1740,7 @@ static const char *stac92hd71bxx_models[STAC_92HD71BXX_MODELS] = { | |||
1732 | [STAC_92HD71BXX_REF] = "ref", | 1740 | [STAC_92HD71BXX_REF] = "ref", |
1733 | [STAC_DELL_M4_1] = "dell-m4-1", | 1741 | [STAC_DELL_M4_1] = "dell-m4-1", |
1734 | [STAC_DELL_M4_2] = "dell-m4-2", | 1742 | [STAC_DELL_M4_2] = "dell-m4-2", |
1743 | [STAC_DELL_M4_3] = "dell-m4-3", | ||
1735 | [STAC_HP_M4] = "hp-m4", | 1744 | [STAC_HP_M4] = "hp-m4", |
1736 | }; | 1745 | }; |
1737 | 1746 | ||
@@ -1767,6 +1776,8 @@ static struct snd_pci_quirk stac92hd71bxx_cfg_tbl[] = { | |||
1767 | "unknown Dell", STAC_DELL_M4_2), | 1776 | "unknown Dell", STAC_DELL_M4_2), |
1768 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0264, | 1777 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0264, |
1769 | "unknown Dell", STAC_DELL_M4_2), | 1778 | "unknown Dell", STAC_DELL_M4_2), |
1779 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x02aa, | ||
1780 | "unknown Dell", STAC_DELL_M4_3), | ||
1770 | {} /* terminator */ | 1781 | {} /* terminator */ |
1771 | }; | 1782 | }; |
1772 | 1783 | ||
@@ -4753,14 +4764,21 @@ again: | |||
4753 | 4764 | ||
4754 | switch (spec->board_config) { | 4765 | switch (spec->board_config) { |
4755 | case STAC_HP_M4: | 4766 | case STAC_HP_M4: |
4756 | spec->num_dmics = 0; | ||
4757 | spec->num_smuxes = 0; | ||
4758 | spec->num_dmuxes = 0; | ||
4759 | |||
4760 | /* enable internal microphone */ | 4767 | /* enable internal microphone */ |
4761 | stac_change_pin_config(codec, 0x0e, 0x01813040); | 4768 | stac_change_pin_config(codec, 0x0e, 0x01813040); |
4762 | stac92xx_auto_set_pinctl(codec, 0x0e, | 4769 | stac92xx_auto_set_pinctl(codec, 0x0e, |
4763 | AC_PINCTL_IN_EN | AC_PINCTL_VREF_80); | 4770 | AC_PINCTL_IN_EN | AC_PINCTL_VREF_80); |
4771 | /* fallthru */ | ||
4772 | case STAC_DELL_M4_2: | ||
4773 | spec->num_dmics = 0; | ||
4774 | spec->num_smuxes = 0; | ||
4775 | spec->num_dmuxes = 0; | ||
4776 | break; | ||
4777 | case STAC_DELL_M4_1: | ||
4778 | case STAC_DELL_M4_3: | ||
4779 | spec->num_dmics = 1; | ||
4780 | spec->num_smuxes = 0; | ||
4781 | spec->num_dmuxes = 0; | ||
4764 | break; | 4782 | break; |
4765 | default: | 4783 | default: |
4766 | spec->num_dmics = STAC92HD71BXX_NUM_DMICS; | 4784 | spec->num_dmics = STAC92HD71BXX_NUM_DMICS; |