iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: hda - Add new Kconfig CONFIG_SND_HDA_CODEC_CA0132_DSP

Browse Source 
... to be less confusing for the update path.

This new kconfig will choose CONFIG_SND_HDA_DSP_LOADER, which is
basically a device-independent feature in hda_intel.c.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2013-02-04 18:25:51 +01:00
parent ccd7bd3d07
commit 24f3cede59
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sound/pci/hda/Kconfig
View File

@ -15,6 +15,9 @@ menuconfig SND_HDA_INTEL
if SND_HDA_INTEL if SND_HDA_INTEL
config SND_HDA_DSP_LOADER
bool
config SND_HDA_PREALLOC_SIZE config SND_HDA_PREALLOC_SIZE
int "Pre-allocated buffer size for HD-audio driver" int "Pre-allocated buffer size for HD-audio driver"
range 0 32768 range 0 32768
@ -197,6 +200,17 @@ config SND_HDA_CODEC_CA0132
snd-hda-codec-ca0132. snd-hda-codec-ca0132.
This module is automatically loaded at probing. This module is automatically loaded at probing.
config SND_HDA_CODEC_CA0132_DSP
bool "Support new DSP code for CA0132 codec"
depends on SND_HDA_CODEC_CA0132 && FW_LOADER
select SND_HDA_DSP_LOADER
help
Say Y here to enable the DSP for Creative CA0132 for extended
features like equalizer or echo cancellation.
Note that this option requires the external firmware file
(ctefx.bin).
config SND_HDA_CODEC_CMEDIA config SND_HDA_CODEC_CMEDIA
bool "Build C-Media HD-audio codec support" bool "Build C-Media HD-audio codec support"
default y default y
@ -236,12 +250,4 @@ config SND_HDA_POWER_SAVE_DEFAULT
The default time-out value in seconds for HD-audio automatic The default time-out value in seconds for HD-audio automatic
power-save mode. 0 means to disable the power-save mode. power-save mode. 0 means to disable the power-save mode.
config SND_HDA_DSP_LOADER
bool "Enable DSP firmware loader"
depends on FW_LOADER
default y
help
Say Y here to enable the DSP firmware loader, used by certain
codecs (e.g. CA0132) to transfer their DSP binaries to the hardware.
endif endif

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

@ -75,7 +75,7 @@
#define EFX_FILE "ctefx.bin" #define EFX_FILE "ctefx.bin"
#ifdef CONFIG_SND_HDA_DSP_LOADER #ifdef CONFIG_SND_HDA_CODEC_CA0132_DSP
MODULE_FIRMWARE(EFX_FILE); MODULE_FIRMWARE(EFX_FILE);
#endif #endif
@ -4530,7 +4530,7 @@ static int ca0132_init(struct hda_codec *codec)
ca0132_init_params(codec); ca0132_init_params(codec);
ca0132_init_flags(codec); ca0132_init_flags(codec);
snd_hda_sequence_write(codec, spec->base_init_verbs); snd_hda_sequence_write(codec, spec->base_init_verbs);
#ifdef CONFIG_SND_HDA_DSP_LOADER #ifdef CONFIG_SND_HDA_CODEC_CA0132_DSP
ca0132_download_dsp(codec); ca0132_download_dsp(codec);
#endif #endif
ca0132_refresh_widget_caps(codec); ca0132_refresh_widget_caps(codec);