ALSA: emu10k1: minor E-MU naming fixups

- Fix mixer source port names. These will require some users to
  re-adjust their mixer settings, which seems acceptable:
  - The S/PDIF port is on the main 1010 card, not the 0202 daughter card
  - The 1616m CardBus card has all inputs on the dock, so there is
    no point in specifying it
  - Conversely, the 1010 card has "dispersed" inputs, so say where the
    ADAT port is, consistently with the S/PDIF port
- The 1616m CardBus card is actually named E-MU 02 (due to the headphone
  output jack it has)
- Fix capitalization of "E-MU"

Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Link: https://lore.kernel.org/r/20230428095941.1706335-1-oswald.buddenhagen@gmx.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 192208c..068cb66 100644 (file)
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1310,7 +1310,7 @@ static const struct snd_emu_chip_details emu_chip_details[] = {
        /* Does NOT support sync daughter card (obviously). */
        /* 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 02 CardBus [MAEM8950]",
         .id = "EMU1010",
         .emu10k2_chip = 1,
         .ca0108_chip = 1,
@@ -1323,7 +1323,7 @@ static const struct snd_emu_chip_details emu_chip_details[] = {
         * MicroDock[M] to make it an E-MU 1616[m]. */
        /* Does NOT support sync daughter card. */
        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40041102,
-        .driver = "Audigy2", .name = "E-mu 1010b PCI [MAEM8960]",
+        .driver = "Audigy2", .name = "E-MU 1010b PCI [MAEM8960]",
         .id = "EMU1010",
         .emu10k2_chip = 1,
         .ca0108_chip = 1,
@@ -1337,7 +1337,7 @@ static const struct snd_emu_chip_details emu_chip_details[] = {
         * still work. */
        /* Does NOT support sync daughter card. */
        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40071102,
-        .driver = "Audigy2", .name = "E-mu 1010 PCIe [MAEM8986]",
+        .driver = "Audigy2", .name = "E-MU 1010 PCIe [MAEM8986]",
         .id = "EMU1010",
         .emu10k2_chip = 1,
         .ca0108_chip = 1,
@@ -1349,7 +1349,7 @@ static const struct snd_emu_chip_details emu_chip_details[] = {
         * AudioDock[M] to make it an E-MU 1820[m]. */
        /* Supports sync daughter card. */
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102,
-        .driver = "Audigy2", .name = "E-mu 1010 [MAEM8810]",
+        .driver = "Audigy2", .name = "E-MU 1010 [MAEM8810]",
         .id = "EMU1010",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
@@ -1359,7 +1359,7 @@ static const struct snd_emu_chip_details emu_chip_details[] = {
        /* Supports sync daughter card. */
        /* Tested by oswald.buddenhagen@gmx.de Mar 2023. */
        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40021102,
-        .driver = "Audigy2", .name = "E-mu 0404b PCI [MAEM8852]",
+        .driver = "Audigy2", .name = "E-MU 0404b PCI [MAEM8852]",
         .id = "EMU0404",
         .emu10k2_chip = 1,
         .ca0108_chip = 1,
@@ -1369,7 +1369,7 @@ static const struct snd_emu_chip_details emu_chip_details[] = {
        /* Supports sync daughter card. */
        /* Tested by James@superbug.co.uk 20-3-2007. */
        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40021102,
-        .driver = "Audigy2", .name = "E-mu 0404 [MAEM8850]",
+        .driver = "Audigy2", .name = "E-MU 0404 [MAEM8850]",
         .id = "EMU0404",
         .emu10k2_chip = 1,
         .ca0102_chip = 1,
@@ -1378,7 +1378,7 @@ static const struct snd_emu_chip_details emu_chip_details[] = {
        /* EMU0404 PCIe */
        /* Does NOT support sync daughter card. */
        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40051102,
-        .driver = "Audigy2", .name = "E-mu 0404 PCIe [MAEM8984]",
+        .driver = "Audigy2", .name = "E-MU 0404 PCIe [MAEM8984]",
         .id = "EMU0404",
         .emu10k2_chip = 1,
         .ca0108_chip = 1,
@@ -1645,7 +1645,7 @@ static const struct snd_emu_chip_details emu_chip_details[] = {
         .ac97_chip = 1,
         .sblive51 = 1} ,
        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102,
-        .driver = "EMU10K1", .name = "E-mu APS [PC545]",
+        .driver = "EMU10K1", .name = "E-MU APS [PC545]",
         .id = "APS",
         .emu10k1_chip = 1,
         .ecard = 1} ,

diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c
index ab04f8b..610700b 100644 (file)
--- a/sound/pci/emu10k1/emumixer.c
+++ b/sound/pci/emu10k1/emumixer.c
@@ -78,16 +78,16 @@ static const char * const emu1010_src_texts[] = {
        "Dock ADC3 Right",
        "0202 ADC Left",
        "0202 ADC Right",
-       "0202 SPDIF Left",
-       "0202 SPDIF Right",
-       "ADAT 0",
-       "ADAT 1",
-       "ADAT 2",
-       "ADAT 3",
-       "ADAT 4",
-       "ADAT 5",
-       "ADAT 6",
-       "ADAT 7",
+       "1010 SPDIF Left",
+       "1010 SPDIF Right",
+       "1010 ADAT 0",
+       "1010 ADAT 1",
+       "1010 ADAT 2",
+       "1010 ADAT 3",
+       "1010 ADAT 4",
+       "1010 ADAT 5",
+       "1010 ADAT 6",
+       "1010 ADAT 7",
        "DSP 0",
        "DSP 1",
        "DSP 2",
@@ -126,14 +126,14 @@ static const char * const emu1010_src_texts[] = {
 
 static const char * const emu1616_src_texts[] = {
        "Silence",
-       "Dock Mic A",
-       "Dock Mic B",
-       "Dock ADC1 Left",
-       "Dock ADC1 Right",
-       "Dock ADC2 Left",
-       "Dock ADC2 Right",
-       "Dock SPDIF Left",
-       "Dock SPDIF Right",
+       "Mic A",
+       "Mic B",
+       "ADC1 Left",
+       "ADC1 Right",
+       "ADC2 Left",
+       "ADC2 Right",
+       "SPDIF Left",
+       "SPDIF Right",
        "ADAT 0",
        "ADAT 1",
        "ADAT 2",