ASoC: Intel: avs: Allow for 16 channels configuration

Add define representing maximum number of channels that are allowed by
HDAudio standard and as such supported by HW - 16 channels. With that
done, reflect the max in BE DAIs capabilities.

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-5-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 673e4577df14c333f9029ba16b139efacfbde991..e27c7587be9dc2d571ce70695145a227521a21d1 100644 (file)
--- a/sound/soc/intel/avs/messages.h
+++ b/sound/soc/intel/avs/messages.h
@@ -699,6 +699,7 @@ enum avs_sample_type {
 
 #define AVS_COEFF_CHANNELS_MAX 8
 #define AVS_ALL_CHANNELS_MASK  UINT_MAX
+#define AVS_CHANNELS_MAX       16
 
 struct avs_audio_format {
        u32 sampling_freq;

diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c
index dac463390da135d7972808cb55e1c2866dd736c7..7d57a5735157afbd3c61e24679c039c9205b5275 100644 (file)
--- a/sound/soc/intel/avs/pcm.c
+++ b/sound/soc/intel/avs/pcm.c
@@ -1337,7 +1337,7 @@ static const struct snd_soc_dai_driver i2s_dai_template = {
        .ops = &avs_dai_nonhda_be_ops,
        .playback = {
                .channels_min   = 1,
-               .channels_max   = 8,
+               .channels_max   = AVS_CHANNELS_MAX,
                .rates          = SNDRV_PCM_RATE_8000_192000 |
                                  SNDRV_PCM_RATE_12000 |
                                  SNDRV_PCM_RATE_24000 |
@@ -1350,7 +1350,7 @@ static const struct snd_soc_dai_driver i2s_dai_template = {
        },
        .capture = {
                .channels_min   = 1,
-               .channels_max   = 8,
+               .channels_max   = AVS_CHANNELS_MAX,
                .rates          = SNDRV_PCM_RATE_8000_192000 |
                                  SNDRV_PCM_RATE_12000 |
                                  SNDRV_PCM_RATE_24000 |
@@ -1431,7 +1431,7 @@ static const struct snd_soc_dai_driver hda_cpu_dai = {
        .ops = &avs_dai_hda_be_ops,
        .playback = {
                .channels_min   = 1,
-               .channels_max   = 8,
+               .channels_max   = AVS_CHANNELS_MAX,
                .rates          = SNDRV_PCM_RATE_8000_192000,
                .formats        = SNDRV_PCM_FMTBIT_S16_LE |
                                  SNDRV_PCM_FMTBIT_S32_LE,
@@ -1441,7 +1441,7 @@ static const struct snd_soc_dai_driver hda_cpu_dai = {
        },
        .capture = {
                .channels_min   = 1,
-               .channels_max   = 8,
+               .channels_max   = AVS_CHANNELS_MAX,
                .rates          = SNDRV_PCM_RATE_8000_192000,
                .formats        = SNDRV_PCM_FMTBIT_S16_LE |
                                  SNDRV_PCM_FMTBIT_S32_LE,