Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6d00f34 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

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: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0f9aa09d

sound/soc/codecs/wm_adsp.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -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" },