diff options
author | Stephen Warren <swarren@nvidia.com> | 2010-08-10 00:41:40 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-08-10 02:41:14 -0400 |
commit | 9cf2657d05f9f9e04c3e113d68bf7cef5a942070 (patch) | |
tree | 50813f230c6c35ff75dc3b736a503d1aefe5e651 /sound/pci | |
parent | 850eab9d1b74f4ec9de16df68f008d0a65aafae7 (diff) |
ALSA: hda - patch_nvhdmi.c: Add missing codec IDs, unify names
* Add missing codec IDs.
* Modify some existing codec names for discrete GPUs to match newly
added IDs. Note: existing names were a mixture of marketing and
engineering GPU names. Equally, there's no reason that codec IDs
have to be specific to a particular GPU or board, so identify
codecs in a less marketing-oriented fashion.
* Reformat codec ID table so it's easier to read, for me at least.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_nvhdmi.c | 61 |
1 files changed, 41 insertions, 20 deletions
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c index a281836fd472..77e2b4028b9f 100644 --- a/sound/pci/hda/patch_nvhdmi.c +++ b/sound/pci/hda/patch_nvhdmi.c | |||
@@ -540,26 +540,32 @@ static int patch_nvhdmi_2ch(struct hda_codec *codec) | |||
540 | * patch entries | 540 | * patch entries |
541 | */ | 541 | */ |
542 | static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { | 542 | static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { |
543 | { .id = 0x10de0002, .name = "MCP77/78 HDMI", | 543 | { .id = 0x10de0002, .name = "MCP77/78 HDMI", .patch = patch_nvhdmi_8ch_7x }, |
544 | .patch = patch_nvhdmi_8ch_7x }, | 544 | { .id = 0x10de0003, .name = "MCP77/78 HDMI", .patch = patch_nvhdmi_8ch_7x }, |
545 | { .id = 0x10de0003, .name = "MCP77/78 HDMI", | 545 | { .id = 0x10de0005, .name = "MCP77/78 HDMI", .patch = patch_nvhdmi_8ch_7x }, |
546 | .patch = patch_nvhdmi_8ch_7x }, | 546 | { .id = 0x10de0006, .name = "MCP77/78 HDMI", .patch = patch_nvhdmi_8ch_7x }, |
547 | { .id = 0x10de0005, .name = "MCP77/78 HDMI", | 547 | { .id = 0x10de0007, .name = "MCP79/7A HDMI", .patch = patch_nvhdmi_8ch_7x }, |
548 | .patch = patch_nvhdmi_8ch_7x }, | 548 | { .id = 0x10de000a, .name = "GPU 0a HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
549 | { .id = 0x10de0006, .name = "MCP77/78 HDMI", | 549 | { .id = 0x10de000b, .name = "GPU 0b HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
550 | .patch = patch_nvhdmi_8ch_7x }, | 550 | { .id = 0x10de000c, .name = "MCP89 HDMI", .patch = patch_nvhdmi_8ch_89 }, |
551 | { .id = 0x10de0007, .name = "MCP79/7A HDMI", | 551 | { .id = 0x10de000d, .name = "GPU 0d HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
552 | .patch = patch_nvhdmi_8ch_7x }, | 552 | { .id = 0x10de0010, .name = "GPU 10 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
553 | { .id = 0x10de000a, .name = "GT220 HDMI", | 553 | { .id = 0x10de0011, .name = "GPU 11 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
554 | .patch = patch_nvhdmi_8ch_89 }, | 554 | { .id = 0x10de0012, .name = "GPU 12 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
555 | { .id = 0x10de000b, .name = "GT21x HDMI", | 555 | { .id = 0x10de0013, .name = "GPU 13 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
556 | .patch = patch_nvhdmi_8ch_89 }, | 556 | { .id = 0x10de0014, .name = "GPU 14 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
557 | { .id = 0x10de000c, .name = "MCP89 HDMI", | 557 | { .id = 0x10de0018, .name = "GPU 18 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
558 | .patch = patch_nvhdmi_8ch_89 }, | 558 | { .id = 0x10de0019, .name = "GPU 19 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
559 | { .id = 0x10de000d, .name = "GT240 HDMI", | 559 | { .id = 0x10de001a, .name = "GPU 1a HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
560 | .patch = patch_nvhdmi_8ch_89 }, | 560 | { .id = 0x10de001b, .name = "GPU 1b HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
561 | { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch }, | 561 | { .id = 0x10de001c, .name = "GPU 1c HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
562 | { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch }, | 562 | { .id = 0x10de0040, .name = "GPU 40 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, |
563 | { .id = 0x10de0041, .name = "GPU 41 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, | ||
564 | { .id = 0x10de0042, .name = "GPU 42 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, | ||
565 | { .id = 0x10de0043, .name = "GPU 43 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, | ||
566 | { .id = 0x10de0044, .name = "GPU 44 HDMI/DP", .patch = patch_nvhdmi_8ch_89 }, | ||
567 | { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch }, | ||
568 | { .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch }, | ||
563 | {} /* terminator */ | 569 | {} /* terminator */ |
564 | }; | 570 | }; |
565 | 571 | ||
@@ -572,6 +578,21 @@ MODULE_ALIAS("snd-hda-codec-id:10de000a"); | |||
572 | MODULE_ALIAS("snd-hda-codec-id:10de000b"); | 578 | MODULE_ALIAS("snd-hda-codec-id:10de000b"); |
573 | MODULE_ALIAS("snd-hda-codec-id:10de000c"); | 579 | MODULE_ALIAS("snd-hda-codec-id:10de000c"); |
574 | MODULE_ALIAS("snd-hda-codec-id:10de000d"); | 580 | MODULE_ALIAS("snd-hda-codec-id:10de000d"); |
581 | MODULE_ALIAS("snd-hda-codec-id:10de0010"); | ||
582 | MODULE_ALIAS("snd-hda-codec-id:10de0011"); | ||
583 | MODULE_ALIAS("snd-hda-codec-id:10de0012"); | ||
584 | MODULE_ALIAS("snd-hda-codec-id:10de0013"); | ||
585 | MODULE_ALIAS("snd-hda-codec-id:10de0014"); | ||
586 | MODULE_ALIAS("snd-hda-codec-id:10de0018"); | ||
587 | MODULE_ALIAS("snd-hda-codec-id:10de0019"); | ||
588 | MODULE_ALIAS("snd-hda-codec-id:10de001a"); | ||
589 | MODULE_ALIAS("snd-hda-codec-id:10de001b"); | ||
590 | MODULE_ALIAS("snd-hda-codec-id:10de001c"); | ||
591 | MODULE_ALIAS("snd-hda-codec-id:10de0040"); | ||
592 | MODULE_ALIAS("snd-hda-codec-id:10de0041"); | ||
593 | MODULE_ALIAS("snd-hda-codec-id:10de0042"); | ||
594 | MODULE_ALIAS("snd-hda-codec-id:10de0043"); | ||
595 | MODULE_ALIAS("snd-hda-codec-id:10de0044"); | ||
575 | MODULE_ALIAS("snd-hda-codec-id:10de0067"); | 596 | MODULE_ALIAS("snd-hda-codec-id:10de0067"); |
576 | MODULE_ALIAS("snd-hda-codec-id:10de8001"); | 597 | MODULE_ALIAS("snd-hda-codec-id:10de8001"); |
577 | 598 | ||