From: James Calligeros <jcalligeros99@gmail.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Shenghao Ding <shenghao-ding@ti.com>, Kevin Lu <kevin-lu@ti.com>,
Baojun Xu <baojun.xu@ti.com>, Dan Murphy <dmurphy@ti.com>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Shi Fu <shifu0704@thundersoft.com>
Cc: "Alyssa Rosenzweig" <alyssa@rosenzweig.io>,
"Martin Povišer" <povik+lin@cutebit.org>,
"Hector Martin" <marcan@marcan.st>,
linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, asahi@lists.linux.dev,
"James Calligeros" <jcalligeros99@gmail.com>
Subject: [PATCH 13/27] ASoC: tas2764: Crop SDOUT zero-out mask based on BCLK ratio
Date: Sat, 15 Feb 2025 10:02:46 +1000 [thread overview]
Message-ID: <20250215-apple-codec-changes-v1-13-723569b21b19@gmail.com> (raw)
In-Reply-To: <20250215-apple-codec-changes-v1-0-723569b21b19@gmail.com>
From: Martin Povišer <povik+lin@cutebit.org>
Signed-off-by: Martin Povišer <povik+lin@cutebit.org>
Signed-off-by: James Calligeros <jcalligeros99@gmail.com>
---
sound/soc/codecs/tas2764.c | 56 +++++++++++++++++--------
1 file changed, 39 insertions(+), 17 deletions(-)
diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas2764.c
index 25238d3721a21d5af8434490acfdb7ba53de9ce0..439e5bbd372cd467966ac9cac1c92e3e300fed54 100644
--- a/sound/soc/codecs/tas2764.c
+++ b/sound/soc/codecs/tas2764.c
@@ -375,6 +375,44 @@ static int tas2764_hw_params(struct snd_pcm_substream *substream,
return tas2764_set_samplerate(tas2764, params_rate(params));
}
+static int tas2764_write_sdout_zero_mask(struct tas2764_priv *tas2764, int bclk_ratio)
+{
+ struct snd_soc_component *component = tas2764->component;
+ int nsense_slots = bclk_ratio / 8;
+ u32 cropped_mask;
+ int i, ret;
+
+ if (!tas2764->sdout_zero_mask)
+ return 0;
+
+ cropped_mask = tas2764->sdout_zero_mask & GENMASK(nsense_slots - 1, 0);
+
+ for (i = 0; i < 4; i++) {
+ ret = snd_soc_component_write(component, TAS2764_SDOUT_HIZ_1 + i,
+ (cropped_mask >> (i * 8)) & 0xff);
+
+ if (ret < 0)
+ return ret;
+ }
+
+ ret = snd_soc_component_update_bits(component, TAS2764_SDOUT_HIZ_9,
+ TAS2764_SDOUT_HIZ_9_FORCE_0_EN,
+ TAS2764_SDOUT_HIZ_9_FORCE_0_EN);
+
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+static int tas2764_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio)
+{
+ struct snd_soc_component *component = dai->component;
+ struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component);
+
+ return tas2764_write_sdout_zero_mask(tas2764, ratio);
+}
+
static int tas2764_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{
struct snd_soc_component *component = dai->component;
@@ -506,6 +544,7 @@ static int tas2764_set_dai_tdm_slot(struct snd_soc_dai *dai,
static const struct snd_soc_dai_ops tas2764_dai_ops = {
.mute_stream = tas2764_mute,
.hw_params = tas2764_hw_params,
+ .set_bclk_ratio = tas2764_set_bclk_ratio,
.set_fmt = tas2764_set_fmt,
.set_tdm_slot = tas2764_set_dai_tdm_slot,
.no_capture_mute = 1,
@@ -658,23 +697,6 @@ static int tas2764_codec_probe(struct snd_soc_component *component)
if (ret < 0)
return ret;
- if (tas2764->sdout_zero_mask) {
- for (i = 0; i < 4; i++) {
- ret = snd_soc_component_write(component, TAS2764_SDOUT_HIZ_1 + i,
- (tas2764->sdout_zero_mask >> (i * 8)) & 0xff);
-
- if (ret < 0)
- return ret;
- }
-
- ret = snd_soc_component_update_bits(component, TAS2764_SDOUT_HIZ_9,
- TAS2764_SDOUT_HIZ_9_FORCE_0_EN,
- TAS2764_SDOUT_HIZ_9_FORCE_0_EN);
-
- if (ret < 0)
- return ret;
- }
-
if (tas2764->devid == DEVID_SN012776) {
ret = snd_soc_component_update_bits(component, TAS2764_PWR_CTRL,
TAS2764_PWR_CTRL_BOP_SRC,
--
2.48.1
next prev parent reply other threads:[~2025-02-15 0:04 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-15 0:02 [PATCH 00/27] ASoC: tas27{64,70}: improve support for Apple codec variants James Calligeros
2025-02-15 0:02 ` [PATCH 01/27] ASoC: dt-bindings: tas27xx: add compatible for SN012776 James Calligeros
2025-02-15 0:02 ` [PATCH 02/27] ASoC: dt-bindings: tas2770: add compatible for TAS5770L James Calligeros
2025-02-15 0:02 ` [PATCH 03/27] ASoC: tas2764: Extend driver to SN012776 James Calligeros
2025-02-16 22:58 ` Alyssa Rosenzweig
2025-02-16 23:54 ` Mark Brown
2025-02-15 0:02 ` [PATCH 04/27] ASoC: tas2764: Add control concerning overcurrent events James Calligeros
2025-02-15 0:16 ` Martin Povišer
2025-02-15 0:02 ` [PATCH 05/27] ASoC: tas2770: Factor out set_ivsense_slots James Calligeros
2025-02-15 0:02 ` [PATCH 06/27] ASoC: tas2770: Fix and redo I/V sense TDM slot setting logic James Calligeros
2025-02-15 0:02 ` [PATCH 07/27] ASoC: tas2764: Reinit cache on part reset James Calligeros
2025-02-15 0:02 ` [PATCH 08/27] ASoC: tas2764: Configure zeroing of SDOUT slots James Calligeros
2025-02-15 0:02 ` [PATCH 09/27] ASoC: tas2764: Apply Apple quirks James Calligeros
2025-02-16 23:01 ` Alyssa Rosenzweig
2025-02-15 0:02 ` [PATCH 10/27] ASoC: tas2764: Raise regmap range maximum James Calligeros
2025-02-15 0:02 ` [PATCH 11/27] ASoC: tas2770: Export 'die_temp' to sysfs James Calligeros
2025-02-16 23:56 ` Mark Brown
2025-02-15 0:02 ` [PATCH 12/27] ASoC: tas2764: " James Calligeros
2025-02-15 0:02 ` James Calligeros [this message]
2025-02-15 0:02 ` [PATCH 14/27] ASoC: tas2764: Enable main IRQs James Calligeros
2025-02-15 0:02 ` [PATCH 15/27] ASoC: tas2764: Power up/down amp on mute ops James Calligeros
2025-02-15 0:02 ` [PATCH 16/27] ASoC: tas2764: Add SDZ regulator James Calligeros
2025-02-15 0:02 ` [PATCH 17/27] ASoC: tas2764: Add reg defaults for TAS2764_INT_CLK_CFG James Calligeros
2025-02-15 0:02 ` [PATCH 18/27] ASoC: tas2764: Mark SW_RESET as volatile James Calligeros
2025-02-15 0:02 ` [PATCH 19/27] ASoC: tas2764: Fix power control mask James Calligeros
2025-02-16 23:58 ` Mark Brown
2025-02-15 0:02 ` [PATCH 20/27] ASoC: tas2764: Wait for ramp-down after shutdown James Calligeros
2025-02-15 0:02 ` [PATCH 21/27] ASoC: tas2770: Add SDZ regulator James Calligeros
2025-02-15 0:02 ` [PATCH 22/27] ASoC: tas2770: Power cycle amp on ISENSE/VSENSE change James Calligeros
2025-02-15 0:02 ` [PATCH 23/27] ASoC: tas2770: Add zero-fill and pull-down controls James Calligeros
2025-02-15 0:02 ` [PATCH 24/27] ASoC: tas2770: Support setting the PDM TX slot James Calligeros
2025-02-15 0:02 ` [PATCH 25/27] ASoC: tas2770: Fix volume scale James Calligeros
2025-02-17 0:00 ` Mark Brown
2025-02-15 0:02 ` [PATCH 26/27] ASoC: tas2764: Set the SDOUT polarity correctly James Calligeros
2025-02-15 0:03 ` [PATCH 27/27] ASoC: tas2770: " James Calligeros
2025-02-15 0:39 ` [PATCH 00/27] ASoC: tas27{64,70}: improve support for Apple codec variants Neal Gompa
2025-02-16 23:03 ` Alyssa Rosenzweig
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=20250215-apple-codec-changes-v1-13-723569b21b19@gmail.com \
--to=jcalligeros99@gmail.com \
--cc=alyssa@rosenzweig.io \
--cc=asahi@lists.linux.dev \
--cc=baojun.xu@ti.com \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dmurphy@ti.com \
--cc=kevin-lu@ti.com \
--cc=krzk+dt@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=marcan@marcan.st \
--cc=perex@perex.cz \
--cc=povik+lin@cutebit.org \
--cc=robh@kernel.org \
--cc=shenghao-ding@ti.com \
--cc=shifu0704@thundersoft.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).