hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: wm_adsp: Use more generic naming for regions and caps definitions 

The region definition will be shared by most firmwares so give this a
more generic name and whilst we are there improve the naming of the
voice control capabilities array as well.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Charles Keepax 2016-01-21 17:52:58 +00:00 committed by Mark Brown
parent 0f9aa09d66
commit e6d00f3403
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/codecs/wm_adsp.c
View File

@ -328,7 +328,7 @@ struct wm_adsp_buffer_region_def {
unsigned int size_offset; unsigned int size_offset;
}; };
static struct wm_adsp_buffer_region_def ez2control_regions[] = { static struct wm_adsp_buffer_region_def default_regions[] = {
{ {
.mem_type = WMFW_ADSP2_XM, .mem_type = WMFW_ADSP2_XM,
.base_offset = HOST_BUFFER_FIELD(X_buf_base), .base_offset = HOST_BUFFER_FIELD(X_buf_base),
@ -353,7 +353,7 @@ struct wm_adsp_fw_caps {
struct wm_adsp_buffer_region_def *region_defs; struct wm_adsp_buffer_region_def *region_defs;
}; };
static const struct wm_adsp_fw_caps ez2control_caps[] = { static const struct wm_adsp_fw_caps ctrl_caps[] = {
{ {
.id = SND_AUDIOCODEC_BESPOKE, .id = SND_AUDIOCODEC_BESPOKE,
.desc = { .desc = {
@ -362,8 +362,8 @@ static const struct wm_adsp_fw_caps ez2control_caps[] = {
.num_sample_rates = 1, .num_sample_rates = 1,
.formats = SNDRV_PCM_FMTBIT_S16_LE, .formats = SNDRV_PCM_FMTBIT_S16_LE,
}, },
.num_regions = ARRAY_SIZE(ez2control_regions), .num_regions = ARRAY_SIZE(default_regions),
.region_defs = ez2control_regions, .region_defs = default_regions,
}, },
}; };
@ -382,8 +382,8 @@ static const struct {
[WM_ADSP_FW_CTRL] = { [WM_ADSP_FW_CTRL] = {
.file = "ctrl", .file = "ctrl",
.compr_direction = SND_COMPRESS_CAPTURE, .compr_direction = SND_COMPRESS_CAPTURE,
.num_caps = ARRAY_SIZE(ez2control_caps), .num_caps = ARRAY_SIZE(ctrl_caps),
.caps = ez2control_caps, .caps = ctrl_caps,
}, },
[WM_ADSP_FW_ASR] = { .file = "asr" }, [WM_ADSP_FW_ASR] = { .file = "asr" },
[WM_ADSP_FW_TRACE] = { .file = "trace" }, [WM_ADSP_FW_TRACE] = { .file = "trace" },