Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 04:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda/ca0132 - Add ZxR init commands

Browse Source 
This patch adds init commands for the main Sound Blaster ZxR card.

Signed-off-by: Connor McAdams <conmanx360@gmail.com>
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Connor McAdams 2018-09-29 23:03:21 -04:00 committed by Takashi Iwai
parent 7675a2a939
commit 2e492b8ee5
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/pci/hda/patch_ca0132.c
View File

@ -7953,7 +7953,10 @@ static void ca0132_mmio_init(struct hda_codec *codec)
else else
writel(0x00000000, spec->mem_base + 0x40C); writel(0x00000000, spec->mem_base + 0x40C);
writel(0x00880680, spec->mem_base + 0x01C); if (spec->quirk == QUIRK_ZXR)
writel(0x00880640, spec->mem_base + 0x01C);
else
writel(0x00880680, spec->mem_base + 0x01C);
if (spec->quirk == QUIRK_AE5) if (spec->quirk == QUIRK_AE5)
writel(0x00000080, spec->mem_base + 0xC0C); writel(0x00000080, spec->mem_base + 0xC0C);
@ -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)
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)
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;