| Message ID | 20220708160244.21933-9-aidanmacdonald.0x0@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v4,01/11] ASoC: jz4740-i2s: Handle independent FIFO flush bits | expand |
Hi Aidan, Le ven., juil. 8 2022 at 17:02:41 +0100, Aidan MacDonald <aidanmacdonald.0x0@gmail.com> a écrit : > The audio controller on JZ47xx SoCs can transfer 20- and 24-bit > samples in the FIFO, so allow those formats to be used with the > I2S driver. Although the FIFO doesn't care about the in-memory > sample format, we only support 4-byte format variants because the > DMA controller on these SoCs cannot transfer in 3-byte multiples. > > Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com> > --- > sound/soc/jz4740/jz4740-i2s.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/jz4740/jz4740-i2s.c > b/sound/soc/jz4740/jz4740-i2s.c > index a41398c24d0e..9be2f3f1b376 100644 > --- a/sound/soc/jz4740/jz4740-i2s.c > +++ b/sound/soc/jz4740/jz4740-i2s.c > @@ -238,9 +238,15 @@ static int jz4740_i2s_hw_params(struct > snd_pcm_substream *substream, > case SNDRV_PCM_FORMAT_S8: > sample_size = 0; > break; > - case SNDRV_PCM_FORMAT_S16: > + case SNDRV_PCM_FORMAT_S16_LE: I had to lookup the macro to verify, but this is correct. Reviewed-by: Paul Cercueil <paul@crapouillou.net> Cheers, -Paul > sample_size = 1; > break; > + case SNDRV_PCM_FORMAT_S20_LE: > + sample_size = 3; > + break; > + case SNDRV_PCM_FORMAT_S24_LE: > + sample_size = 4; > + break; > default: > return -EINVAL; > } > @@ -375,7 +381,9 @@ static const struct snd_soc_dai_ops > jz4740_i2s_dai_ops = { > }; > > #define JZ4740_I2S_FMTS (SNDRV_PCM_FMTBIT_S8 | \ > - SNDRV_PCM_FMTBIT_S16_LE) > + SNDRV_PCM_FMTBIT_S16_LE | \ > + SNDRV_PCM_FMTBIT_S20_LE | \ > + SNDRV_PCM_FMTBIT_S24_LE) > > static struct snd_soc_dai_driver jz4740_i2s_dai = { > .probe = jz4740_i2s_dai_probe, > -- > 2.35.1 >
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index a41398c24d0e..9be2f3f1b376 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c @@ -238,9 +238,15 @@ static int jz4740_i2s_hw_params(struct snd_pcm_substream *substream, case SNDRV_PCM_FORMAT_S8: sample_size = 0; break; - case SNDRV_PCM_FORMAT_S16: + case SNDRV_PCM_FORMAT_S16_LE: sample_size = 1; break; + case SNDRV_PCM_FORMAT_S20_LE: + sample_size = 3; + break; + case SNDRV_PCM_FORMAT_S24_LE: + sample_size = 4; + break; default: return -EINVAL; } @@ -375,7 +381,9 @@ static const struct snd_soc_dai_ops jz4740_i2s_dai_ops = { }; #define JZ4740_I2S_FMTS (SNDRV_PCM_FMTBIT_S8 | \ - SNDRV_PCM_FMTBIT_S16_LE) + SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_S20_LE | \ + SNDRV_PCM_FMTBIT_S24_LE) static struct snd_soc_dai_driver jz4740_i2s_dai = { .probe = jz4740_i2s_dai_probe,
The audio controller on JZ47xx SoCs can transfer 20- and 24-bit samples in the FIFO, so allow those formats to be used with the I2S driver. Although the FIFO doesn't care about the in-memory sample format, we only support 4-byte format variants because the DMA controller on these SoCs cannot transfer in 3-byte multiples. Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com> --- sound/soc/jz4740/jz4740-i2s.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)