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: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/20250404090337.3564117-4-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/avs/messages.h b/sound/soc/intel/avs/messages.h
index 2f243802ccc289ce82cbb9609d89d329b5da0b0e..673e4577df14c333f9029ba16b139efacfbde991 100644 (file)
--- a/sound/soc/intel/avs/messages.h
+++ b/sound/soc/intel/avs/messages.h
@@ -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);

diff --git a/sound/soc/intel/avs/path.c b/sound/soc/intel/avs/path.c
index ef0c1d125d66b8faf96caf6777e5b86d12a2f8a3..d5cce357b162f4861d4d052bb62a8d50e6758065 100644 (file)
--- a/sound/soc/intel/avs/path.c
+++ b/sound/soc/intel/avs/path.c
@@ -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;
 

diff --git a/sound/soc/intel/avs/topology.h b/sound/soc/intel/avs/topology.h
index 30488099771736583918a7ecb8de87604e354641..f5601a4e3ec872e6607177c892a1bcc5f1a2cc5f 100644 (file)
--- a/sound/soc/intel/avs/topology.h
+++ b/sound/soc/intel/avs/topology.h
@@ -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 {