Revert "ASoC: tegra: Allow 24bit and 32bit samples"
diff mbox series

Message ID 20200131091901.13014-1-jonathanh@nvidia.com
State New
Headers show
Series
  • Revert "ASoC: tegra: Allow 24bit and 32bit samples"
Related show

Commit Message

Jon Hunter Jan. 31, 2020, 9:19 a.m. UTC
Commit f3ee99087c8ca0ecfdd549ef5a94f557c42d5428 ("ASoC: tegra: Allow
24bit and 32bit samples") added 24-bit and 32-bit support for to the
Tegra30 I2S driver. However, there are two additional commits that are
also needed to get 24-bit and 32-bit support to work correctly. These
commits are not yet applied because there are still some review comments
that need to be addressed. With only this change applied, 24-bit and
32-bit support is advertised by the I2S driver, but it does not work and
the audio is distorted. Therefore, revert this patch for now until the
other changes are also ready.

Furthermore, a clock issue with 24-bit support has been identified with
this change and so if we revert this now, we can also fix that in the
updated version.

Cc: stable@vger.kernel.org

Reported-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
 sound/soc/tegra/tegra30_i2s.c | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

Comments

Dmitry Osipenko Jan. 31, 2020, 3:38 p.m. UTC | #1
31.01.2020 12:19, Jon Hunter пишет:
> Commit f3ee99087c8ca0ecfdd549ef5a94f557c42d5428 ("ASoC: tegra: Allow
> 24bit and 32bit samples") added 24-bit and 32-bit support for to the
> Tegra30 I2S driver. However, there are two additional commits that are
> also needed to get 24-bit and 32-bit support to work correctly. These
> commits are not yet applied because there are still some review comments
> that need to be addressed. With only this change applied, 24-bit and
> 32-bit support is advertised by the I2S driver, but it does not work and
> the audio is distorted. Therefore, revert this patch for now until the
> other changes are also ready.
> 
> Furthermore, a clock issue with 24-bit support has been identified with
> this change and so if we revert this now, we can also fix that in the
> updated version.
> 
> Cc: stable@vger.kernel.org
> 
> Reported-by: Dmitry Osipenko <digetx@gmail.com>
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> ---

Thanks, Jon!

Tested-by: Dmitry Osipenko <digetx@gmail.com>

Ben, looking forward to have 24bit working in 5.7 :)
Jon Hunter Jan. 31, 2020, 4:08 p.m. UTC | #2
On 31/01/2020 15:38, Dmitry Osipenko wrote:
> 31.01.2020 12:19, Jon Hunter пишет:
>> Commit f3ee99087c8ca0ecfdd549ef5a94f557c42d5428 ("ASoC: tegra: Allow
>> 24bit and 32bit samples") added 24-bit and 32-bit support for to the
>> Tegra30 I2S driver. However, there are two additional commits that are
>> also needed to get 24-bit and 32-bit support to work correctly. These
>> commits are not yet applied because there are still some review comments
>> that need to be addressed. With only this change applied, 24-bit and
>> 32-bit support is advertised by the I2S driver, but it does not work and
>> the audio is distorted. Therefore, revert this patch for now until the
>> other changes are also ready.
>>
>> Furthermore, a clock issue with 24-bit support has been identified with
>> this change and so if we revert this now, we can also fix that in the
>> updated version.
>>
>> Cc: stable@vger.kernel.org
>>
>> Reported-by: Dmitry Osipenko <digetx@gmail.com>
>> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
>> ---
> 
> Thanks, Jon!
> 
> Tested-by: Dmitry Osipenko <digetx@gmail.com>

Thanks. I just realised I forgot the fixes-tag ...

Fixes: f3ee99087c8c ("ASoC: tegra: Allow 24bit and 32bit samples")

Mark, let me know if you want me to resend.

Jon
Mark Brown Feb. 1, 2020, 11:27 a.m. UTC | #3
On Fri, Jan 31, 2020 at 09:19:01AM +0000, Jon Hunter wrote:
> Commit f3ee99087c8ca0ecfdd549ef5a94f557c42d5428 ("ASoC: tegra: Allow
> 24bit and 32bit samples") added 24-bit and 32-bit support for to the
> Tegra30 I2S driver. However, there are two additional commits that are

Please submit patches using subject lines reflecting the style for the
subsystem, this makes it easier for people to identify relevant patches.
Look at what existing commits in the area you're changing are doing and
make sure your subject lines visually resemble what they're doing.
There's no need to resubmit to fix this alone.

Patch
diff mbox series

diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index dbed3c5408e7..d59882ec48f1 100644
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -127,7 +127,7 @@  static int tegra30_i2s_hw_params(struct snd_pcm_substream *substream,
 	struct device *dev = dai->dev;
 	struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai);
 	unsigned int mask, val, reg;
-	int ret, sample_size, srate, i2sclock, bitcnt, audio_bits;
+	int ret, sample_size, srate, i2sclock, bitcnt;
 	struct tegra30_ahub_cif_conf cif_conf;
 
 	if (params_channels(params) != 2)
@@ -137,19 +137,8 @@  static int tegra30_i2s_hw_params(struct snd_pcm_substream *substream,
 	switch (params_format(params)) {
 	case SNDRV_PCM_FORMAT_S16_LE:
 		val = TEGRA30_I2S_CTRL_BIT_SIZE_16;
-		audio_bits = TEGRA30_AUDIOCIF_BITS_16;
 		sample_size = 16;
 		break;
-	case SNDRV_PCM_FORMAT_S24_LE:
-		val = TEGRA30_I2S_CTRL_BIT_SIZE_24;
-		audio_bits = TEGRA30_AUDIOCIF_BITS_24;
-		sample_size = 24;
-		break;
-	case SNDRV_PCM_FORMAT_S32_LE:
-		val = TEGRA30_I2S_CTRL_BIT_SIZE_32;
-		audio_bits = TEGRA30_AUDIOCIF_BITS_32;
-		sample_size = 32;
-		break;
 	default:
 		return -EINVAL;
 	}
@@ -181,8 +170,8 @@  static int tegra30_i2s_hw_params(struct snd_pcm_substream *substream,
 	cif_conf.threshold = 0;
 	cif_conf.audio_channels = 2;
 	cif_conf.client_channels = 2;
-	cif_conf.audio_bits = audio_bits;
-	cif_conf.client_bits = audio_bits;
+	cif_conf.audio_bits = TEGRA30_AUDIOCIF_BITS_16;
+	cif_conf.client_bits = TEGRA30_AUDIOCIF_BITS_16;
 	cif_conf.expand = 0;
 	cif_conf.stereo_conv = 0;
 	cif_conf.replicate = 0;
@@ -317,18 +306,14 @@  static const struct snd_soc_dai_driver tegra30_i2s_dai_template = {
 		.channels_min = 2,
 		.channels_max = 2,
 		.rates = SNDRV_PCM_RATE_8000_96000,
-		.formats = SNDRV_PCM_FMTBIT_S32_LE |
-			   SNDRV_PCM_FMTBIT_S24_LE |
-			   SNDRV_PCM_FMTBIT_S16_LE,
+		.formats = SNDRV_PCM_FMTBIT_S16_LE,
 	},
 	.capture = {
 		.stream_name = "Capture",
 		.channels_min = 2,
 		.channels_max = 2,
 		.rates = SNDRV_PCM_RATE_8000_96000,
-		.formats = SNDRV_PCM_FMTBIT_S32_LE |
-			   SNDRV_PCM_FMTBIT_S24_LE |
-			   SNDRV_PCM_FMTBIT_S16_LE,
+		.formats = SNDRV_PCM_FMTBIT_S16_LE,
 	},
 	.ops = &tegra30_i2s_dai_ops,
 	.symmetric_rates = 1,