Unverified Commit f3ee9908 authored by Edward Cragg's avatar Edward Cragg Committed by Mark Brown
Browse files

ASoC: tegra: Allow 24bit and 32bit samples 



The tegra3 audio can support 24 and 32 bit sample sizes so add the
option to the tegra30_i2s_hw_params to configure the S24_LE or S32_LE
formats when requested.

Signed-off-by: default avatarEdward Cragg <edward.cragg@codethink.co.uk>
[ben.dooks@codethink.co.uk: fixup merge of 24 and 32bit]
[ben.dooks@codethink.co.uk: add pm calls around ytdm config]
[ben.dooks@codethink.co.uk: drop debug printing to dev_dbg]
Signed-off-by: default avatarBen Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: default avatarJon Hunter <jonathanh@nvidia.com>
Link: https://lore.kernel.org/r/20191018154833.7560-3-ben.dooks@codethink.co.uk


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6442793a

sound/soc/tegra/tegra30_i2s.c

+20 −5
Original line number Diff line number Diff line
@@ -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;

	int ret, sample_size, srate, i2sclock, bitcnt, audio_bits;

	struct tegra30_ahub_cif_conf cif_conf;



	if (params_channels(params) != 2)
@@ -137,8 +137,19 @@ 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;

	}
@@ -170,8 +181,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 = TEGRA30_AUDIOCIF_BITS_16;

	cif_conf.client_bits = TEGRA30_AUDIOCIF_BITS_16;

	cif_conf.audio_bits = audio_bits;

	cif_conf.client_bits = audio_bits;

	cif_conf.expand = 0;

	cif_conf.stereo_conv = 0;

	cif_conf.replicate = 0;
@@ -277,14 +288,18 @@ 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_S16_LE,

		.formats = SNDRV_PCM_FMTBIT_S32_LE |

			   SNDRV_PCM_FMTBIT_S24_LE |

			   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_S16_LE,

		.formats = SNDRV_PCM_FMTBIT_S32_LE |

			   SNDRV_PCM_FMTBIT_S24_LE |

			   SNDRV_PCM_FMTBIT_S16_LE,

	},

	.ops = &tegra30_i2s_dai_ops,

	.symmetric_rates = 1,

CRA Git | Maintained and supported by SUSTech CRA and CCSE