aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-05-11 02:39:24 -0400
committerTakashi Iwai <tiwai@suse.de>2012-05-12 03:36:44 -0400
commit2d825fd82eb765412a558a56e193b77117d56699 (patch)
treeb304fea239fc7a6978d63ea72717ec30161a10d9 /sound/pci
parentc3b6bcc292da80ea08a979af177538ffdbbae36b (diff)
ALSA: hda/conexant - Correct vendor IDs for new codecs
Never trust datasheet... Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_conexant.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index a03fc333ecf7..3acb5824ad39 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -4559,10 +4559,6 @@ static int patch_conexant_auto(struct hda_codec *codec)
4559 */ 4559 */
4560 4560
4561static const struct hda_codec_preset snd_hda_preset_conexant[] = { 4561static const struct hda_codec_preset snd_hda_preset_conexant[] = {
4562 { .id = 0x14f11510, .name = "CX20751/2",
4563 .patch = patch_conexant_auto },
4564 { .id = 0x14f11511, .name = "CX20753/4",
4565 .patch = patch_conexant_auto },
4566 { .id = 0x14f15045, .name = "CX20549 (Venice)", 4562 { .id = 0x14f15045, .name = "CX20549 (Venice)",
4567 .patch = patch_cxt5045 }, 4563 .patch = patch_cxt5045 },
4568 { .id = 0x14f15047, .name = "CX20551 (Waikiki)", 4564 { .id = 0x14f15047, .name = "CX20551 (Waikiki)",
@@ -4597,11 +4593,15 @@ static const struct hda_codec_preset snd_hda_preset_conexant[] = {
4597 .patch = patch_conexant_auto }, 4593 .patch = patch_conexant_auto },
4598 { .id = 0x14f150b9, .name = "CX20665", 4594 { .id = 0x14f150b9, .name = "CX20665",
4599 .patch = patch_conexant_auto }, 4595 .patch = patch_conexant_auto },
4596 { .id = 0x14f1510f, .name = "CX20751/2",
4597 .patch = patch_conexant_auto },
4598 { .id = 0x14f15110, .name = "CX20751/2",
4599 .patch = patch_conexant_auto },
4600 { .id = 0x14f15111, .name = "CX20753/4",
4601 .patch = patch_conexant_auto },
4600 {} /* terminator */ 4602 {} /* terminator */
4601}; 4603};
4602 4604
4603MODULE_ALIAS("snd-hda-codec-id:14f11510");
4604MODULE_ALIAS("snd-hda-codec-id:14f11511");
4605MODULE_ALIAS("snd-hda-codec-id:14f15045"); 4605MODULE_ALIAS("snd-hda-codec-id:14f15045");
4606MODULE_ALIAS("snd-hda-codec-id:14f15047"); 4606MODULE_ALIAS("snd-hda-codec-id:14f15047");
4607MODULE_ALIAS("snd-hda-codec-id:14f15051"); 4607MODULE_ALIAS("snd-hda-codec-id:14f15051");
@@ -4619,6 +4619,9 @@ MODULE_ALIAS("snd-hda-codec-id:14f150ab");
4619MODULE_ALIAS("snd-hda-codec-id:14f150ac"); 4619MODULE_ALIAS("snd-hda-codec-id:14f150ac");
4620MODULE_ALIAS("snd-hda-codec-id:14f150b8"); 4620MODULE_ALIAS("snd-hda-codec-id:14f150b8");
4621MODULE_ALIAS("snd-hda-codec-id:14f150b9"); 4621MODULE_ALIAS("snd-hda-codec-id:14f150b9");
4622MODULE_ALIAS("snd-hda-codec-id:14f1510f");
4623MODULE_ALIAS("snd-hda-codec-id:14f15110");
4624MODULE_ALIAS("snd-hda-codec-id:14f15111");
4622 4625
4623MODULE_LICENSE("GPL"); 4626MODULE_LICENSE("GPL");
4624MODULE_DESCRIPTION("Conexant HD-audio codec"); 4627MODULE_DESCRIPTION("Conexant HD-audio codec");