]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ALSA: hda/ca0132 - Set AE-5 bools and select mixer
authorConnor McAdams <conmanx360@gmail.com>
Tue, 18 Sep 2018 18:33:32 +0000 (14:33 -0400)
committerTakashi Iwai <tiwai@suse.de>
Thu, 20 Sep 2018 07:16:59 +0000 (09:16 +0200)
This patch sets the bool values for the AE-5, as well as selects the
mixer it will use.

Signed-off-by: Connor McAdams <conmanx360@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_ca0132.c

index fe1829b4e2d333ffebda602ee5da8d76c1f3cbb6..9caa2678866b83f10654e2e8ec5714bab9c54e7a 100644 (file)
@@ -7597,7 +7597,11 @@ static int ca0132_prepare_verbs(struct hda_codec *codec)
        struct ca0132_spec *spec = codec->spec;
 
        spec->chip_init_verbs = ca0132_init_verbs0;
-       if (spec->quirk == QUIRK_SBZ || spec->quirk == QUIRK_R3D)
+       /*
+        * Since desktop cards use pci_mmio, this can be used to determine
+        * whether or not to use these verbs instead of a separate bool.
+        */
+       if (spec->use_pci_mmio)
                spec->desktop_init_verbs = ca0132_init_verbs1;
        spec->spec_init_verbs = kcalloc(NUM_SPEC_VERBS,
                                        sizeof(struct hda_verb),
@@ -7671,6 +7675,10 @@ static int patch_ca0132(struct hda_codec *codec)
                spec->mixers[0] = r3di_mixer;
                snd_hda_codec_set_name(codec, "Recon3Di");
                break;
+       case QUIRK_AE5:
+               spec->mixers[0] = desktop_mixer;
+               snd_hda_codec_set_name(codec, "Sound BlasterX AE-5");
+               break;
        default:
                spec->mixers[0] = ca0132_mixer;
                break;
@@ -7680,6 +7688,7 @@ static int patch_ca0132(struct hda_codec *codec)
        switch (spec->quirk) {
        case QUIRK_SBZ:
        case QUIRK_R3D:
+       case QUIRK_AE5:
                spec->use_alt_controls = true;
                spec->use_alt_functions = true;
                spec->use_pci_mmio = true;