diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-01-23 16:19:29 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-01-23 16:21:31 -0500 |
commit | 5f6c3de6a79820de124fa2bb1b77d43a09410e42 (patch) | |
tree | 823f4a7e3d36efa04b1f628ec901478406953ad8 /sound/pci | |
parent | 9e4c84967ef027fe50a03cf48dd6da9519c8e60c (diff) |
ALSA: hda - Minor fixes for Compaq Presario F700 quirk
Minor fixes for HP Compaq Presario F700 quirks with Cxt5051 codec:
- changed the capture mixer elements to the standard name.
- fixed the quirk name string without a space
- sorted the quirk list
- updated the documentation
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_conexant.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 685015a53292..084600e40829 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c | |||
@@ -1742,8 +1742,8 @@ static struct snd_kcontrol_new cxt5051_hp_dv6736_mixers[] = { | |||
1742 | }; | 1742 | }; |
1743 | 1743 | ||
1744 | static struct snd_kcontrol_new cxt5051_f700_mixers[] = { | 1744 | static struct snd_kcontrol_new cxt5051_f700_mixers[] = { |
1745 | HDA_CODEC_VOLUME("Mic Volume", 0x14, 0x01, HDA_INPUT), | 1745 | HDA_CODEC_VOLUME("Capture Volume", 0x14, 0x01, HDA_INPUT), |
1746 | HDA_CODEC_MUTE("Mic Switch", 0x14, 0x01, HDA_INPUT), | 1746 | HDA_CODEC_MUTE("Capture Switch", 0x14, 0x01, HDA_INPUT), |
1747 | HDA_CODEC_VOLUME("Master Playback Volume", 0x10, 0x00, HDA_OUTPUT), | 1747 | HDA_CODEC_VOLUME("Master Playback Volume", 0x10, 0x00, HDA_OUTPUT), |
1748 | { | 1748 | { |
1749 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 1749 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
@@ -1901,17 +1901,17 @@ static const char *cxt5051_models[CXT5051_MODELS] = { | |||
1901 | [CXT5051_HP] = "hp", | 1901 | [CXT5051_HP] = "hp", |
1902 | [CXT5051_HP_DV6736] = "hp-dv6736", | 1902 | [CXT5051_HP_DV6736] = "hp-dv6736", |
1903 | [CXT5051_LENOVO_X200] = "lenovo-x200", | 1903 | [CXT5051_LENOVO_X200] = "lenovo-x200", |
1904 | [CXT5051_F700] = "hp 700" | 1904 | [CXT5051_F700] = "hp-700", |
1905 | }; | 1905 | }; |
1906 | 1906 | ||
1907 | static struct snd_pci_quirk cxt5051_cfg_tbl[] = { | 1907 | static struct snd_pci_quirk cxt5051_cfg_tbl[] = { |
1908 | SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV6736", CXT5051_HP_DV6736), | 1908 | SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV6736", CXT5051_HP_DV6736), |
1909 | SND_PCI_QUIRK(0x103c, 0x360b, "Compaq Presario CQ60", CXT5051_HP), | 1909 | SND_PCI_QUIRK(0x103c, 0x360b, "Compaq Presario CQ60", CXT5051_HP), |
1910 | SND_PCI_QUIRK(0x103c, 0x30ea, "Compaq Presario F700", CXT5051_F700), | ||
1910 | SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board", | 1911 | SND_PCI_QUIRK(0x14f1, 0x0101, "Conexant Reference board", |
1911 | CXT5051_LAPTOP), | 1912 | CXT5051_LAPTOP), |
1912 | SND_PCI_QUIRK(0x14f1, 0x5051, "HP Spartan 1.1", CXT5051_HP), | 1913 | SND_PCI_QUIRK(0x14f1, 0x5051, "HP Spartan 1.1", CXT5051_HP), |
1913 | SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo X200", CXT5051_LENOVO_X200), | 1914 | SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo X200", CXT5051_LENOVO_X200), |
1914 | SND_PCI_QUIRK(0x103c, 0x30ea, "Compaq Presario F700", CXT5051_F700), | ||
1915 | {} | 1915 | {} |
1916 | }; | 1916 | }; |
1917 | 1917 | ||