All of lore.kernel.org
 help / color / mirror / Atom feed
From: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
To: paul@crapouillou.net, lgirdwood@gmail.com, broonie@kernel.org,
	perex@perex.cz, tiwai@suse.com
Cc: linux-mips@vger.kernel.org, alsa-devel@alsa-project.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 10/11] ASoC: jz4740-i2s: Support S20_LE and S24_LE sample formats
Date: Wed,  6 Jul 2022 22:13:29 +0100	[thread overview]
Message-ID: <20220706211330.120198-11-aidanmacdonald.0x0@gmail.com> (raw)
In-Reply-To: <20220706211330.120198-1-aidanmacdonald.0x0@gmail.com>

The audio controller on JZ47xx SoCs supports 20- and 24-bit
samples coming from memory. Allow those formats to be used
with the I2S driver.

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 80b355d715ce..ee99c5e781ec 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -222,9 +222,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;
 	}
@@ -362,7 +368,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


WARNING: multiple messages have this Message-ID (diff)
From: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
To: paul@crapouillou.net, lgirdwood@gmail.com, broonie@kernel.org,
	perex@perex.cz, tiwai@suse.com
Cc: alsa-devel@alsa-project.org, linux-mips@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 10/11] ASoC: jz4740-i2s: Support S20_LE and S24_LE sample formats
Date: Wed,  6 Jul 2022 22:13:29 +0100	[thread overview]
Message-ID: <20220706211330.120198-11-aidanmacdonald.0x0@gmail.com> (raw)
In-Reply-To: <20220706211330.120198-1-aidanmacdonald.0x0@gmail.com>

The audio controller on JZ47xx SoCs supports 20- and 24-bit
samples coming from memory. Allow those formats to be used
with the I2S driver.

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 80b355d715ce..ee99c5e781ec 100644
--- a/sound/soc/jz4740/jz4740-i2s.c
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -222,9 +222,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;
 	}
@@ -362,7 +368,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


  parent reply	other threads:[~2022-07-06 21:13 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-06 21:13 [PATCH 00/11] ASoC: cleanups and improvements for jz4740-i2s Aidan MacDonald
2022-07-06 21:13 ` Aidan MacDonald
2022-07-06 21:13 ` [PATCH 01/11] ASoC: jz4740-i2s: Remove Open Firmware dependency Aidan MacDonald
2022-07-06 21:13   ` Aidan MacDonald
2022-07-07  9:16   ` Paul Cercueil
2022-07-07  9:16     ` Paul Cercueil
2022-07-06 21:13 ` [PATCH 02/11] ASoC: jz4740-i2s: Refactor DMA channel setup Aidan MacDonald
2022-07-06 21:13   ` Aidan MacDonald
2022-07-07  9:30   ` Paul Cercueil
2022-07-07  9:30     ` Paul Cercueil
2022-07-06 21:13 ` [PATCH 03/11] ASoC: jz4740-i2s: Convert to regmap API Aidan MacDonald
2022-07-06 21:13   ` Aidan MacDonald
2022-07-06 21:53   ` Paul Cercueil
2022-07-06 21:53     ` Paul Cercueil
2022-07-07 14:12     ` Aidan MacDonald
2022-07-07 14:12       ` Aidan MacDonald
2022-07-06 21:13 ` [PATCH 04/11] ASoC: jz4740-i2s: Simplify using regmap fields Aidan MacDonald
2022-07-06 21:13   ` Aidan MacDonald
2022-07-07  9:36   ` Paul Cercueil
2022-07-07  9:36     ` Paul Cercueil
2022-07-07 14:13     ` Aidan MacDonald
2022-07-07 14:13       ` Aidan MacDonald
2022-07-06 21:13 ` [PATCH 05/11] ASoC: jz4740-i2s: Remove unused SoC version IDs Aidan MacDonald
2022-07-06 21:13   ` Aidan MacDonald
2022-07-07  9:37   ` Paul Cercueil
2022-07-07  9:37     ` Paul Cercueil
2022-07-06 21:13 ` [PATCH 06/11] ASoC: jz4740-i2s: Use FIELD_PREP() macros in hw_params callback Aidan MacDonald
2022-07-06 21:13   ` Aidan MacDonald
2022-07-07  9:40   ` Paul Cercueil
2022-07-07  9:40     ` Paul Cercueil
2022-07-06 21:13 ` [PATCH 07/11] ASoC: jz4740-i2s: Remove some unused macros Aidan MacDonald
2022-07-06 21:13   ` Aidan MacDonald
2022-07-07  9:42   ` Paul Cercueil
2022-07-07  9:42     ` Paul Cercueil
2022-07-06 21:13 ` [PATCH 08/11] ASoC: jz4740-i2s: Align macro values and sort includes Aidan MacDonald
2022-07-06 21:13   ` Aidan MacDonald
2022-07-07  9:42   ` Paul Cercueil
2022-07-07  9:42     ` Paul Cercueil
2022-07-06 21:13 ` [PATCH 09/11] ASoC: jz4740-i2s: Make the PLL clock name SoC-specific Aidan MacDonald
2022-07-06 21:13   ` Aidan MacDonald
2022-07-07  9:47   ` Paul Cercueil
2022-07-07  9:47     ` Paul Cercueil
2022-07-07 14:24     ` Aidan MacDonald
2022-07-07 14:24       ` Aidan MacDonald
2022-07-06 21:13 ` Aidan MacDonald [this message]
2022-07-06 21:13   ` [PATCH 10/11] ASoC: jz4740-i2s: Support S20_LE and S24_LE sample formats Aidan MacDonald
2022-07-07  9:53   ` Paul Cercueil
2022-07-07  9:53     ` Paul Cercueil
2022-07-07 14:25     ` Aidan MacDonald
2022-07-07 14:25       ` Aidan MacDonald
2022-07-06 21:13 ` [PATCH 11/11] ASoC: jz4740-i2s: Support continuous sample rate Aidan MacDonald
2022-07-06 21:13   ` Aidan MacDonald
2022-07-07  9:53   ` Paul Cercueil
2022-07-07  9:53     ` Paul Cercueil
2022-07-07 13:54 ` (subset) [PATCH 00/11] ASoC: cleanups and improvements for jz4740-i2s Mark Brown
2022-07-07 13:54   ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220706211330.120198-11-aidanmacdonald.0x0@gmail.com \
    --to=aidanmacdonald.0x0@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=paul@crapouillou.net \
    --cc=perex@perex.cz \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.