From: Ben Dooks <ben.dooks@codethink.co.uk> To: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Cc: Jonathan Hunter <jonathanh@nvidia.com>, linux-kernel@lists.codethink.co.uk, alsa-devel@alsa-project.org, Liam Girdwood <lgirdwood@gmail.com>, Takashi Iwai <tiwai@suse.com>, Mark Brown <broonie@kernel.org>, Thierry Reding <thierry.reding@gmail.com>, Edward Cragg <edward.cragg@codethink.co.uk>, linux-tegra@vger.kernel.org, linux-tegra-owner@vger.kernel.org Subject: Re: [PATCH 2/8] ASoC: tegra: Allow 24bit and 32bit samples Date: Wed, 18 Sep 2019 08:44:50 +0100 [thread overview] Message-ID: <de15ea8e9d2c07a1253fd414b421efbe@codethink.co.uk> (raw) In-Reply-To: <077870b1-8856-9a28-dd13-f8bfb1418adb@linux.intel.com> On 2019-09-17 19:26, Pierre-Louis Bossart wrote: > On 9/17/19 1:12 PM, Ben Dooks wrote: >> From: Edward Cragg <edward.cragg@codethink.co.uk> >> >> 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: Edward 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: remove debug prints] > > You need to add your own Signed-off-by when sending patches from other > people Yes, will do when this series has been reviewed and modifications done. > >> --- >> squash 5aeca5a055fd ASoC: tegra: i2s: pm_runtime_get_sync() is needed >> in tdm code >> >> ASoC: tegra: i2s: pm_runtime_get_sync() is needed in tdm code >> --- >> sound/soc/tegra/tegra30_i2s.c | 32 +++++++++++++++++++++++--------- >> 1 file changed, 23 insertions(+), 9 deletions(-) >> >> diff --git a/sound/soc/tegra/tegra30_i2s.c >> b/sound/soc/tegra/tegra30_i2s.c >> index d36b4662b420..b5372839f672 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; >> + 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; >> @@ -264,10 +275,6 @@ static int tegra30_i2s_set_tdm(struct snd_soc_dai >> *dai, >> struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai); >> unsigned int mask = 0, val = 0; >> - dev_info(dai->dev, "%s: setting TDM: tx_mask: 0x%08x rx_mask: >> 0x%08x " >> - "slots: 0x%08x " "width: %d\n", >> - __func__, tx_mask, rx_mask, slots, slot_width); >> - > > This should be squashed in the previous patch Thanks, looks like I missed a bad rebase and hit this patch instead of the previous. > >> /* Set up slots and tx/rx masks */ >> mask = TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_MASK | >> TEGRA30_I2S_SLOT_CTRL_RX_SLOT_ENABLES_MASK | >> @@ -277,6 +284,8 @@ static int tegra30_i2s_set_tdm(struct snd_soc_dai >> *dai, >> (rx_mask << TEGRA30_I2S_SLOT_CTRL_RX_SLOT_ENABLES_SHIFT) | >> ((slots - 1) << TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_SHIFT); >> + pm_runtime_get_sync(dai->dev); >> + >> regmap_update_bits(i2s->regmap, TEGRA30_I2S_SLOT_CTRL, mask, val); >> /* Set FSYNC width */ >> @@ -284,6 +293,7 @@ static int tegra30_i2s_set_tdm(struct snd_soc_dai >> *dai, >> TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_MASK, >> (slot_width - 1) << TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_SHIFT); >> + pm_runtime_put(dai->dev); > > same for PM stuff, it's not related to 24/32 bit samples Yes, will do. Thank you for reviewing. >> return 0; >> } >> @@ -311,14 +321,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, >>
WARNING: multiple messages have this Message-ID (diff)
From: Ben Dooks <ben.dooks@codethink.co.uk> To: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Cc: Jonathan Hunter <jonathanh@nvidia.com>, linux-kernel@lists.codethink.co.uk, alsa-devel@alsa-project.org, Liam Girdwood <lgirdwood@gmail.com>, Takashi Iwai <tiwai@suse.com>, Mark Brown <broonie@kernel.org>, Thierry Reding <thierry.reding@gmail.com>, Edward Cragg <edward.cragg@codethink.co.uk>, linux-tegra@vger.kernel.org, linux-tegra-owner@vger.kernel.org Subject: Re: [alsa-devel] [PATCH 2/8] ASoC: tegra: Allow 24bit and 32bit samples Date: Wed, 18 Sep 2019 08:44:50 +0100 [thread overview] Message-ID: <de15ea8e9d2c07a1253fd414b421efbe@codethink.co.uk> (raw) In-Reply-To: <077870b1-8856-9a28-dd13-f8bfb1418adb@linux.intel.com> On 2019-09-17 19:26, Pierre-Louis Bossart wrote: > On 9/17/19 1:12 PM, Ben Dooks wrote: >> From: Edward Cragg <edward.cragg@codethink.co.uk> >> >> 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: Edward 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: remove debug prints] > > You need to add your own Signed-off-by when sending patches from other > people Yes, will do when this series has been reviewed and modifications done. > >> --- >> squash 5aeca5a055fd ASoC: tegra: i2s: pm_runtime_get_sync() is needed >> in tdm code >> >> ASoC: tegra: i2s: pm_runtime_get_sync() is needed in tdm code >> --- >> sound/soc/tegra/tegra30_i2s.c | 32 +++++++++++++++++++++++--------- >> 1 file changed, 23 insertions(+), 9 deletions(-) >> >> diff --git a/sound/soc/tegra/tegra30_i2s.c >> b/sound/soc/tegra/tegra30_i2s.c >> index d36b4662b420..b5372839f672 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; >> + 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; >> @@ -264,10 +275,6 @@ static int tegra30_i2s_set_tdm(struct snd_soc_dai >> *dai, >> struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai); >> unsigned int mask = 0, val = 0; >> - dev_info(dai->dev, "%s: setting TDM: tx_mask: 0x%08x rx_mask: >> 0x%08x " >> - "slots: 0x%08x " "width: %d\n", >> - __func__, tx_mask, rx_mask, slots, slot_width); >> - > > This should be squashed in the previous patch Thanks, looks like I missed a bad rebase and hit this patch instead of the previous. > >> /* Set up slots and tx/rx masks */ >> mask = TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_MASK | >> TEGRA30_I2S_SLOT_CTRL_RX_SLOT_ENABLES_MASK | >> @@ -277,6 +284,8 @@ static int tegra30_i2s_set_tdm(struct snd_soc_dai >> *dai, >> (rx_mask << TEGRA30_I2S_SLOT_CTRL_RX_SLOT_ENABLES_SHIFT) | >> ((slots - 1) << TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_SHIFT); >> + pm_runtime_get_sync(dai->dev); >> + >> regmap_update_bits(i2s->regmap, TEGRA30_I2S_SLOT_CTRL, mask, val); >> /* Set FSYNC width */ >> @@ -284,6 +293,7 @@ static int tegra30_i2s_set_tdm(struct snd_soc_dai >> *dai, >> TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_MASK, >> (slot_width - 1) << TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_SHIFT); >> + pm_runtime_put(dai->dev); > > same for PM stuff, it's not related to 24/32 bit samples Yes, will do. Thank you for reviewing. >> return 0; >> } >> @@ -311,14 +321,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, >> _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-09-18 7:44 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-09-17 18:12 RFC: TDM mode support on the tegra30 Ben Dooks 2019-09-17 18:12 ` [alsa-devel] " Ben Dooks 2019-09-17 18:12 ` [PATCH 1/8] ASoC: tegra: Add a TDM configuration callback Ben Dooks 2019-09-17 18:12 ` [alsa-devel] " Ben Dooks 2019-09-17 18:22 ` Pierre-Louis Bossart 2019-09-17 18:22 ` [alsa-devel] " Pierre-Louis Bossart 2019-09-18 8:42 ` Jon Hunter 2019-09-18 8:42 ` [alsa-devel] " Jon Hunter 2019-09-18 10:11 ` Ben Dooks 2019-09-18 10:11 ` [alsa-devel] " Ben Dooks 2019-09-18 10:25 ` Jon Hunter 2019-09-18 10:25 ` [alsa-devel] " Jon Hunter 2019-09-18 10:48 ` Mark Brown 2019-09-18 10:48 ` [alsa-devel] " Mark Brown 2019-09-18 11:44 ` Ben Dooks 2019-09-18 11:44 ` [alsa-devel] " Ben Dooks 2019-09-18 13:33 ` Pierre-Louis Bossart 2019-09-18 13:33 ` [alsa-devel] " Pierre-Louis Bossart 2019-09-18 15:02 ` Mark Brown 2019-09-18 15:02 ` [alsa-devel] " Mark Brown 2019-09-17 18:12 ` [PATCH 2/8] ASoC: tegra: Allow 24bit and 32bit samples Ben Dooks 2019-09-17 18:12 ` [alsa-devel] " Ben Dooks 2019-09-17 18:26 ` Pierre-Louis Bossart 2019-09-17 18:26 ` [alsa-devel] " Pierre-Louis Bossart 2019-09-18 7:44 ` Ben Dooks [this message] 2019-09-18 7:44 ` Ben Dooks 2019-09-18 10:08 ` Mark Brown 2019-09-18 10:08 ` [alsa-devel] " Mark Brown 2019-09-18 11:50 ` Ben Dooks 2019-09-18 11:50 ` [alsa-devel] " Ben Dooks 2019-09-18 12:05 ` Mark Brown 2019-09-18 12:05 ` [alsa-devel] " Mark Brown 2019-09-17 18:12 ` [PATCH 3/8] ASoC: tegra: i2s: Add support for more than 2 channels Ben Dooks 2019-09-17 18:12 ` [alsa-devel] " Ben Dooks 2019-09-18 8:50 ` Jon Hunter 2019-09-18 8:50 ` [alsa-devel] " Jon Hunter 2019-09-18 10:12 ` Ben Dooks 2019-09-18 10:12 ` [alsa-devel] " Ben Dooks 2019-09-17 18:12 ` [PATCH 4/8] ASoC: tegra: disable rx_fifo after disable stream Ben Dooks 2019-09-17 18:12 ` [alsa-devel] " Ben Dooks 2019-09-17 18:12 ` [PATCH 5/8] ASoC: tegra: set edge mode for TDM correctly Ben Dooks 2019-09-17 18:12 ` [alsa-devel] " Ben Dooks 2019-09-17 19:33 ` kbuild test robot 2019-09-17 19:33 ` [alsa-devel] " kbuild test robot 2019-09-18 8:54 ` Jon Hunter 2019-09-18 8:54 ` [alsa-devel] " Jon Hunter 2019-09-18 9:02 ` Jon Hunter 2019-09-18 9:02 ` [alsa-devel] " Jon Hunter 2019-09-18 10:15 ` Ben Dooks 2019-09-18 10:15 ` [alsa-devel] " Ben Dooks 2019-09-17 18:12 ` [PATCH 6/8] ASoC: tegra: set i2s_offset to 0 for tdm Ben Dooks 2019-09-17 18:12 ` [alsa-devel] " Ben Dooks 2019-09-18 9:02 ` Jon Hunter 2019-09-18 9:02 ` [alsa-devel] " Jon Hunter 2019-09-18 11:30 ` Ben Dooks 2019-09-18 11:30 ` [alsa-devel] " Ben Dooks 2019-09-17 18:12 ` [PATCH 7/8] ASoC: tegra: config fifos on hw_param changes Ben Dooks 2019-09-17 18:12 ` [alsa-devel] " Ben Dooks 2019-09-18 9:14 ` Jon Hunter 2019-09-18 9:14 ` [alsa-devel] " Jon Hunter 2019-09-18 11:41 ` Ben Dooks 2019-09-18 11:41 ` [alsa-devel] " Ben Dooks 2019-09-17 18:12 ` [PATCH 8/8] ASoC: tegra: take packing settings from the audio cif_config Ben Dooks 2019-09-17 18:12 ` [alsa-devel] " Ben Dooks 2019-09-18 9:16 ` Jon Hunter 2019-09-18 9:16 ` [alsa-devel] " Jon Hunter 2019-09-18 10:02 ` Sameer Pujar 2019-09-18 10:02 ` [alsa-devel] " Sameer Pujar
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=de15ea8e9d2c07a1253fd414b421efbe@codethink.co.uk \ --to=ben.dooks@codethink.co.uk \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=edward.cragg@codethink.co.uk \ --cc=jonathanh@nvidia.com \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@lists.codethink.co.uk \ --cc=linux-tegra-owner@vger.kernel.org \ --cc=linux-tegra@vger.kernel.org \ --cc=pierre-louis.bossart@linux.intel.com \ --cc=thierry.reding@gmail.com \ --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: linkBe 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.