devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	 Jean Delvare <jdelvare@suse.com>,
	Guenter Roeck <linux@roeck-us.net>
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,
	linux-hwmon@vger.kernel.org, "Neal Gompa" <neal@gompa.dev>,
	"James Calligeros" <jcalligeros99@gmail.com>
Subject: [PATCH v2 27/29] ASoC: tas2770: Support setting the PDM TX slot
Date: Tue, 18 Feb 2025 18:36:01 +1000	[thread overview]
Message-ID: <20250218-apple-codec-changes-v2-27-932760fd7e07@gmail.com> (raw)
In-Reply-To: <20250218-apple-codec-changes-v2-0-932760fd7e07@gmail.com>

From: Hector Martin <marcan@marcan.st>

We don't actually support configuring the PDM input right now. Rather,
this is useful as a hack.

On Apple Silicon machines, amps are split between two I2S buses which
are logically ANDed internally at the SoC. Odd and even slot groups are
driven by amps on either bus respectively. Since the signals are ANDed,
unused slot groups must be driven as zero to avoid corrupting the data
from the other side.

On most recent machines (TAS2764-based), this is accomplished using the
"SDOUT zero mask" feature of that chip. Unfortunately, TAS2770 does not
support this. It does support zeroing out *all* unused slots, which
works well for machines with a single amp per I2S bus. That is all,
except one.

The 13" M1 MacBook Pro is the only machine using TAS2770 and two amps
per I2S bus:

L Bus: SPK0I SPK0V Hi-Z  Hi-Z  SPK2I SPK2V Hi-Z  Hi-Z
R Bus: Hi-Z  Hi-Z  SPK1I SPK2V Hi-Z  Hi-Z  SPK3I SPK3V

To ensure uncorrupted data, we need to force all the Hi-Z periods to
zero. We cannot use the "force all zero" feature, as that would cause a
bus conflict between both amps. We can use the pull-down feature, but
that leaves a few bits of garbage on the trailing edge of the speaker
data, since the pull-down is weak.

This is where the PDM transmit feature comes in. With PDM grounded and
disabled (the default state), the PDM slot is transmitted as all zeroes.
We can use that to force a zero 16-bit slot after the voltage data for
each speaker, cleaning it up. Then the pull-down ensures the line stays
low for the subsequent slot:

L Bus: SPK0I SPK0V PDM0  PulDn SPK2I SPK2V PDM0  PulDn
R Bus: PDM0  PulDn SPK1I SPK2V PDM0  PulDn SPK3I SPK3V

Yes, this is a horrible hack, but it beats adding dummy slots that would
be visible to the userspace capture side. There may be some other way to
fix the logical AND behavior on the MCA side... that would make this
unnecessary.

("How does Apple deal with this"? - they don't, macOS does not use
IVSENSE on TAS2770 machines even though it's physically wired up,
but we want to do so on Linux.)

Reviewed-by: Neal Gompa <neal@gompa.dev>
Signed-off-by: Hector Martin <marcan@marcan.st>
Signed-off-by: James Calligeros <jcalligeros99@gmail.com>
---
 sound/soc/codecs/tas2770.c | 25 +++++++++++++++++++++++++
 sound/soc/codecs/tas2770.h |  6 ++++++
 2 files changed, 31 insertions(+)

diff --git a/sound/soc/codecs/tas2770.c b/sound/soc/codecs/tas2770.c
index 8adb558f9e89988e0decc344502da8226f8ff517..c4a5f4d1ce09a8e68759dd75d532d06d2a7f2d39 100644
--- a/sound/soc/codecs/tas2770.c
+++ b/sound/soc/codecs/tas2770.c
@@ -248,6 +248,19 @@ static int tas2770_set_ivsense_transmit(struct tas2770_priv *tas2770,
 	return 0;
 }
 
+static int tas2770_set_pdm_transmit(struct tas2770_priv *tas2770, int slot)
+{
+	struct snd_soc_component *component = tas2770->component;
+	int ret;
+
+	ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG7,
+					    TAS2770_TDM_CFG_REG7_PDM_MASK |
+					    TAS2770_TDM_CFG_REG7_50_MASK,
+					    TAS2770_TDM_CFG_REG7_PDM_ENABLE |
+					    slot);
+	return ret;
+}
+
 static int tas2770_set_bitwidth(struct tas2770_priv *tas2770, int bitwidth)
 {
 	int ret;
@@ -658,6 +671,13 @@ static int tas2770_codec_probe(struct snd_soc_component *component)
 			return ret;
 	}
 
+	if (tas2770->pdm_slot != -1) {
+		ret = tas2770_set_pdm_transmit(tas2770, tas2770->pdm_slot);
+
+		if (ret < 0)
+			return ret;
+	}
+
 	ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG4,
 					    TAS2770_TDM_CFG_REG4_TX_FILL,
 					    tas2770->sdout_zfill ? 0 :
@@ -825,6 +845,11 @@ static int tas2770_parse_dt(struct device *dev, struct tas2770_priv *tas2770)
 		tas2770->v_sense_slot = -1;
 	}
 
+	rc = fwnode_property_read_u32(dev->fwnode, "ti,pdm-slot-no",
+				      &tas2770->pdm_slot);
+	if (rc)
+		tas2770->pdm_slot = -1;
+
 	tas2770->sdout_pd = fwnode_property_read_bool(dev->fwnode, "ti,sdout-pull-down");
 	tas2770->sdout_zfill = fwnode_property_read_bool(dev->fwnode, "ti,sdout-zero-fill");
 
diff --git a/sound/soc/codecs/tas2770.h b/sound/soc/codecs/tas2770.h
index 2c2cd777f4bcba8ca91f79ccdfd9f159df5d3a97..b309d19c58e1daff980025fbced506a1a744559a 100644
--- a/sound/soc/codecs/tas2770.h
+++ b/sound/soc/codecs/tas2770.h
@@ -85,6 +85,11 @@
 #define TAS2770_TDM_CFG_REG6_ISNS_MASK  BIT(6)
 #define TAS2770_TDM_CFG_REG6_ISNS_ENABLE  BIT(6)
 #define TAS2770_TDM_CFG_REG6_50_MASK  GENMASK(5, 0)
+    /* TDM Configuration Reg10 */
+#define TAS2770_TDM_CFG_REG7  TAS2770_REG(0X0, 0x11)
+#define TAS2770_TDM_CFG_REG7_PDM_MASK  BIT(6)
+#define TAS2770_TDM_CFG_REG7_PDM_ENABLE  BIT(6)
+#define TAS2770_TDM_CFG_REG7_50_MASK	GENMASK(5, 0)
     /* Brown Out Prevention Reg0 */
 #define TAS2770_BO_PRV_REG0  TAS2770_REG(0X0, 0x1B)
     /* Interrupt MASK Reg0 */
@@ -150,6 +155,7 @@ struct tas2770_priv {
 	struct device *dev;
 	int v_sense_slot;
 	int i_sense_slot;
+	int pdm_slot;
 	bool sdout_pd;
 	bool sdout_zfill;
 	bool dac_powered;

-- 
2.48.1


  parent reply	other threads:[~2025-02-18  8:39 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-18  8:35 [PATCH v2 00/29] ASoC: tas27{64,70}: improve support for Apple codec variants James Calligeros
2025-02-18  8:35 ` [PATCH v2 01/29] ASoC: tas2764: Fix power control mask James Calligeros
2025-02-18  8:35 ` [PATCH v2 02/29] ASoC: tas2770: Fix volume scale James Calligeros
2025-02-18 15:13   ` Mark Brown
2025-02-18  8:35 ` [PATCH v2 03/29] ASoC: dt-bindings: tas27xx: add compatible for SN012776 James Calligeros
2025-02-21 20:24   ` Rob Herring (Arm)
2025-02-18  8:35 ` [PATCH v2 04/29] ASoC: dt-bindings: tas2770: add compatible for TAS5770L James Calligeros
2025-02-21 20:24   ` Rob Herring (Arm)
2025-02-18  8:35 ` [PATCH v2 05/29] ASoC: tas2764: Extend driver to SN012776 James Calligeros
2025-02-18 15:15   ` Mark Brown
2025-02-18  8:35 ` [PATCH v2 06/29] ASoC: tas2764: Add control concerning overcurrent events James Calligeros
2025-02-18  8:35 ` [PATCH v2 07/29] ASoC: tas2770: Factor out set_ivsense_slots James Calligeros
2025-02-18  8:35 ` [PATCH v2 08/29] ASoC: tas2770: Fix and redo I/V sense TDM slot setting logic James Calligeros
2025-02-18  8:35 ` [PATCH v2 09/29] ASoC: tas2764: Reinit cache on part reset James Calligeros
2025-02-18 15:18   ` Mark Brown
2025-02-18  8:35 ` [PATCH v2 10/29] ASoC: tas2764: Configure zeroing of SDOUT slots James Calligeros
2025-02-18 15:20   ` Mark Brown
2025-02-18  8:35 ` [PATCH v2 11/29] ASoC: tas2764: Apply Apple quirks James Calligeros
2025-02-18  8:35 ` [PATCH v2 12/29] ASoC: tas2764: Raise regmap range maximum James Calligeros
2025-02-18 15:21   ` Mark Brown
2025-02-18  8:35 ` [PATCH v2 13/29] ASoC: tas2770: Export 'die_temp' to sysfs James Calligeros
2025-02-18 15:22   ` Mark Brown
2025-02-18 16:09     ` Alyssa Rosenzweig
2025-02-18 16:09     ` Alyssa Rosenzweig
2025-02-18  8:35 ` [PATCH v2 14/29] ASoC: tas2770: expose die temp to hwmon James Calligeros
2025-02-18 15:20   ` Guenter Roeck
2025-02-21 11:31     ` James Calligeros
2025-02-21 15:03       ` Guenter Roeck
2025-02-22  0:16         ` James Calligeros
2025-02-18 15:24   ` Mark Brown
2025-02-18  8:35 ` [PATCH v2 15/29] ASoC: tas2764: Export 'die_temp' to sysfs James Calligeros
2025-02-18  8:35 ` [PATCH v2 16/29] ASoC: tas2764: expose die temp to hwmon James Calligeros
2025-02-18  8:35 ` [PATCH v2 17/29] ASoC: tas2764: Crop SDOUT zero-out mask based on BCLK ratio James Calligeros
2025-02-18 15:25   ` Mark Brown
2025-02-18 15:55     ` Martin Povišer
2025-02-18  8:35 ` [PATCH v2 18/29] ASoC: tas2764: Enable main IRQs James Calligeros
2025-02-18 15:26   ` Mark Brown
2025-02-18  8:35 ` [PATCH v2 19/29] ASoC: tas2764: Power up/down amp on mute ops James Calligeros
2025-02-18  8:35 ` [PATCH v2 20/29] ASoC: tas2764: Add SDZ regulator James Calligeros
2025-02-18 15:33   ` Mark Brown
2025-02-19  4:47     ` James Calligeros
2025-02-20  1:45       ` Mark Brown
2025-02-18  8:35 ` [PATCH v2 21/29] ASoC: tas2764: Add reg defaults for TAS2764_INT_CLK_CFG James Calligeros
2025-02-18 15:35   ` Mark Brown
2025-02-18  8:35 ` [PATCH v2 22/29] ASoC: tas2764: Mark SW_RESET as volatile James Calligeros
2025-02-18  8:35 ` [PATCH v2 23/29] ASoC: tas2764: Wait for ramp-down after shutdown James Calligeros
2025-02-18  8:35 ` [PATCH v2 24/29] ASoC: tas2770: Add SDZ regulator James Calligeros
2025-02-18 15:36   ` Mark Brown
2025-02-18  8:35 ` [PATCH v2 25/29] ASoC: tas2770: Power cycle amp on ISENSE/VSENSE change James Calligeros
2025-02-18  8:36 ` [PATCH v2 26/29] ASoC: tas2770: Add zero-fill and pull-down controls James Calligeros
2025-02-18 15:37   ` Mark Brown
2025-02-18  8:36 ` James Calligeros [this message]
2025-02-18  8:36 ` [PATCH v2 28/29] ASoC: tas2764: Set the SDOUT polarity correctly James Calligeros
2025-02-18 15:38   ` Mark Brown
2025-02-18  8:36 ` [PATCH v2 29/29] ASoC: tas2770: " James Calligeros
2025-02-18 21:30 ` (subset) [PATCH v2 00/29] ASoC: tas27{64,70}: improve support for Apple codec variants Mark Brown

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=20250218-apple-codec-changes-v2-27-932760fd7e07@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=jdelvare@suse.com \
    --cc=kevin-lu@ti.com \
    --cc=krzk+dt@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-hwmon@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=marcan@marcan.st \
    --cc=neal@gompa.dev \
    --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).