From: Ben Dooks <ben.dooks@codethink.co.uk> To: linux-tegra@vger.kernel.org, alsa-devel@alsa-project.org, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Thierry Reding <thierry.reding@gmail.com>, Jonathan Hunter <jonathanh@nvidia.com> Cc: linux-kernel@lists.codethink.co.uk, Edward Cragg <edward.cragg@codethink.co.uk> Subject: [PATCH 1/8] ASoC: tegra: Add a TDM configuration callback Date: Tue, 17 Sep 2019 19:12:26 +0100 [thread overview] Message-ID: <20190917181233.534-2-ben.dooks@codethink.co.uk> (raw) In-Reply-To: <20190917181233.534-1-ben.dooks@codethink.co.uk> From: Edward Cragg <edward.cragg@codethink.co.uk> Add a callback to configure TDM settings for the Tegra30 I2S ASoC 'platform' driver. Signed-off-by: Edward Cragg <edward.cragg@codethink.co.uk> --- sound/soc/tegra/tegra30_i2s.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index ac6983c6bd72..d36b4662b420 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c @@ -254,6 +254,39 @@ static int tegra30_i2s_trigger(struct snd_pcm_substream *substream, int cmd, return 0; } +/* + * Set up TDM + */ +static int tegra30_i2s_set_tdm(struct snd_soc_dai *dai, + unsigned int tx_mask, unsigned int rx_mask, + int slots, int slot_width) +{ + 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); + + /* Set up slots and tx/rx masks */ + mask = TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_MASK | + TEGRA30_I2S_SLOT_CTRL_RX_SLOT_ENABLES_MASK | + TEGRA30_I2S_SLOT_CTRL_TX_SLOT_ENABLES_MASK; + + val = (tx_mask << TEGRA30_I2S_SLOT_CTRL_TX_SLOT_ENABLES_SHIFT) | + (rx_mask << TEGRA30_I2S_SLOT_CTRL_RX_SLOT_ENABLES_SHIFT) | + ((slots - 1) << TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_SHIFT); + + regmap_update_bits(i2s->regmap, TEGRA30_I2S_SLOT_CTRL, mask, val); + + /* Set FSYNC width */ + regmap_update_bits(i2s->regmap, TEGRA30_I2S_CH_CTRL, + TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_MASK, + (slot_width - 1) << TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_SHIFT); + + return 0; +} + static int tegra30_i2s_probe(struct snd_soc_dai *dai) { struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai); @@ -268,6 +301,7 @@ static const struct snd_soc_dai_ops tegra30_i2s_dai_ops = { .set_fmt = tegra30_i2s_set_fmt, .hw_params = tegra30_i2s_hw_params, .trigger = tegra30_i2s_trigger, + .set_tdm_slot = tegra30_i2s_set_tdm, }; static const struct snd_soc_dai_driver tegra30_i2s_dai_template = { -- 2.23.0
WARNING: multiple messages have this Message-ID (diff)
From: Ben Dooks <ben.dooks@codethink.co.uk> To: linux-tegra@vger.kernel.org, alsa-devel@alsa-project.org, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, Thierry Reding <thierry.reding@gmail.com>, Jonathan Hunter <jonathanh@nvidia.com> Cc: linux-kernel@lists.codethink.co.uk, Edward Cragg <edward.cragg@codethink.co.uk> Subject: [alsa-devel] [PATCH 1/8] ASoC: tegra: Add a TDM configuration callback Date: Tue, 17 Sep 2019 19:12:26 +0100 [thread overview] Message-ID: <20190917181233.534-2-ben.dooks@codethink.co.uk> (raw) In-Reply-To: <20190917181233.534-1-ben.dooks@codethink.co.uk> From: Edward Cragg <edward.cragg@codethink.co.uk> Add a callback to configure TDM settings for the Tegra30 I2S ASoC 'platform' driver. Signed-off-by: Edward Cragg <edward.cragg@codethink.co.uk> --- sound/soc/tegra/tegra30_i2s.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c index ac6983c6bd72..d36b4662b420 100644 --- a/sound/soc/tegra/tegra30_i2s.c +++ b/sound/soc/tegra/tegra30_i2s.c @@ -254,6 +254,39 @@ static int tegra30_i2s_trigger(struct snd_pcm_substream *substream, int cmd, return 0; } +/* + * Set up TDM + */ +static int tegra30_i2s_set_tdm(struct snd_soc_dai *dai, + unsigned int tx_mask, unsigned int rx_mask, + int slots, int slot_width) +{ + 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); + + /* Set up slots and tx/rx masks */ + mask = TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_MASK | + TEGRA30_I2S_SLOT_CTRL_RX_SLOT_ENABLES_MASK | + TEGRA30_I2S_SLOT_CTRL_TX_SLOT_ENABLES_MASK; + + val = (tx_mask << TEGRA30_I2S_SLOT_CTRL_TX_SLOT_ENABLES_SHIFT) | + (rx_mask << TEGRA30_I2S_SLOT_CTRL_RX_SLOT_ENABLES_SHIFT) | + ((slots - 1) << TEGRA30_I2S_SLOT_CTRL_TOTAL_SLOTS_SHIFT); + + regmap_update_bits(i2s->regmap, TEGRA30_I2S_SLOT_CTRL, mask, val); + + /* Set FSYNC width */ + regmap_update_bits(i2s->regmap, TEGRA30_I2S_CH_CTRL, + TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_MASK, + (slot_width - 1) << TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_SHIFT); + + return 0; +} + static int tegra30_i2s_probe(struct snd_soc_dai *dai) { struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai); @@ -268,6 +301,7 @@ static const struct snd_soc_dai_ops tegra30_i2s_dai_ops = { .set_fmt = tegra30_i2s_set_fmt, .hw_params = tegra30_i2s_hw_params, .trigger = tegra30_i2s_trigger, + .set_tdm_slot = tegra30_i2s_set_tdm, }; static const struct snd_soc_dai_driver tegra30_i2s_dai_template = { -- 2.23.0 _______________________________________________ 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-17 18:12 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 ` Ben Dooks [this message] 2019-09-17 18:12 ` [alsa-devel] [PATCH 1/8] ASoC: tegra: Add a TDM configuration callback 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 2019-09-18 7:44 ` [alsa-devel] " 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=20190917181233.534-2-ben.dooks@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@vger.kernel.org \ --cc=perex@perex.cz \ --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.