aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-02-04 12:25:51 -0500
committerTakashi Iwai <tiwai@suse.de>2013-02-04 12:30:49 -0500
commit24f3cede590b2e072c64361867d220418a5df1a8 (patch)
tree1402821eca91bf64bdb8274b77291560ac2e8aaf /sound/pci
parentccd7bd3d07bd763f0e7397e6cef16aaec0489fdc (diff)
ALSA: hda - Add new Kconfig CONFIG_SND_HDA_CODEC_CA0132_DSP
... 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>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/Kconfig22
-rw-r--r--sound/pci/hda/patch_ca0132.c4
2 files changed, 16 insertions, 10 deletions
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index ba1dbd8e00a0..11b4b77a8215 100644
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
@@ -15,6 +15,9 @@ menuconfig SND_HDA_INTEL
15 15
16if SND_HDA_INTEL 16if SND_HDA_INTEL
17 17
18config SND_HDA_DSP_LOADER
19 bool
20
18config SND_HDA_PREALLOC_SIZE 21config SND_HDA_PREALLOC_SIZE
19 int "Pre-allocated buffer size for HD-audio driver" 22 int "Pre-allocated buffer size for HD-audio driver"
20 range 0 32768 23 range 0 32768
@@ -197,6 +200,17 @@ config SND_HDA_CODEC_CA0132
197 snd-hda-codec-ca0132. 200 snd-hda-codec-ca0132.
198 This module is automatically loaded at probing. 201 This module is automatically loaded at probing.
199 202
203config SND_HDA_CODEC_CA0132_DSP
204 bool "Support new DSP code for CA0132 codec"
205 depends on SND_HDA_CODEC_CA0132 && FW_LOADER
206 select SND_HDA_DSP_LOADER
207 help
208 Say Y here to enable the DSP for Creative CA0132 for extended
209 features like equalizer or echo cancellation.
210
211 Note that this option requires the external firmware file
212 (ctefx.bin).
213
200config SND_HDA_CODEC_CMEDIA 214config SND_HDA_CODEC_CMEDIA
201 bool "Build C-Media HD-audio codec support" 215 bool "Build C-Media HD-audio codec support"
202 default y 216 default y
@@ -236,12 +250,4 @@ config SND_HDA_POWER_SAVE_DEFAULT
236 The default time-out value in seconds for HD-audio automatic 250 The default time-out value in seconds for HD-audio automatic
237 power-save mode. 0 means to disable the power-save mode. 251 power-save mode. 0 means to disable the power-save mode.
238 252
239config SND_HDA_DSP_LOADER
240 bool "Enable DSP firmware loader"
241 depends on FW_LOADER
242 default y
243 help
244 Say Y here to enable the DSP firmware loader, used by certain
245 codecs (e.g. CA0132) to transfer their DSP binaries to the hardware.
246
247endif 253endif
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
index 483850f64150..9d9040bbfb68 100644
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
@@ -75,7 +75,7 @@
75 75
76#define EFX_FILE "ctefx.bin" 76#define EFX_FILE "ctefx.bin"
77 77
78#ifdef CONFIG_SND_HDA_DSP_LOADER 78#ifdef CONFIG_SND_HDA_CODEC_CA0132_DSP
79MODULE_FIRMWARE(EFX_FILE); 79MODULE_FIRMWARE(EFX_FILE);
80#endif 80#endif
81 81
@@ -4530,7 +4530,7 @@ static int ca0132_init(struct hda_codec *codec)
4530 ca0132_init_params(codec); 4530 ca0132_init_params(codec);
4531 ca0132_init_flags(codec); 4531 ca0132_init_flags(codec);
4532 snd_hda_sequence_write(codec, spec->base_init_verbs); 4532 snd_hda_sequence_write(codec, spec->base_init_verbs);
4533#ifdef CONFIG_SND_HDA_DSP_LOADER 4533#ifdef CONFIG_SND_HDA_CODEC_CA0132_DSP
4534 ca0132_download_dsp(codec); 4534 ca0132_download_dsp(codec);
4535#endif 4535#endif
4536 ca0132_refresh_widget_caps(codec); 4536 ca0132_refresh_widget_caps(codec);