Commit 2e492b8e authored by Connor McAdams's avatar Connor McAdams Committed by Takashi Iwai

ALSA: hda/ca0132 - Add ZxR init commands

This patch adds init commands for the main Sound Blaster ZxR card.
Signed-off-by: default avatarConnor McAdams <conmanx360@gmail.com>
Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7675a2a9
...@@ -7953,6 +7953,9 @@ static void ca0132_mmio_init(struct hda_codec *codec) ...@@ -7953,6 +7953,9 @@ static void ca0132_mmio_init(struct hda_codec *codec)
else else
writel(0x00000000, spec->mem_base + 0x40C); writel(0x00000000, spec->mem_base + 0x40C);
if (spec->quirk == QUIRK_ZXR)
writel(0x00880640, spec->mem_base + 0x01C);
else
writel(0x00880680, spec->mem_base + 0x01C); writel(0x00880680, spec->mem_base + 0x01C);
if (spec->quirk == QUIRK_AE5) if (spec->quirk == QUIRK_AE5)
...@@ -8091,6 +8094,10 @@ static void ca0132_alt_init(struct hda_codec *codec) ...@@ -8091,6 +8094,10 @@ static void ca0132_alt_init(struct hda_codec *codec)
snd_hda_sequence_write(codec, spec->desktop_init_verbs); snd_hda_sequence_write(codec, spec->desktop_init_verbs);
ca0113_mmio_command_set(codec, 0x30, 0x32, 0x3f); ca0113_mmio_command_set(codec, 0x30, 0x32, 0x3f);
break; break;
case QUIRK_ZXR:
snd_hda_sequence_write(codec, spec->chip_init_verbs);
snd_hda_sequence_write(codec, spec->desktop_init_verbs);
break;
} }
} }
...@@ -8585,6 +8592,10 @@ static int patch_ca0132(struct hda_codec *codec) ...@@ -8585,6 +8592,10 @@ static int patch_ca0132(struct hda_codec *codec)
spec->mixers[0] = desktop_mixer; spec->mixers[0] = desktop_mixer;
snd_hda_codec_set_name(codec, "Sound Blaster Z"); snd_hda_codec_set_name(codec, "Sound Blaster Z");
break; break;
case QUIRK_ZXR:
spec->mixers[0] = desktop_mixer;
snd_hda_codec_set_name(codec, "Sound Blaster ZxR");
break;
case QUIRK_ZXR_DBPRO: case QUIRK_ZXR_DBPRO:
codec->patch_ops = dbpro_patch_ops; codec->patch_ops = dbpro_patch_ops;
break; break;
...@@ -8610,6 +8621,7 @@ static int patch_ca0132(struct hda_codec *codec) ...@@ -8610,6 +8621,7 @@ static int patch_ca0132(struct hda_codec *codec)
case QUIRK_SBZ: case QUIRK_SBZ:
case QUIRK_R3D: case QUIRK_R3D:
case QUIRK_AE5: case QUIRK_AE5:
case QUIRK_ZXR:
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