redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ALSA: hda/ca0132 - Change firmware name and usage 

The Recon3D, AE-5, Z and ZxR all share the same firmware file. Rename
this from the specific "ctefx-sbz.bin" to "ctefx-desktop.bin" and set
the AE-5 and Recon3D to use it as well.

Signed-off-by: Connor McAdams <conmanx360@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
hifive-unleashed-5.1
Connor McAdams 2018-09-18 14:33:36 -04:00 committed by Takashi Iwai
parent 03c9b6b1e0
commit 7a928186b3
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,12 +81,12 @@
#define SCP_GET 1
#define EFX_FILE "ctefx.bin"
#define SBZ_EFX_FILE "ctefx-sbz.bin"
#define DESKTOP_EFX_FILE "ctefx-desktop.bin"
#define R3DI_EFX_FILE "ctefx-r3di.bin"
#ifdef CONFIG_SND_HDA_CODEC_CA0132_DSP
MODULE_FIRMWARE(EFX_FILE);
MODULE_FIRMWARE(SBZ_EFX_FILE);
MODULE_FIRMWARE(DESKTOP_EFX_FILE);
MODULE_FIRMWARE(R3DI_EFX_FILE);
#endif
@ -6770,12 +6770,14 @@ static bool ca0132_download_dsp_images(struct hda_codec *codec)
*/
switch (spec->quirk) {
case QUIRK_SBZ:
if (request_firmware(&fw_entry, SBZ_EFX_FILE,
case QUIRK_R3D:
case QUIRK_AE5:
if (request_firmware(&fw_entry, DESKTOP_EFX_FILE,
codec->card->dev) != 0) {
codec_dbg(codec, "SBZ alt firmware not detected. ");
codec_dbg(codec, "Desktop firmware not found. ");
spec->alt_firmware_present = false;
} else {
codec_dbg(codec, "Sound Blaster Z firmware selected.");
codec_dbg(codec, "Desktop firmware selected.");
spec->alt_firmware_present = true;
}
break;