From: Dan Murphy <dmurphy@ti.com>
To: <lgirdwood@gmail.com>, <broonie@kernel.org>, <perex@perex.cz>,
<tiwai@suse.com>
Cc: <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>,
<robh@kernel.org>, <devicetree@vger.kernel.org>,
Dan Murphy <dmurphy@ti.com>
Subject: [PATCH v5 4/7] ASoC: tas2562: Add rx and tx slot programming
Date: Wed, 24 Jun 2020 11:14:56 -0500 [thread overview]
Message-ID: <20200624161459.19248-5-dmurphy@ti.com> (raw)
In-Reply-To: <20200624161459.19248-1-dmurphy@ti.com>
Add programming for the tdm slots for both tx and rx offsets.
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
sound/soc/codecs/tas2562.c | 17 ++++++++++++++++-
sound/soc/codecs/tas2562.h | 4 ++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c
index d26e30a2948c..2f1d4b697f01 100644
--- a/sound/soc/codecs/tas2562.c
+++ b/sound/soc/codecs/tas2562.c
@@ -208,6 +208,22 @@ static int tas2562_set_dai_tdm_slot(struct snd_soc_dai *dai,
if (ret < 0)
return ret;
+ if (tx_mask > TAS2562_TX_OFF_MAX) {
+ dev_err(tas2562->dev, "TX slot is larger then %d",
+ TAS2562_TX_OFF_MAX);
+ return -EINVAL;
+ }
+
+ ret = snd_soc_component_update_bits(component, TAS2562_TDM_CFG1,
+ TAS2562_RX_OFF_MASK, rx_mask << 1);
+ if (ret < 0)
+ return ret;
+
+ ret = snd_soc_component_update_bits(component, TAS2562_TDM_CFG4,
+ TAS2562_TX_OFF_MASK, tx_mask << 1);
+ if (ret < 0)
+ return ret;
+
return 0;
}
@@ -327,7 +343,6 @@ static int tas2562_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
ret = snd_soc_component_update_bits(component, TAS2562_TDM_CFG1,
TAS2562_TDM_CFG1_RX_OFFSET_MASK,
tdm_rx_start_slot);
-
if (ret < 0)
return ret;
diff --git a/sound/soc/codecs/tas2562.h b/sound/soc/codecs/tas2562.h
index 28e75fc431d0..47e59c82eef3 100644
--- a/sound/soc/codecs/tas2562.h
+++ b/sound/soc/codecs/tas2562.h
@@ -34,6 +34,10 @@
#define TAS2562_TDM_DET TAS2562_REG(0, 0x11)
#define TAS2562_REV_ID TAS2562_REG(0, 0x7d)
+#define TAS2562_RX_OFF_MASK GENMASK(5, 1)
+#define TAS2562_TX_OFF_MASK GENMASK(3, 1)
+#define TAS2562_TX_OFF_MAX 7
+
/* Page 2 */
#define TAS2562_DVC_CFG1 TAS2562_REG(2, 0x0c)
#define TAS2562_DVC_CFG2 TAS2562_REG(2, 0x0d)
--
2.26.2
next prev parent reply other threads:[~2020-06-24 16:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 16:14 [PATCH v5 0/7] TAS2562 issue fixes and slot programming Dan Murphy
2020-06-24 16:14 ` [PATCH v5 1/7] dt-bindings: tas2562: Fix shut-down gpio property Dan Murphy
2020-06-24 16:14 ` [PATCH v5 2/7] ASoC: tas2562: Update shutdown GPIO property Dan Murphy
2020-06-24 16:14 ` [PATCH v5 3/7] ASoC: tas2562: Fix format issue for extra space before a comma Dan Murphy
2020-06-24 16:29 ` Mark Brown
2020-06-24 16:58 ` Dan Murphy
2020-06-24 17:36 ` Dan Murphy
2020-06-24 17:48 ` Mark Brown
2020-06-24 17:51 ` Dan Murphy
2020-06-24 16:14 ` Dan Murphy [this message]
2020-06-24 16:14 ` [PATCH v5 5/7] dt-bindings: tas2562: Add voltage sense slot property Dan Murphy
2020-06-24 16:14 ` [PATCH v5 6/7] ASoC: tas2562: Add voltage sense slot configuration Dan Murphy
2020-06-24 16:14 ` [PATCH v5 7/7] dt-bindings: tas2562: Convert the tas2562 binding to yaml Dan Murphy
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=20200624161459.19248-5-dmurphy@ti.com \
--to=dmurphy@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=robh@kernel.org \
--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