64 lines
1.9 KiB
Diff
64 lines
1.9 KiB
Diff
|
From 3fc3fc516e908c811bdb2322d077c84beb923668 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Marcus Cooper <codekipper@gmail.com>
|
||
|
|
Date: Sun, 27 Sep 2020 21:28:58 +0200
|
||
|
|
Subject: [PATCH 283/351] ASoc: sun4i-i2s: Add 20 and 24 bit support
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Extend the functionality of the driver to include support of 20 and
|
||
|
|
24 bits per sample.
|
||
|
|
|
||
|
|
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
|
||
|
|
Signed-off-by: Clément Péron <peron.clem@gmail.com>
|
||
|
|
Acked-by: Maxime Ripard <mripard@kernel.org>
|
||
|
|
---
|
||
|
|
sound/soc/sunxi/sun4i-i2s.c | 11 +++++++++--
|
||
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
|
||
|
|
index b31454eee43c..60b2fec1bbe9 100644
|
||
|
|
--- a/sound/soc/sunxi/sun4i-i2s.c
|
||
|
|
+++ b/sound/soc/sunxi/sun4i-i2s.c
|
||
|
|
@@ -590,6 +590,9 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream *substream,
|
||
|
|
case 16:
|
||
|
|
width = DMA_SLAVE_BUSWIDTH_2_BYTES;
|
||
|
|
break;
|
||
|
|
+ case 32:
|
||
|
|
+ width = DMA_SLAVE_BUSWIDTH_4_BYTES;
|
||
|
|
+ break;
|
||
|
|
default:
|
||
|
|
dev_err(dai->dev, "Unsupported physical sample width: %d\n",
|
||
|
|
params_physical_width(params));
|
||
|
|
@@ -1071,6 +1074,10 @@ static int sun4i_i2s_dai_probe(struct snd_soc_dai *dai)
|
||
|
|
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 = {
|
||
|
|
.probe = sun4i_i2s_dai_probe,
|
||
|
|
.capture = {
|
||
|
|
@@ -1078,14 +1085,14 @@ static struct snd_soc_dai_driver sun4i_i2s_dai = {
|
||
|
|
.channels_min = 1,
|
||
|
|
.channels_max = 8,
|
||
|
|
.rates = SNDRV_PCM_RATE_8000_192000,
|
||
|
|
- .formats = SNDRV_PCM_FMTBIT_S16_LE,
|
||
|
|
+ .formats = SUN4I_FORMATS,
|
||
|
|
},
|
||
|
|
.playback = {
|
||
|
|
.stream_name = "Playback",
|
||
|
|
.channels_min = 1,
|
||
|
|
.channels_max = 8,
|
||
|
|
.rates = SNDRV_PCM_RATE_8000_192000,
|
||
|
|
- .formats = SNDRV_PCM_FMTBIT_S16_LE,
|
||
|
|
+ .formats = SUN4I_FORMATS,
|
||
|
|
},
|
||
|
|
.ops = &sun4i_i2s_dai_ops,
|
||
|
|
.symmetric_rates = 1,
|
||
|
|
--
|
||
|
|
2.34.0
|
||
|
|
|