Re: [linux-sunxi] [PATCH v5 14/15] ASoc: sun4i-i2s: Add 20, 24 and 32 bit support

On Wed, 14 Aug 2019 at 10:28, Jernej Škrabec [off-list ref] wrote:

Hi!

Dne sreda, 14. avgust 2019 ob 08:08:53 CEST je codekipper@gmail.com
napisal(a):

quoted

From: Marcus Cooper <redacted>

Extend the functionality of the driver to include support of 20 and
24 bits per sample for the earlier SoCs.

Newer SoCs can also handle 32bit samples.

Signed-off-by: Marcus Cooper <redacted>
---
 sound/soc/sunxi/sun4i-i2s.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index a71969167053..d3c8789f70bb 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c

@@ -690,6 +690,11 @@ static int sun4i_i2s_hw_params(struct snd_pcm_substream

*substream, case 16:
              width = DMA_SLAVE_BUSWIDTH_2_BYTES;
              break;
+     case 20:
+     case 24:
+     case 32:

params_physical_width() returns 32 also for 20 and 24-bit formats, so drop 20
and 24.

ACK

Best regards,
Jernej

quoted

+             width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+             break;
      default:
              dev_err(dai->dev, "Unsupported physical sample width:

%d\n",

quoted

                      params_physical_width(params));

@@ -1015,6 +1020,13 @@ 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)
+
+#define SUN8I_FORMATS        (SUN4I_FORMATS | \
+                      SNDRV_PCM_FMTBIT_S32_LE)
+
 static struct snd_soc_dai_driver sun4i_i2s_dai = {
      .probe = sun4i_i2s_dai_probe,
      .capture = {

@@ -1022,14 +1034,14 @@ static struct snd_soc_dai_driver sun4i_i2s_dai = {
              .channels_min = 2,
              .channels_max = 2,
              .rates = SNDRV_PCM_RATE_8000_192000,
-             .formats = SNDRV_PCM_FMTBIT_S16_LE,
+             .formats = SUN4I_FORMATS,
      },
      .playback = {
              .stream_name = "Playback",
              .channels_min = 2,
              .channels_max = 2,
              .rates = SNDRV_PCM_RATE_8000_192000,
-             .formats = SNDRV_PCM_FMTBIT_S16_LE,
+             .formats = SUN4I_FORMATS,
      },
      .ops = &sun4i_i2s_dai_ops,
      .symmetric_rates = 1,

@@ -1505,6 +1517,11 @@ static int sun4i_i2s_probe(struct platform_device

*pdev) goto err_pm_disable;
      }

+     if (i2s->variant->has_fmt_set_lrck_period) {
+             soc_dai->playback.formats = SUN8I_FORMATS;
+             soc_dai->capture.formats = SUN8I_FORMATS;
+     }
+
      if (!of_property_read_u32(pdev->dev.of_node,
                                "allwinner,playback-channels",

&val)) {

quoted

              if (val >= 2 && val <= 8)

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel