Commit 88268ce8 authored by Connor McAdams's avatar Connor McAdams Committed by Takashi Iwai

ALSA: hda/ca0132 - Set AE-5 bools and select mixer

This patch sets the bool values for the AE-5, as well as selects the
mixer it will use.
Signed-off-by: default avatarConnor McAdams <conmanx360@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d06feaf0
...@@ -7597,7 +7597,11 @@ static int ca0132_prepare_verbs(struct hda_codec *codec) ...@@ -7597,7 +7597,11 @@ static int ca0132_prepare_verbs(struct hda_codec *codec)
struct ca0132_spec *spec = codec->spec; struct ca0132_spec *spec = codec->spec;
spec->chip_init_verbs = ca0132_init_verbs0; 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->desktop_init_verbs = ca0132_init_verbs1;
spec->spec_init_verbs = kcalloc(NUM_SPEC_VERBS, spec->spec_init_verbs = kcalloc(NUM_SPEC_VERBS,
sizeof(struct hda_verb), sizeof(struct hda_verb),
...@@ -7671,6 +7675,10 @@ static int patch_ca0132(struct hda_codec *codec) ...@@ -7671,6 +7675,10 @@ static int patch_ca0132(struct hda_codec *codec)
spec->mixers[0] = r3di_mixer; spec->mixers[0] = r3di_mixer;
snd_hda_codec_set_name(codec, "Recon3Di"); snd_hda_codec_set_name(codec, "Recon3Di");
break; break;
case QUIRK_AE5:
spec->mixers[0] = desktop_mixer;
snd_hda_codec_set_name(codec, "Sound BlasterX AE-5");
break;
default: default:
spec->mixers[0] = ca0132_mixer; spec->mixers[0] = ca0132_mixer;
break; break;
...@@ -7680,6 +7688,7 @@ static int patch_ca0132(struct hda_codec *codec) ...@@ -7680,6 +7688,7 @@ static int patch_ca0132(struct hda_codec *codec)
switch (spec->quirk) { switch (spec->quirk) {
case QUIRK_SBZ: case QUIRK_SBZ:
case QUIRK_R3D: case QUIRK_R3D:
case QUIRK_AE5:
spec->use_alt_controls = true; spec->use_alt_controls = true;
spec->use_alt_functions = true; spec->use_alt_functions = true;
spec->use_pci_mmio = true; spec->use_pci_mmio = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment