]> git.hungrycats.org Git - linux/commitdiff
ASoC: spacemit: advertise only DMA-backed DAI streams
authorbui duc phuc <phucduc.bui@gmail.com>
Wed, 5 Aug 2026 06:43:48 +0000 (13:43 +0700)
committerMark Brown <broonie@kernel.org>
Wed, 12 Aug 2026 18:46:34 +0000 (19:46 +0100)
The static DAI template initializes both playback and capture stream
capabilities before dma-names is examined. As a result,
snd_soc_dai_stream_valid() considers both directions valid even when the
device only provides a single DMA channel.

Move the playback and capture capability initialization into
spacemit_i2s_init_dai(), where it is performed only for the stream
directions backed by a corresponding DMA channel. This preserves the
existing capabilities for devices with both "tx" and "rx" DMA channels,
while preventing unsupported stream directions from being advertised.

Initialize rate_min and rate_max together with the other stream
capabilities to preserve the existing rate constraints.

Fixes: fce217449075 ("ASoC: spacemit: add i2s support for K1 SoC")
Signed-off-by: bui duc phuc <phucduc.bui@gmail.com>
Link: https://patch.msgid.link/20260805064348.44283-1-phucduc.bui@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/spacemit/k1_i2s.c

index 2d5ea1fd5d49d3bc2e672641ef701256257346f7..28a7627692532d5fc7abdf984d9020d1c840949e 100644 (file)
@@ -354,22 +354,6 @@ static const struct snd_soc_dai_ops spacemit_i2s_dai_ops = {
 
 static struct snd_soc_dai_driver spacemit_i2s_dai = {
        .ops = &spacemit_i2s_dai_ops,
-       .playback = {
-               .channels_min = 1,
-               .channels_max = 2,
-               .rates = SPACEMIT_PCM_RATES,
-               .rate_min = SNDRV_PCM_RATE_8000,
-               .rate_max = SNDRV_PCM_RATE_48000,
-               .formats = SPACEMIT_PCM_FORMATS,
-       },
-       .capture = {
-               .channels_min = 1,
-               .channels_max = 2,
-               .rates = SPACEMIT_PCM_RATES,
-               .rate_min = SNDRV_PCM_RATE_8000,
-               .rate_max = SNDRV_PCM_RATE_48000,
-               .formats = SPACEMIT_PCM_FORMATS,
-       },
        .symmetric_rate = 1,
 };
 
@@ -399,6 +383,8 @@ static int spacemit_i2s_init_dai(struct spacemit_i2s_dev *i2s,
                dai->playback.channels_min = 1;
                dai->playback.channels_max = 2;
                dai->playback.rates = SPACEMIT_PCM_RATES;
+               dai->playback.rate_min = SNDRV_PCM_RATE_8000;
+               dai->playback.rate_max = SNDRV_PCM_RATE_48000;
                dai->playback.formats = SPACEMIT_PCM_FORMATS;
 
                i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
@@ -411,6 +397,8 @@ static int spacemit_i2s_init_dai(struct spacemit_i2s_dev *i2s,
                dai->capture.channels_min = 1;
                dai->capture.channels_max = 2;
                dai->capture.rates = SPACEMIT_PCM_RATES;
+               dai->capture.rate_min = SNDRV_PCM_RATE_8000;
+               dai->capture.rate_max = SNDRV_PCM_RATE_48000;
                dai->capture.formats = SPACEMIT_PCM_FORMATS;
 
                i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;