From: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati@amd.com>
Cc: "moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER
MANAGEM..." <alsa-devel@alsa-project.org>,
Maruthi Srinivas Bayyavarapu <Maruthi.Bayyavarapu@amd.com>,
open list <linux-kernel@vger.kernel.org>,
Takashi Iwai <tiwai@suse.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Akshu.Agrawal@amd.com, Sanju R Mehta <sanju.mehta@amd.com>,
Ravulapati Vishnu vardhan rao
<Vishnuvardhanrao.Ravulapati@amd.com>,
Mark Brown <broonie@kernel.org>,
djkurtz@google.com, Vijendar Mukunda <Vijendar.Mukunda@amd.com>,
Alex Deucher <alexander.deucher@amd.com>
Subject: [alsa-devel] [RESEND PATCH v2 4/7] ASoC: amd: add ACP3x TDM mode support
Date: Thu, 7 Nov 2019 20:06:01 +0530 [thread overview]
Message-ID: <1573137364-5592-5-git-send-email-Vishnuvardhanrao.Ravulapati@amd.com> (raw)
In-Reply-To: <1573137364-5592-1-git-send-email-Vishnuvardhanrao.Ravulapati@amd.com>
ACP3x I2S (CPU DAI) can act in normal I2S and TDM modes. Added support
for TDM mode. Desired mode can be selected from ASoC machine driver.
Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati@amd.com>
---
sound/soc/amd/raven/acp3x-i2s.c | 52 +++++++++++++++++++++++++++++++++--------
sound/soc/amd/raven/acp3x.h | 2 ++
2 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c
index 725e71a..04c740d 100644
--- a/sound/soc/amd/raven/acp3x-i2s.c
+++ b/sound/soc/amd/raven/acp3x-i2s.c
@@ -43,7 +43,8 @@ static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask,
u32 rx_mask, int slots, int slot_width)
{
u32 val = 0;
- u16 slot_len;
+ u32 mode = 0;
+ u16 slot_len, flen;
struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai);
@@ -64,16 +65,47 @@ static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask,
return -EINVAL;
}
- val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER);
- rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_ITER);
- val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER);
- rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_IRER);
+ /* Enable I2S / BT channels TDM and respective
+ * I2S/BT`s TX/RX Formats frame lengths.
+ */
+ flen = (FRM_LEN | (slots << 15) | (slot_len << 18));
- val = (FRM_LEN | (slots << 15) | (slot_len << 18));
- rv_writel(val, adata->acp3x_base + mmACP_BTTDM_TXFRMT);
- rv_writel(val, adata->acp3x_base + mmACP_BTTDM_RXFRMT);
-
- adata->tdm_fmt = val;
+ if (adata->substream_type == SNDRV_PCM_STREAM_PLAYBACK) {
+ switch (adata->i2s_instance) {
+ case I2S_BT_INSTANCE:
+ val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER);
+ rv_writel((val | 0x2),
+ adata->acp3x_base + mmACP_BTTDM_ITER);
+ rv_writel(flen,
+ adata->acp3x_base + mmACP_BTTDM_TXFRMT);
+ break;
+ case I2S_SP_INSTANCE:
+ default:
+ val = rv_readl(adata->acp3x_base + mmACP_I2STDM_ITER);
+ rv_writel((val | 0x2),
+ adata->acp3x_base + mmACP_I2STDM_ITER);
+ rv_writel(flen,
+ adata->acp3x_base + mmACP_I2STDM_TXFRMT);
+ }
+ } else {
+ switch (adata->i2s_instance) {
+ case I2S_BT_INSTANCE:
+ val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER);
+ rv_writel((val | 0x2),
+ adata->acp3x_base + mmACP_BTTDM_IRER);
+ rv_writel(flen,
+ adata->acp3x_base + mmACP_BTTDM_RXFRMT);
+ break;
+ case I2S_SP_INSTANCE:
+ default:
+ val = rv_readl(adata->acp3x_base + mmACP_I2STDM_IRER);
+ rv_writel((val | 0x2),
+ adata->acp3x_base + mmACP_I2STDM_IRER);
+ rv_writel(flen,
+ adata->acp3x_base + mmACP_I2STDM_RXFRMT);
+ }
+ }
+ adata->tdm_fmt = flen;
return 0;
}
diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h
index c071477..01b283a 100644
--- a/sound/soc/amd/raven/acp3x.h
+++ b/sound/soc/amd/raven/acp3x.h
@@ -76,6 +76,8 @@ struct i2s_dev_data {
bool tdm_mode;
unsigned int i2s_irq;
u32 tdm_fmt;
+ u16 i2s_instance;
+ u32 substream_type;
void __iomem *acp3x_base;
struct snd_pcm_substream *play_stream;
struct snd_pcm_substream *capture_stream;
--
2.7.4
_______________________________________________
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-11-06 14:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1573137364-5592-1-git-send-email-Vishnuvardhanrao.Ravulapati@amd.com>
2019-11-07 14:35 ` [alsa-devel] [RESEND PATCH v2 1/7] ASoC: amd: Create multiple I2S platform device endpoints Ravulapati Vishnu vardhan rao
2019-11-06 16:17 ` Mark Brown
2019-11-06 16:24 ` Pierre-Louis Bossart
2019-11-07 14:35 ` [alsa-devel] [RESEND PATCH v2 2/7] ASoC: amd: Refactoring of DAI from DMA driver Ravulapati Vishnu vardhan rao
2019-11-06 16:31 ` Pierre-Louis Bossart
2019-11-07 14:36 ` [alsa-devel] [PATCH v2 3/7] ASoC: amd: Enabling I2S instance in DMA and DAI Ravulapati Vishnu vardhan rao
2019-11-06 16:34 ` Pierre-Louis Bossart
2019-11-06 17:06 ` Mark Brown
2019-11-07 14:36 ` Ravulapati Vishnu vardhan rao [this message]
2019-11-07 14:36 ` [alsa-devel] [RESEND PATCH v2 5/7] ASoC: amd: handle ACP3x i2s-sp watermark interrupt Ravulapati Vishnu vardhan rao
2019-11-07 14:36 ` [alsa-devel] [PATCH v2 6/7] ASoC: amd: ACP powergating to be done by controller Ravulapati Vishnu vardhan rao
2019-11-06 16:40 ` Pierre-Louis Bossart
2019-11-07 14:36 ` [alsa-devel] [RESEND PATCH v2 7/7] ASoC: amd: Added ACP3x system resume and runtime pm ops Ravulapati Vishnu vardhan rao
2019-11-06 16:43 ` Pierre-Louis Bossart
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=1573137364-5592-5-git-send-email-Vishnuvardhanrao.Ravulapati@amd.com \
--to=vishnuvardhanrao.ravulapati@amd.com \
--cc=Akshu.Agrawal@amd.com \
--cc=Maruthi.Bayyavarapu@amd.com \
--cc=Vijendar.Mukunda@amd.com \
--cc=alexander.deucher@amd.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=djkurtz@google.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sanju.mehta@amd.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).