Unverified Commit 87bcb087 authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Mark Brown
Browse files

ASoC: Intel: avs: Rename AVS_CHANNELS_MAX define 



It is used for coefficient table in updown mixer module, which supports
maximum of 8 channels. However it does not represent HW capability.

Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/20250404090337.3564117-4-cezary.rojewski@intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e6b9c7f5

sound/soc/intel/avs/messages.h

+2 −2
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ enum avs_sample_type { 
	AVS_SAMPLE_TYPE_FLOAT = 4,

};



#define AVS_CHANNELS_MAX	8

#define AVS_COEFF_CHANNELS_MAX	8

#define AVS_ALL_CHANNELS_MASK	UINT_MAX



struct avs_audio_format {
@@ -846,7 +846,7 @@ struct avs_updown_mixer_cfg { 
	struct avs_modcfg_base base;

	u32 out_channel_config;

	u32 coefficients_select;

	s32 coefficients[AVS_CHANNELS_MAX];

	s32 coefficients[AVS_COEFF_CHANNELS_MAX];

	u32 channel_map;

} __packed;

static_assert(sizeof(struct avs_updown_mixer_cfg) == 84);

sound/soc/intel/avs/path.c

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static int avs_updown_mix_create(struct avs_dev *adev, struct avs_path_module *m 
	cfg.base.audio_fmt = *t->in_fmt;

	cfg.out_channel_config = t->cfg_ext->updown_mix.out_channel_config;

	cfg.coefficients_select = t->cfg_ext->updown_mix.coefficients_select;

	for (i = 0; i < AVS_CHANNELS_MAX; i++)

	for (i = 0; i < AVS_COEFF_CHANNELS_MAX; i++)

		cfg.coefficients[i] = t->cfg_ext->updown_mix.coefficients[i];

	cfg.channel_map = t->cfg_ext->updown_mix.channel_map;

sound/soc/intel/avs/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ struct avs_tplg_modcfg_ext { 
		struct {

			u32 out_channel_config;

			u32 coefficients_select;

			s32 coefficients[AVS_CHANNELS_MAX];

			s32 coefficients[AVS_COEFF_CHANNELS_MAX];

			u32 channel_map;

		} updown_mix;

		struct {