Commit 6ad7ca62 authored by Marcus Cooper's avatar Marcus Cooper Committed by Mark Brown

ASoC: sun4i-i2s: Add 20 and 24 bit support

Extend the functionality of the driver to include support of 20 and
24 bits per sample.
Signed-off-by: default avatarMarcus Cooper <codekipper@gmail.com>
Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarClément Péron <peron.clem@gmail.com>
Link: https://lore.kernel.org/r/20201030144648.397824-7-peron.clem@gmail.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent d8659dd9
...@@ -600,6 +600,9 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream, ...@@ -600,6 +600,9 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream,
case 16: case 16:
width = DMA_SLAVE_BUSWIDTH_2_BYTES; width = DMA_SLAVE_BUSWIDTH_2_BYTES;
break; break;
case 32:
width = DMA_SLAVE_BUSWIDTH_4_BYTES;
break;
default: default:
dev_err(dai->dev, "Unsupported physical sample width: %d\n", dev_err(dai->dev, "Unsupported physical sample width: %d\n",
params_physical_width(params)); params_physical_width(params));
...@@ -1081,6 +1084,10 @@ static int sun4i_i2s_dai_probe(struct snd_soc_dai *dai) ...@@ -1081,6 +1084,10 @@ static int sun4i_i2s_dai_probe(struct snd_soc_dai *dai)
return 0; return 0;
} }
#define SUN4I_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \
SNDRV_PCM_FMTBIT_S20_LE | \
SNDRV_PCM_FMTBIT_S24_LE)
static struct snd_soc_dai_driver sun4i_i2s_dai = { static struct snd_soc_dai_driver sun4i_i2s_dai = {
.probe = sun4i_i2s_dai_probe, .probe = sun4i_i2s_dai_probe,
.capture = { .capture = {
...@@ -1088,14 +1095,14 @@ static struct snd_soc_dai_driver sun4i_i2s_dai = { ...@@ -1088,14 +1095,14 @@ static struct snd_soc_dai_driver sun4i_i2s_dai = {
.channels_min = 1, .channels_min = 1,
.channels_max = 8, .channels_max = 8,
.rates = SNDRV_PCM_RATE_8000_192000, .rates = SNDRV_PCM_RATE_8000_192000,
.formats = SNDRV_PCM_FMTBIT_S16_LE, .formats = SUN4I_FORMATS,
}, },
.playback = { .playback = {
.stream_name = "Playback", .stream_name = "Playback",
.channels_min = 1, .channels_min = 1,
.channels_max = 8, .channels_max = 8,
.rates = SNDRV_PCM_RATE_8000_192000, .rates = SNDRV_PCM_RATE_8000_192000,
.formats = SNDRV_PCM_FMTBIT_S16_LE, .formats = SUN4I_FORMATS,
}, },
.ops = &sun4i_i2s_dai_ops, .ops = &sun4i_i2s_dai_ops,
.symmetric_rates = 1, .symmetric_rates = 1,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment