ALSA: emu10k1: fix device names for Live!/Audigy1/2/4/E-mu

* added missing SBxxxx, CTxxxx, PCxxx and MAEMxxxx where they were missing,
and fixed some of them which were wrong (according to kx.inf, which is pretty
accurate compared to anything out there)
* fixed device names to make them more consistent across various cards
* fixed order of devices where appropriate

Signed-off-by: Vedran Miletic <rivanvx@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 76 insertions, 70 deletions

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 2f283ea6ad9a..423aa0de1fad 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1292,21 +1292,6 @@ static int snd_emu10k1_dev_free(struct snd_device *device)
 }
 
 static struct snd_emu_chip_details emu_chip_details[] = {
-        /* Audigy 2 Value AC3 out does not work yet. Need to find out how to turn off interpolators.*/
-        /* Tested by James@superbug.co.uk 3rd July 2005 */
-        /* DSP: CA0108-IAT
-         * DAC: CS4382-KQ
-         * ADC: Philips 1361T
-         * AC97: STAC9750
-         * CA0151: None
-         */
-        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10011102,
-         .driver = "Audigy2", .name = "Audigy 2 Value [SB0400]", 
-         .id = "Audigy2",
-         .emu10k2_chip = 1,
-         .ca0108_chip = 1,
-         .spk71 = 1,
-         .ac97_chip = 1} ,
         /* Audigy4 (Not PRO) SB0610 */
         /* Tested by James@superbug.co.uk 4th April 2006 */
         /* A_IOCFG bits
@@ -1346,20 +1331,37 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          * CA0151: None
          */
         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10211102,
-         .driver = "Audigy2", .name = "Audigy 4 [SB0610]", 
+         .driver = "Audigy2", .name = "SB Audigy 4 [SB0610]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0108_chip = 1,
          .spk71 = 1,
          .adc_1361t = 1,  /* 24 bit capture instead of 16bit */
          .ac97_chip = 1} ,
+        /* Audigy 2 Value AC3 out does not work yet.
+         * Need to find out how to turn off interpolators.
+         */
+        /* Tested by James@superbug.co.uk 3rd July 2005 */
+        /* DSP: CA0108-IAT
+         * DAC: CS4382-KQ
+         * ADC: Philips 1361T
+         * AC97: STAC9750
+         * CA0151: None
+         */
+        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10011102,
+         .driver = "Audigy2", .name = "SB Audigy 2 Value [SB0400]",
+         .id = "Audigy2",
+         .emu10k2_chip = 1,
+         .ca0108_chip = 1,
+         .spk71 = 1,
+         .ac97_chip = 1} ,
         /* Audigy 2 ZS Notebook Cardbus card.*/
         /* Tested by James@superbug.co.uk 6th November 2006 */
         /* Audio output 7.1/Headphones working.
          * Digital output working. (AC3 not checked, only PCM)
          * Audio Mic/Line inputs working.
          * Digital input not tested.
-         */ 
+         */
         /* DSP: Tina2
          * DAC: Wolfson WM8768/WM8568
          * ADC: Wolfson WM8775
@@ -1386,7 +1388,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          *
          */
         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x20011102,
-         .driver = "Audigy2", .name = "Audigy 2 ZS Notebook [SB0530]", 
+         .driver = "Audigy2", .name = "SB Audigy 2 ZS Notebook [SB0530]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0108_chip = 1,
@@ -1396,7 +1398,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .spk71 = 1} ,
         /* Tested by James@superbug.co.uk 4th Nov 2007. */
         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x42011102,
-         .driver = "Audigy2", .name = "E-mu 1010 Notebook [MAEM8950]", 
+         .driver = "Audigy2", .name = "E-mu 1010 Notebook [MAEM8950]",
          .id = "EMU1010",
          .emu10k2_chip = 1,
          .ca0108_chip = 1,
@@ -1404,47 +1406,50 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .spk71 = 1 ,
          .emu_model = EMU_MODEL_EMU1616},
         /* Tested by James@superbug.co.uk 4th Nov 2007. */
+        /* This is MAEM8960, 0202 is MAEM 8980 */
         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40041102,
-         .driver = "Audigy2", .name = "E-mu 1010b PCI [MAEM????]", 
+         .driver = "Audigy2", .name = "E-mu 1010b PCI [MAEM8960]",
          .id = "EMU1010",
          .emu10k2_chip = 1,
          .ca0108_chip = 1,
          .spk71 = 1,
-         .emu_model = EMU_MODEL_EMU1010B},
+         .emu_model = EMU_MODEL_EMU1010B}, /* EMU 1010 new revision */
         /* Tested by James@superbug.co.uk 8th July 2005. */
+        /* This is MAEM8810, 0202 is MAEM8820 */
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102,
-         .driver = "Audigy2", .name = "E-mu 1010 [4001]",
+         .driver = "Audigy2", .name = "E-mu 1010 [MAEM8810]",
          .id = "EMU1010",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
          .spk71 = 1,
-         .emu_model = EMU_MODEL_EMU1010}, /* Emu 1010 */
+         .emu_model = EMU_MODEL_EMU1010}, /* EMU 1010 old revision */
         /* EMU0404b */
         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40021102,
-         .driver = "Audigy2", .name = "E-mu 0404b [4002]",
+         .driver = "Audigy2", .name = "E-mu 0404b PCI [MAEM8852]",
          .id = "EMU0404",
          .emu10k2_chip = 1,
          .ca0108_chip = 1,
          .spk71 = 1,
-         .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
+         .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 new revision */
         /* Tested by James@superbug.co.uk 20-3-2007. */
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40021102,
-         .driver = "Audigy2", .name = "E-mu 0404 [4002]",
+         .driver = "Audigy2", .name = "E-mu 0404 [MAEM8850]",
          .id = "EMU0404",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
          .spk71 = 1,
          .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
+#endif
         /* Audigy4 (Not PRO) SB0610 */
-        {.vendor = 0x1102, .device = 0x0008, 
-         .driver = "Audigy2", .name = "Audigy 2 Value [Unknown]", 
+        {.vendor = 0x1102, .device = 0x0008,
+         .driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0108_chip = 1,
          .ac97_chip = 1} ,
         /* Tested by James@superbug.co.uk 3rd July 2005 */
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20071102,
-         .driver = "Audigy2", .name = "Audigy 4 PRO [SB0380]", 
+         .driver = "Audigy2", .name = "SB Audigy 4 PRO [SB0380]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
@@ -1457,7 +1462,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          * Just like 0x20021102
          */
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20061102,
-         .driver = "Audigy2", .name = "Audigy 2 [SB0350b]", 
+         .driver = "Audigy2", .name = "SB Audigy 2 [SB0350b]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
@@ -1466,7 +1471,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .spdif_bug = 1,
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20021102,
-         .driver = "Audigy2", .name = "Audigy 2 ZS [SB0350]", 
+         .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0350]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
@@ -1475,7 +1480,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .spdif_bug = 1,
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20011102,
-         .driver = "Audigy2", .name = "Audigy 2 ZS [2001]", 
+         .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0360]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
@@ -1492,7 +1497,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          * CA0151: Yes
          */
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10071102,
-         .driver = "Audigy2", .name = "Audigy 2 [SB0240]", 
+         .driver = "Audigy2", .name = "SB Audigy 2 [SB0240]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
@@ -1502,7 +1507,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .adc_1361t = 1,  /* 24 bit capture instead of 16bit */
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102,
-         .driver = "Audigy2", .name = "Audigy 2 EX [1005]", 
+         .driver = "Audigy2", .name = "SB Audigy 2 Platinum EX [SB0280]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
@@ -1512,7 +1517,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
         /* Dell OEM/Creative Labs Audigy 2 ZS */
         /* See ALSA bug#1365 */
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10031102,
-         .driver = "Audigy2", .name = "Audigy 2 ZS [SB0353]",
+         .driver = "Audigy2", .name = "SB Audigy 2 ZS [SB0353]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
@@ -1521,7 +1526,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .spdif_bug = 1,
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102,
-         .driver = "Audigy2", .name = "Audigy 2 Platinum [SB0240P]", 
+         .driver = "Audigy2", .name = "SB Audigy 2 Platinum [SB0240P]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
@@ -1532,7 +1537,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .adc_1361t = 1,  /* 24 bit capture instead of 16bit. Fixes ALSA bug#324 */
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .revision = 0x04,
-         .driver = "Audigy2", .name = "Audigy 2 [Unknown]",
+         .driver = "Audigy2", .name = "SB Audigy 2 [Unknown]",
          .id = "Audigy2",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
@@ -1540,78 +1545,79 @@ static struct snd_emu_chip_details emu_chip_details[] = {
          .spdif_bug = 1,
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00531102,
-         .driver = "Audigy", .name = "Audigy 1 [SB0090]", 
+         .driver = "Audigy", .name = "SB Audigy 1 [SB0092]",
          .id = "Audigy",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00521102,
-         .driver = "Audigy", .name = "Audigy 1 ES [SB0160]", 
+         .driver = "Audigy", .name = "SB Audigy 1 ES [SB0160]",
          .id = "Audigy",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
          .spdif_bug = 1,
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00511102,
-         .driver = "Audigy", .name = "Audigy 1 [SB0090]", 
+         .driver = "Audigy", .name = "SB Audigy 1 [SB0090]",
          .id = "Audigy",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0004,
-         .driver = "Audigy", .name = "Audigy 1 [Unknown]", 
+         .driver = "Audigy", .name = "Audigy 1 [Unknown]",
          .id = "Audigy",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
          .ac97_chip = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806B1102,
-         .driver = "EMU10K1", .name = "SBLive! [SB0105]", 
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x100a1102,
+         .driver = "EMU10K1", .name = "SB Live! 5.1 [SB0220]",
+         .id = "Live",
+         .emu10k1_chip = 1,
+         .ac97_chip = 1,
+         .sblive51 = 1} ,
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806b1102,
+         .driver = "EMU10K1", .name = "SB Live! [SB0105]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806A1102,
-         .driver = "EMU10K1", .name = "SBLive! Value [SB0103]", 
+        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806a1102,
+         .driver = "EMU10K1", .name = "SB Live! Value [SB0103]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80691102,
-         .driver = "EMU10K1", .name = "SBLive! Value [SB0101]", 
+         .driver = "EMU10K1", .name = "SB Live! Value [SB0101]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         /* Tested by ALSA bug#1680 26th December 2005 */
-        /* note: It really has SB0220 written on the card. */
+        /* note: It really has SB0220 written on the card, */
+        /* but it's SB0228 according to kx.inf */
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80661102,
-         .driver = "EMU10K1", .name = "SB Live 5.1 Dell OEM [SB0220]", 
+         .driver = "EMU10K1", .name = "SB Live! 5.1 Dell OEM [SB0228]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         /* Tested by Thomas Zehetbauer 27th Aug 2005 */
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80651102,
-         .driver = "EMU10K1", .name = "SB Live 5.1 [SB0220]", 
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x100a1102,
-         .driver = "EMU10K1", .name = "SB Live 5.1 [SB0220]", 
+         .driver = "EMU10K1", .name = "SB Live! 5.1 [SB0220]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80641102,
-         .driver = "EMU10K1", .name = "SB Live 5.1", 
+         .driver = "EMU10K1", .name = "SB Live! 5.1",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         /* Tested by alsa bugtrack user "hus" bug #1297 12th Aug 2005 */
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102,
-         .driver = "EMU10K1", .name = "SBLive 5.1 [SB0060]",
+         .driver = "EMU10K1", .name = "SB Live! 5.1 [SB0060]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 2, /* ac97 is optional; both SBLive 5.1 and platinum
@@ -1619,78 +1625,78 @@ static struct snd_emu_chip_details emu_chip_details[] = {
                           */
          .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80511102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4850]", 
+         .driver = "EMU10K1", .name = "SB Live! Value [CT4850]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102,
-         .driver = "EMU10K1", .name = "SBLive! Platinum [CT4760P]", 
+         .driver = "EMU10K1", .name = "SB Live! Platinum [CT4760P]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80321102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4871]", 
+         .driver = "EMU10K1", .name = "SB Live! Value [CT4871]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80311102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4831]", 
+         .driver = "EMU10K1", .name = "SB Live! Value [CT4831]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80281102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4870]", 
+         .driver = "EMU10K1", .name = "SB Live! Value [CT4870]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         /* Tested by James@superbug.co.uk 3rd July 2005 */
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80271102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4832]", 
+         .driver = "EMU10K1", .name = "SB Live! Value [CT4832]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80261102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4830]", 
+         .driver = "EMU10K1", .name = "SB Live! Value [CT4830]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80231102,
-         .driver = "EMU10K1", .name = "SB PCI512 [CT4790]", 
+         .driver = "EMU10K1", .name = "SB PCI512 [CT4790]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80221102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4780]", 
+         .driver = "EMU10K1", .name = "SB Live! Value [CT4780]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102,
-         .driver = "EMU10K1", .name = "E-mu APS [4001]", 
+         .driver = "EMU10K1", .name = "E-mu APS [PC545]",
          .id = "APS",
          .emu10k1_chip = 1,
          .ecard = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00211102,
-         .driver = "EMU10K1", .name = "SBLive! [CT4620]", 
+         .driver = "EMU10K1", .name = "SB Live! [CT4620]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00201102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4670]", 
+         .driver = "EMU10K1", .name = "SB Live! Value [CT4670]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,
          .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002,
-         .driver = "EMU10K1", .name = "SB Live [Unknown]", 
+         .driver = "EMU10K1", .name = "SB Live! [Unknown]",
          .id = "Live",
          .emu10k1_chip = 1,
          .ac97_chip = 1,