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>
Subject: [PATCH v2 26/29] ASoC: tas2770: Add zero-fill and pull-down controls
Date: Tue, 18 Feb 2025 18:36:00 +1000 [thread overview]
Message-ID: <20250218-apple-codec-changes-v2-26-932760fd7e07@gmail.com> (raw)
In-Reply-To: <20250218-apple-codec-changes-v2-0-932760fd7e07@gmail.com>
From: Hector Martin <marcan@marcan.st>
Expose the bits that control the behavior of the SDOUT pin when not
actively transmitting slot data. Zero-fill is useful when there is a
single amp on the SDOUT bus (e.g. Apple machines with mono speakers or a
single stereo pair, where L/R are on separate buses).
Pull-down is useful, though not perfect, when multiple amps share a
bus. It typically takes around 2 bits for the line to transition from
high to low after going Hi-Z, with the pull-down.
Reviewed-by: Neal Gompa <neal@gompa.dev>
Signed-off-by: Hector Martin <marcan@marcan.st>
---
sound/soc/codecs/tas2770.c | 17 +++++++++++++++++
sound/soc/codecs/tas2770.h | 13 +++++++++++++
2 files changed, 30 insertions(+)
diff --git a/sound/soc/codecs/tas2770.c b/sound/soc/codecs/tas2770.c
index cf038f55453737b2173b986d90fd57d4cc14acfb..8adb558f9e89988e0decc344502da8226f8ff517 100644
--- a/sound/soc/codecs/tas2770.c
+++ b/sound/soc/codecs/tas2770.c
@@ -658,6 +658,20 @@ static int tas2770_codec_probe(struct snd_soc_component *component)
return ret;
}
+ ret = snd_soc_component_update_bits(component, TAS2770_TDM_CFG_REG4,
+ TAS2770_TDM_CFG_REG4_TX_FILL,
+ tas2770->sdout_zfill ? 0 :
+ TAS2770_TDM_CFG_REG4_TX_FILL);
+ if (ret < 0)
+ return ret;
+
+ ret = snd_soc_component_update_bits(component, TAS2770_DIN_PD,
+ TAS2770_DIN_PD_SDOUT,
+ tas2770->sdout_pd ?
+ TAS2770_DIN_PD_SDOUT : 0);
+ if (ret < 0)
+ return ret;
+
ret = sysfs_create_groups(&component->dev->kobj, tas2770_sysfs_groups);
if (ret < 0)
@@ -811,6 +825,9 @@ static int tas2770_parse_dt(struct device *dev, struct tas2770_priv *tas2770)
tas2770->v_sense_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");
+
tas2770->sdz_reg = devm_regulator_get(dev, "SDZ");
if (IS_ERR(tas2770->sdz_reg))
return dev_err_probe(dev, PTR_ERR(tas2770->sdz_reg),
diff --git a/sound/soc/codecs/tas2770.h b/sound/soc/codecs/tas2770.h
index f75baf23caf3a194a040474a7484a3d44f673435..2c2cd777f4bcba8ca91f79ccdfd9f159df5d3a97 100644
--- a/sound/soc/codecs/tas2770.h
+++ b/sound/soc/codecs/tas2770.h
@@ -67,6 +67,14 @@
#define TAS2770_TDM_CFG_REG3_RXS_SHIFT 0x4
#define TAS2770_TDM_CFG_REG3_30_MASK GENMASK(3, 0)
#define TAS2770_TDM_CFG_REG3_30_SHIFT 0
+ /* TDM Configuration Reg4 */
+#define TAS2770_TDM_CFG_REG4 TAS2770_REG(0X0, 0x0E)
+#define TAS2770_TDM_CFG_REG4_TX_LSB_CFG BIT(7)
+#define TAS2770_TDM_CFG_REG4_TX_KEEPER_CFG BIT(6)
+#define TAS2770_TDM_CFG_REG4_TX_KEEPER BIT(5)
+#define TAS2770_TDM_CFG_REG4_TX_FILL BIT(4)
+#define TAS2770_TDM_CFG_REG4_TX_OFFSET_MASK GENMASK(3, 1)
+#define TAS2770_TDM_CFG_REG4_TX_EDGE_FALLING BIT(0)
/* TDM Configuration Reg5 */
#define TAS2770_TDM_CFG_REG5 TAS2770_REG(0X0, 0x0F)
#define TAS2770_TDM_CFG_REG5_VSNS_MASK BIT(6)
@@ -110,6 +118,9 @@
#define TAS2770_TEMP_LSB TAS2770_REG(0X0, 0x2A)
/* Interrupt Configuration */
#define TAS2770_INT_CFG TAS2770_REG(0X0, 0x30)
+ /* Data In Pull-Down */
+#define TAS2770_DIN_PD TAS2770_REG(0X0, 0x31)
+#define TAS2770_DIN_PD_SDOUT BIT(7)
/* Misc IRQ */
#define TAS2770_MISC_IRQ TAS2770_REG(0X0, 0x32)
/* Clock Configuration */
@@ -139,6 +150,8 @@ struct tas2770_priv {
struct device *dev;
int v_sense_slot;
int i_sense_slot;
+ bool sdout_pd;
+ bool sdout_zfill;
bool dac_powered;
bool unmuted;
};
--
2.48.1
next prev 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 ` James Calligeros [this message]
2025-02-18 15:37 ` [PATCH v2 26/29] ASoC: tas2770: Add zero-fill and pull-down controls Mark Brown
2025-02-18 8:36 ` [PATCH v2 27/29] ASoC: tas2770: Support setting the PDM TX slot James Calligeros
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-26-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 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.