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,
Ben Dooks <ben.dooks@codethink.co.uk>,
Edward Cragg <edward.cragg@codethink.co.uk>
Subject: [alsa-devel] [PATCH v5 1/7] ASoC: tegra: add a TDM configuration callback
Date: Fri, 18 Oct 2019 16:48:27 +0100 [thread overview]
Message-ID: <20191018154833.7560-2-ben.dooks@codethink.co.uk> (raw)
In-Reply-To: <20191018154833.7560-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>
[ben.dooks@codethink.co.uk: merge fix for power management]
[ben.dooks@codethink.co.uk: add review change for fsync of 1 clock]
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
sound/soc/tegra/tegra30_i2s.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index ac6983c6bd72..73f0dddeaef3 100644
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -254,6 +254,34 @@ static int tegra30_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
return 0;
}
+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, val;
+
+ dev_dbg(dai->dev, "%s: txmask=0x%08x rxmask=0x%08x slots=%d width=%d\n",
+ __func__, tx_mask, rx_mask, slots, slot_width);
+
+ 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);
+
+ pm_runtime_get_sync(dai->dev);
+ regmap_update_bits(i2s->regmap, TEGRA30_I2S_SLOT_CTRL, mask, val);
+ /* set the fsync width to minimum of 1 clock width */
+ regmap_update_bits(i2s->regmap, TEGRA30_I2S_CH_CTRL,
+ TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_MASK, 0x0);
+ pm_runtime_put(dai->dev);
+
+ return 0;
+}
+
static int tegra30_i2s_probe(struct snd_soc_dai *dai)
{
struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai);
@@ -268,6 +296,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
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,
Ben Dooks <ben.dooks@codethink.co.uk>,
Edward Cragg <edward.cragg@codethink.co.uk>
Subject: [PATCH v5 1/7] ASoC: tegra: add a TDM configuration callback
Date: Fri, 18 Oct 2019 16:48:27 +0100 [thread overview]
Message-ID: <20191018154833.7560-2-ben.dooks@codethink.co.uk> (raw)
In-Reply-To: <20191018154833.7560-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>
[ben.dooks@codethink.co.uk: merge fix for power management]
[ben.dooks@codethink.co.uk: add review change for fsync of 1 clock]
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
sound/soc/tegra/tegra30_i2s.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index ac6983c6bd72..73f0dddeaef3 100644
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -254,6 +254,34 @@ static int tegra30_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
return 0;
}
+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, val;
+
+ dev_dbg(dai->dev, "%s: txmask=0x%08x rxmask=0x%08x slots=%d width=%d\n",
+ __func__, tx_mask, rx_mask, slots, slot_width);
+
+ 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);
+
+ pm_runtime_get_sync(dai->dev);
+ regmap_update_bits(i2s->regmap, TEGRA30_I2S_SLOT_CTRL, mask, val);
+ /* set the fsync width to minimum of 1 clock width */
+ regmap_update_bits(i2s->regmap, TEGRA30_I2S_CH_CTRL,
+ TEGRA30_I2S_CH_CTRL_FSYNC_WIDTH_MASK, 0x0);
+ pm_runtime_put(dai->dev);
+
+ return 0;
+}
+
static int tegra30_i2s_probe(struct snd_soc_dai *dai)
{
struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai);
@@ -268,6 +296,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
next prev parent reply other threads:[~2019-10-18 15:56 UTC|newest]
Thread overview: 182+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-18 15:48 [alsa-devel] tegra30 tdm audio support Ben Dooks
2019-10-18 15:48 ` Ben Dooks
2019-10-18 15:48 ` Ben Dooks [this message]
2019-10-18 15:48 ` [PATCH v5 1/7] ASoC: tegra: add a TDM configuration callback Ben Dooks
2019-10-24 15:50 ` [alsa-devel] " Jon Hunter
2019-10-24 15:50 ` Jon Hunter
2019-10-25 10:12 ` [alsa-devel] Applied "ASoC: tegra: add a TDM configuration callback" to the asoc tree Mark Brown
2019-10-25 10:12 ` Mark Brown
2019-10-18 15:48 ` [alsa-devel] [PATCH v5 2/7] ASoC: tegra: Allow 24bit and 32bit samples Ben Dooks
2019-10-18 15:48 ` Ben Dooks
2019-10-24 15:54 ` [alsa-devel] " Jon Hunter
2019-10-24 15:54 ` Jon Hunter
2019-10-25 10:12 ` [alsa-devel] Applied "ASoC: tegra: Allow 24bit and 32bit samples" to the asoc tree Mark Brown
2019-10-25 10:12 ` Mark Brown
2019-11-23 21:09 ` [alsa-devel] [PATCH v5 2/7] ASoC: tegra: Allow 24bit and 32bit samples Dmitry Osipenko
2019-11-23 21:09 ` Dmitry Osipenko
2019-11-25 10:37 ` [alsa-devel] " Ben Dooks
2019-11-25 10:37 ` Ben Dooks
2019-11-25 17:22 ` [alsa-devel] " Dmitry Osipenko
2019-11-25 17:22 ` Dmitry Osipenko
2019-11-25 17:28 ` [alsa-devel] " Dmitry Osipenko
2019-11-25 17:28 ` Dmitry Osipenko
2019-12-19 21:21 ` [alsa-devel] " Dmitry Osipenko
2019-12-19 21:21 ` Dmitry Osipenko
2019-12-20 10:56 ` [alsa-devel] " Ben Dooks
2019-12-20 10:56 ` Ben Dooks
2019-12-20 11:30 ` [alsa-devel] " Jon Hunter
2019-12-20 11:30 ` Jon Hunter
2019-12-20 11:38 ` [alsa-devel] " Ben Dooks
2019-12-20 11:38 ` Ben Dooks
2019-12-20 13:57 ` [alsa-devel] " Jon Hunter
2019-12-20 13:57 ` Jon Hunter
2019-12-20 14:43 ` [alsa-devel] " Dmitry Osipenko
2019-12-20 14:43 ` Dmitry Osipenko
2019-12-20 14:56 ` [alsa-devel] " Ben Dooks
2019-12-20 14:56 ` Ben Dooks
2019-12-20 15:02 ` [alsa-devel] " Dmitry Osipenko
2019-12-20 15:02 ` Dmitry Osipenko
2019-12-20 15:25 ` [alsa-devel] " Ben Dooks
2019-12-20 15:25 ` Ben Dooks
2019-12-20 16:40 ` [alsa-devel] " Dmitry Osipenko
2019-12-20 16:40 ` Dmitry Osipenko
2019-12-20 17:06 ` [alsa-devel] " Ben Dooks
2019-12-20 17:06 ` Ben Dooks
2019-12-22 17:08 ` [alsa-devel] " Dmitry Osipenko
2019-12-22 17:08 ` Dmitry Osipenko
2020-01-05 0:04 ` [alsa-devel] " Ben Dooks
2020-01-05 0:04 ` Ben Dooks
2020-01-05 1:48 ` [alsa-devel] " Dmitry Osipenko
2020-01-05 1:48 ` Dmitry Osipenko
2020-01-05 10:53 ` [alsa-devel] " Ben Dooks
2020-01-05 10:53 ` Ben Dooks
2020-01-06 19:00 ` [alsa-devel] [Linux-kernel] " Ben Dooks
2020-01-06 19:00 ` Ben Dooks
2020-01-07 1:39 ` [alsa-devel] " Dmitry Osipenko
2020-01-07 1:39 ` Dmitry Osipenko
2020-01-08 11:37 ` [alsa-devel] " Jon Hunter
2020-01-08 11:37 ` Jon Hunter
2020-01-20 16:50 ` [alsa-devel] " Dmitry Osipenko
2020-01-20 16:50 ` Dmitry Osipenko
2020-01-20 17:36 ` [alsa-devel] " Ben Dooks
2020-01-20 17:36 ` Ben Dooks
2020-01-23 19:38 ` [alsa-devel] " Ben Dooks
2020-01-23 19:38 ` Ben Dooks
2020-01-23 21:59 ` Ben Dooks
2020-01-23 21:59 ` Ben Dooks
2020-01-23 22:11 ` Dmitry Osipenko
2020-01-23 22:11 ` Dmitry Osipenko
2020-01-24 4:31 ` Dmitry Osipenko
2020-01-24 4:31 ` Dmitry Osipenko
2020-01-24 16:56 ` Jon Hunter
2020-01-24 16:56 ` Jon Hunter
2020-01-24 17:00 ` Mark Brown
2020-01-24 17:00 ` Mark Brown
2020-01-24 17:03 ` Ben Dooks
2020-01-24 17:03 ` Ben Dooks
2020-01-24 16:50 ` Jon Hunter
2020-01-24 16:50 ` Jon Hunter
2020-01-24 17:00 ` Ben Dooks
2020-01-24 17:00 ` Ben Dooks
2020-01-28 7:49 ` Ricard Wanderlof
2020-01-28 7:49 ` Ricard Wanderlof
2020-01-24 17:06 ` Ben Dooks
2020-01-24 17:06 ` Ben Dooks
2020-01-27 19:20 ` Dmitry Osipenko
2020-01-27 19:20 ` Dmitry Osipenko
2020-01-27 19:23 ` Dmitry Osipenko
2020-01-27 19:23 ` Dmitry Osipenko
2020-01-28 8:59 ` Ben Dooks
2020-01-28 8:59 ` Ben Dooks
2020-01-28 13:19 ` [alsa-devel] " Jon Hunter
2020-01-28 13:19 ` Jon Hunter
2020-01-28 15:25 ` Dmitry Osipenko
2020-01-28 15:25 ` Dmitry Osipenko
2020-01-28 15:26 ` Mark Brown
2020-01-28 15:26 ` Mark Brown
2020-01-28 17:45 ` Dmitry Osipenko
2020-01-28 17:45 ` Dmitry Osipenko
2020-01-28 18:42 ` Jon Hunter
2020-01-28 18:42 ` Jon Hunter
2020-01-30 8:04 ` Ben Dooks
2020-01-30 8:04 ` Ben Dooks
2020-01-28 8:58 ` Ben Dooks
2020-01-28 8:58 ` Ben Dooks
2020-01-28 12:13 ` [alsa-devel] " Mark Brown
2020-01-28 12:13 ` Mark Brown
2020-01-28 17:42 ` Dmitry Osipenko
2020-01-28 17:42 ` Dmitry Osipenko
2020-01-28 18:19 ` Jon Hunter
2020-01-28 18:19 ` Jon Hunter
2020-01-29 0:17 ` Dmitry Osipenko
2020-01-29 0:17 ` Dmitry Osipenko
2020-01-30 8:05 ` [alsa-devel] (no subject) Ben Dooks
2020-01-30 8:05 ` Ben Dooks
2020-01-30 9:31 ` [alsa-devel] (no subject) Clemens Ladisch
2020-01-30 9:31 ` Clemens Ladisch
2020-01-30 9:39 ` [alsa-devel] " Ben Dooks
2020-01-30 9:39 ` Ben Dooks
2020-01-30 14:58 ` Clemens Ladisch
2020-01-30 14:58 ` Clemens Ladisch
2020-01-31 10:50 ` Ben Dooks
2020-01-31 10:50 ` Ben Dooks
2020-01-31 11:03 ` Clemens Ladisch
2020-01-31 11:03 ` Clemens Ladisch
2020-01-29 10:49 ` [alsa-devel] [Linux-kernel] [PATCH v5 2/7] ASoC: tegra: Allow 24bit and 32bit samples Jon Hunter
2020-01-29 10:49 ` Jon Hunter
2020-01-29 14:33 ` Jon Hunter
2020-01-29 14:33 ` Jon Hunter
2020-01-29 15:22 ` Dmitry Osipenko
2020-01-29 15:22 ` Dmitry Osipenko
2020-01-30 8:17 ` Ben Dooks
2020-01-30 8:17 ` Ben Dooks
2020-01-30 12:05 ` Jon Hunter
2020-01-30 12:05 ` Jon Hunter
2020-01-30 12:07 ` Ben Dooks
2020-01-30 12:07 ` Ben Dooks
2020-01-30 13:09 ` Jon Hunter
2020-01-30 13:09 ` Jon Hunter
2020-01-30 13:10 ` Mark Brown
2020-01-30 13:10 ` Mark Brown
2020-03-19 15:32 ` Ben Dooks
2020-03-19 15:32 ` Ben Dooks
2020-03-20 14:18 ` Dmitry Osipenko
2020-03-20 14:18 ` Dmitry Osipenko
2020-01-30 8:06 ` Ben Dooks
2020-01-30 8:06 ` Ben Dooks
2020-01-29 17:52 ` Ben Dooks
2020-01-29 17:52 ` Ben Dooks
2020-01-07 10:29 ` [alsa-devel] " Jon Hunter
2020-01-07 10:29 ` Jon Hunter
2020-01-07 10:35 ` [alsa-devel] " Ben Dooks
2020-01-07 10:35 ` Ben Dooks
2020-01-21 18:15 ` [alsa-devel] " Ben Dooks
2020-01-21 18:15 ` Ben Dooks
2020-01-21 18:54 ` Dmitry Osipenko
2020-01-21 18:54 ` Dmitry Osipenko
2019-10-18 15:48 ` [alsa-devel] [PATCH v5 3/7] ASoC: tegra: i2s: Add support for more than 2 channels Ben Dooks
2019-10-18 15:48 ` Ben Dooks
2019-10-24 16:12 ` [alsa-devel] " Jon Hunter
2019-10-24 16:12 ` Jon Hunter
2019-10-24 19:18 ` [alsa-devel] " Mark Brown
2019-10-24 19:18 ` Mark Brown
2019-10-25 7:48 ` [alsa-devel] " Jon Hunter
2019-10-25 7:48 ` Jon Hunter
2019-10-18 15:48 ` [alsa-devel] [PATCH v5 4/7] ASoC: tegra: disable rx_fifo after disable stream Ben Dooks
2019-10-18 15:48 ` Ben Dooks
2019-10-24 16:12 ` [alsa-devel] " Jon Hunter
2019-10-24 16:12 ` Jon Hunter
2019-10-25 10:12 ` [alsa-devel] Applied "ASoC: tegra: disable rx_fifo after disable stream" to the asoc tree Mark Brown
2019-10-25 10:12 ` Mark Brown
2019-10-18 15:48 ` [alsa-devel] [PATCH v5 5/7] ASoC: tegra: set i2s_offset to 0 for tdm Ben Dooks
2019-10-18 15:48 ` Ben Dooks
2019-10-25 7:58 ` [alsa-devel] " Jon Hunter
2019-10-25 7:58 ` Jon Hunter
2019-10-18 15:48 ` [alsa-devel] [PATCH v5 6/7] ASoC: tegra: config fifos on hw_param changes Ben Dooks
2019-10-18 15:48 ` Ben Dooks
2019-10-25 8:18 ` [alsa-devel] " Jon Hunter
2019-10-25 8:18 ` Jon Hunter
2019-10-18 15:48 ` [alsa-devel] [PATCH v5 7/7] ASoC: tegra: take packing settings from the audio cif_config Ben Dooks
2019-10-18 15:48 ` Ben Dooks
2019-10-25 8:47 ` [alsa-devel] " Jon Hunter
2019-10-25 8:47 ` Jon Hunter
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=20191018154833.7560-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: 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.