* [PATCH v2 0/2] Update cs42l43b load detection procedure
@ 2026-11-12 14:16 Charles Keepax
2026-11-12 14:16 ` [PATCH v2 1/2] mfd: cs42l43: Add load detection register needed for cs42l43b Charles Keepax
2026-11-12 14:16 ` [PATCH v2 2/2] ASoC: cs42l43: Update load detect procedure for cs42l43b Charles Keepax
0 siblings, 2 replies; 7+ messages in thread
From: Charles Keepax @ 2026-11-12 14:16 UTC (permalink / raw)
To: broonie, lee; +Cc: lgirdwood, linux-sound, linux-kernel, mfd, patches
Some updates are required to ensure proper accuracy on the cs42l43b
headphone load detection. Add the required extra register to the regmap
in the MFD and then update the procedure in ASoC.
Changes since v1:
- Make LOAD_DET_SEL readable
Charles Keepax (2):
mfd: cs42l43: Add load detection register needed for cs42l43b
ASoC: cs42l43: Update load detect procedure for cs42l43b
drivers/mfd/cs42l43.c | 2 +
include/linux/mfd/cs42l43-regs.h | 2 +
sound/soc/codecs/cs42l43-jack.c | 101 ++++++++++++++++++++-----------
3 files changed, 71 insertions(+), 34 deletions(-)
--
2.47.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] mfd: cs42l43: Add load detection register needed for cs42l43b
2026-11-12 14:16 [PATCH v2 0/2] Update cs42l43b load detection procedure Charles Keepax
@ 2026-11-12 14:16 ` Charles Keepax
2026-11-19 16:45 ` (subset) " Lee Jones
2026-11-12 14:16 ` [PATCH v2 2/2] ASoC: cs42l43: Update load detect procedure for cs42l43b Charles Keepax
1 sibling, 1 reply; 7+ messages in thread
From: Charles Keepax @ 2026-11-12 14:16 UTC (permalink / raw)
To: broonie, lee; +Cc: lgirdwood, linux-sound, linux-kernel, mfd, patches
The headphone load detection procedure on cs42l43b is slightly different
and require a register that wasn't used on previous versions of the
chip. Add that register into the driver.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
Changes since v1:
- Make LOAD_DET_SEL readable
drivers/mfd/cs42l43.c | 2 ++
include/linux/mfd/cs42l43-regs.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/drivers/mfd/cs42l43.c b/drivers/mfd/cs42l43.c
index a83b62064dae6..76f2eba28aaf1 100644
--- a/drivers/mfd/cs42l43.c
+++ b/drivers/mfd/cs42l43.c
@@ -402,6 +402,7 @@ bool cs42l43_readable_register(struct device *dev, unsigned int reg)
case CS42L43_BLOCK_EN:
case CS42L43_SHUTTER_CONTROL:
case CS42L43B_MCU_SW_REV ... CS42L43B_MCU_RAM_MAX:
+ case CS42L43B_LOAD_DET_SEL:
return true; // registers present on all variants
case CS42L43_MCU_SW_REV ... CS42L43B_MCU_SW_REV - 1:
case CS42L43B_MCU_RAM_MAX + 1 ... CS42L43_MCU_RAM_MAX:
@@ -425,6 +426,7 @@ bool cs42l43_precious_register(struct device *dev, unsigned int reg)
case CS42L43_RX_DATA:
case CS42L43_DECIM_INT ... CS42L43_HPOUT_INT:
case CS42L43_MCU_SW_REV ... CS42L43_MCU_RAM_MAX:
+ case CS42L43B_LOAD_DET_SEL:
return true;
default:
return false;
diff --git a/include/linux/mfd/cs42l43-regs.h b/include/linux/mfd/cs42l43-regs.h
index 4c00ceae8b461..924438655c630 100644
--- a/include/linux/mfd/cs42l43-regs.h
+++ b/include/linux/mfd/cs42l43-regs.h
@@ -1204,6 +1204,8 @@
#define CS42L43B_ISRC2DEC3_INPUT1 0x0000C7A0
#define CS42L43B_ISRC2DEC4_INPUT1 0x0000C7B0
+#define CS42L43B_LOAD_DET_SEL 0x000170E8
+
#define CS42L43B_FW_MISSION_CTRL_NEED_CONFIGS 0x00117E00
#define CS42L43B_FW_MISSION_CTRL_HAVE_CONFIGS 0x00117E04
#define CS42L43B_FW_MISSION_CTRL_PATCH_START_ADDR_REG 0x00117E08
--
2.47.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] ASoC: cs42l43: Update load detect procedure for cs42l43b
2026-11-12 14:16 [PATCH v2 0/2] Update cs42l43b load detection procedure Charles Keepax
2026-11-12 14:16 ` [PATCH v2 1/2] mfd: cs42l43: Add load detection register needed for cs42l43b Charles Keepax
@ 2026-11-12 14:16 ` Charles Keepax
1 sibling, 0 replies; 7+ messages in thread
From: Charles Keepax @ 2026-11-12 14:16 UTC (permalink / raw)
To: broonie, lee; +Cc: lgirdwood, linux-sound, linux-kernel, mfd, patches
The newer variants requires a slightly different process for the load
detection. It is no longer necessary to apply different tuning for 3 vs
4-pole headsets, but a new field does require updated for CTIA vs OMTP
headsets. Update the driver to follow the correct process for this
new version of the chip.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
No changes since v1.
sound/soc/codecs/cs42l43-jack.c | 101 +++++++++++++++++++++-----------
1 file changed, 67 insertions(+), 34 deletions(-)
diff --git a/sound/soc/codecs/cs42l43-jack.c b/sound/soc/codecs/cs42l43-jack.c
index a2555dd9229e3..b3f89c712ed93 100644
--- a/sound/soc/codecs/cs42l43-jack.c
+++ b/sound/soc/codecs/cs42l43-jack.c
@@ -324,6 +324,11 @@ irqreturn_t cs42l43_bias_detect_clamp(int irq, void *data)
#define CS42L43_JACK_BUTTONS (SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2 | \
SND_JACK_BTN_3 | SND_JACK_BTN_4 | SND_JACK_BTN_5)
+#define CS42L43_TYPE_CTIA 0x0
+#define CS42L43_TYPE_OMTP 0x1
+#define CS42L43_TYPE_3POLE 0x2
+#define CS42L43_TYPE_OPEN 0x3
+
static inline bool cs42l43_jack_present(struct cs42l43_codec *priv)
{
struct cs42l43 *cs42l43 = priv->core;
@@ -502,9 +507,11 @@ static const struct reg_sequence cs42l43_4pole_patch[] = {
{ 0x4000, 0x00000000 },
};
-static void cs42l43_start_load_detect(struct cs42l43_codec *priv, bool mic)
+static void cs42l43_start_load_detect(struct cs42l43_codec *priv, int type)
{
struct cs42l43 *cs42l43 = priv->core;
+ const struct reg_sequence *patch;
+ int size;
dev_dbg(priv->dev, "Start load detect\n");
@@ -526,14 +533,36 @@ static void cs42l43_start_load_detect(struct cs42l43_codec *priv, bool mic)
dev_err(priv->dev, "Load detect HP power down timed out\n");
}
- if (mic)
- regmap_multi_reg_write_bypassed(cs42l43->regmap,
- cs42l43_4pole_patch,
- ARRAY_SIZE(cs42l43_4pole_patch));
- else
- regmap_multi_reg_write_bypassed(cs42l43->regmap,
- cs42l43_3pole_patch,
- ARRAY_SIZE(cs42l43_3pole_patch));
+ switch (cs42l43->variant_id) {
+ case CS42L43_DEVID_VAL:
+ switch (type) {
+ case CS42L43_TYPE_3POLE:
+ case CS42L43_TYPE_OPEN:
+ patch = cs42l43_3pole_patch;
+ size = ARRAY_SIZE(cs42l43_3pole_patch);
+ break;
+ default:
+ patch = cs42l43_4pole_patch;
+ size = ARRAY_SIZE(cs42l43_4pole_patch);
+ break;
+ }
+ break;
+ default:
+ patch = cs42l43_4pole_patch;
+ size = ARRAY_SIZE(cs42l43_4pole_patch);
+
+ switch (type) {
+ case CS42L43_TYPE_OMTP:
+ regmap_write(cs42l43->regmap, CS42L43B_LOAD_DET_SEL, 0x89);
+ break;
+ default:
+ regmap_write(cs42l43->regmap, CS42L43B_LOAD_DET_SEL, 0x98);
+ break;
+ }
+ break;
+ }
+
+ regmap_multi_reg_write_bypassed(cs42l43->regmap, patch, size);
regmap_update_bits(cs42l43->regmap, CS42L43_BLOCK_EN3,
CS42L43_ADC1_EN_MASK | CS42L43_ADC2_EN_MASK, 0);
@@ -586,6 +615,14 @@ static void cs42l43_stop_load_detect(struct cs42l43_codec *priv)
CS42L43_ADC1_EN_MASK | CS42L43_ADC2_EN_MASK,
priv->adc_ena);
+ switch (cs42l43->variant_id) {
+ case CS42L43_DEVID_VAL:
+ break;
+ default:
+ regmap_write(cs42l43->regmap, CS42L43B_LOAD_DET_SEL, 0x0);
+ break;
+ }
+
if (priv->hp_ena && !priv->hp_ilimited) {
unsigned long time_left;
@@ -605,7 +642,7 @@ static void cs42l43_stop_load_detect(struct cs42l43_codec *priv)
snd_soc_dapm_mutex_unlock(snd_soc_component_to_dapm(priv->component));
}
-static int cs42l43_run_load_detect(struct cs42l43_codec *priv, bool mic)
+static int cs42l43_run_load_detect(struct cs42l43_codec *priv, int type)
{
struct cs42l43 *cs42l43 = priv->core;
unsigned int val = 0;
@@ -613,7 +650,7 @@ static int cs42l43_run_load_detect(struct cs42l43_codec *priv, bool mic)
reinit_completion(&priv->load_detect);
- cs42l43_start_load_detect(priv, mic);
+ cs42l43_start_load_detect(priv, type);
time_left = wait_for_completion_timeout(&priv->load_detect,
msecs_to_jiffies(CS42L43_LOAD_TIMEOUT_MS));
cs42l43_stop_load_detect(priv);
@@ -629,23 +666,25 @@ static int cs42l43_run_load_detect(struct cs42l43_codec *priv, bool mic)
if (!cs42l43_jack_present(priv))
return -ENODEV;
- if (mic) {
+ switch (type) {
+ case CS42L43_TYPE_3POLE:
+ case CS42L43_TYPE_OPEN:
+ switch (val & CS42L43_AMP3_RES_DET_MASK) {
+ case 0x0: // < 22 Ohm impedance
+ case 0x1: // < 150 Ohm impedance
+ case 0x2: // < 1000 Ohm impedance
+ return CS42L43_JACK_HEADPHONE;
+ case 0x3: // > 1000 Ohm impedance
+ return CS42L43_JACK_LINEOUT;
+ default:
+ return -EINVAL;
+ }
+ default:
cs42l43_start_hs_bias(priv, false);
cs42l43_start_button_detect(priv);
return CS42L43_JACK_HEADSET;
}
-
- switch (val & CS42L43_AMP3_RES_DET_MASK) {
- case 0x0: // < 22 Ohm impedance
- case 0x1: // < 150 Ohm impedance
- case 0x2: // < 1000 Ohm impedance
- return CS42L43_JACK_HEADPHONE;
- case 0x3: // > 1000 Ohm impedance
- return CS42L43_JACK_LINEOUT;
- default:
- return -EINVAL;
- }
}
static int cs42l43_run_type_detect(struct cs42l43_codec *priv)
@@ -686,18 +725,12 @@ static int cs42l43_run_type_detect(struct cs42l43_codec *priv)
if (!cs42l43_jack_present(priv))
return -ENODEV;
- switch (type & CS42L43_HSDET_TYPE_STS_MASK) {
- case 0x0: // CTIA
- case 0x1: // OMTP
- case 0x4:
- return cs42l43_run_load_detect(priv, true);
- case 0x2: // 3-pole
- return cs42l43_run_load_detect(priv, false);
- case 0x3: // Open-circuit
+ type &= CS42L43_HSDET_TYPE_STS_MASK;
+
+ if (type == CS42L43_TYPE_OPEN)
return CS42L43_JACK_EXTENSION;
- default:
- return -EINVAL;
- }
+ else
+ return cs42l43_run_load_detect(priv, type);
}
void cs42l43_clear_jack(struct cs42l43_codec *priv)
--
2.47.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: (subset) [PATCH v2 1/2] mfd: cs42l43: Add load detection register needed for cs42l43b
2026-11-12 14:16 ` [PATCH v2 1/2] mfd: cs42l43: Add load detection register needed for cs42l43b Charles Keepax
@ 2026-11-19 16:45 ` Lee Jones
2026-11-19 16:48 ` Mark Brown
0 siblings, 1 reply; 7+ messages in thread
From: Lee Jones @ 2026-11-19 16:45 UTC (permalink / raw)
To: broonie, lee, Charles Keepax
Cc: lgirdwood, linux-sound, linux-kernel, mfd, patches
On Thu, 12 Nov 2026 14:16:49 +0000, Charles Keepax wrote:
> The headphone load detection procedure on cs42l43b is slightly different
> and require a register that wasn't used on previous versions of the
> chip. Add that register into the driver.
Applied, thanks!
[1/2] mfd: cs42l43: Add load detection register needed for cs42l43b
commit: cc29c6e45db7b4306efc7a76e7a64d549229d4ac
--
Lee Jones [李琼斯]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: (subset) [PATCH v2 1/2] mfd: cs42l43: Add load detection register needed for cs42l43b
2026-11-19 16:45 ` (subset) " Lee Jones
@ 2026-11-19 16:48 ` Mark Brown
2026-11-19 18:32 ` Lee Jones
0 siblings, 1 reply; 7+ messages in thread
From: Mark Brown @ 2026-11-19 16:48 UTC (permalink / raw)
To: Lee Jones
Cc: Charles Keepax, lgirdwood, linux-sound, linux-kernel, mfd, patches
[-- Attachment #1: Type: text/plain, Size: 570 bytes --]
On Thu, Nov 19, 2026 at 04:45:44PM +0000, Lee Jones wrote:
> On Thu, 12 Nov 2026 14:16:49 +0000, Charles Keepax wrote:
> > The headphone load detection procedure on cs42l43b is slightly different
> > and require a register that wasn't used on previous versions of the
> > chip. Add that register into the driver.
>
> Applied, thanks!
>
> [1/2] mfd: cs42l43: Add load detection register needed for cs42l43b
> commit: cc29c6e45db7b4306efc7a76e7a64d549229d4ac
Can I get a tag for this please, I need the register definitions it adds
to build patch 2?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: (subset) [PATCH v2 1/2] mfd: cs42l43: Add load detection register needed for cs42l43b
2026-11-19 16:48 ` Mark Brown
@ 2026-11-19 18:32 ` Lee Jones
2026-11-19 21:15 ` [GIT PULL] Immutable branch between MFD and Regulator due for the v7.5 merge window Lee Jones
0 siblings, 1 reply; 7+ messages in thread
From: Lee Jones @ 2026-11-19 18:32 UTC (permalink / raw)
To: Mark Brown
Cc: Charles Keepax, lgirdwood, linux-sound, linux-kernel, mfd, patches
On Thu, 19 Nov 2026, Mark Brown wrote:
> On Thu, Nov 19, 2026 at 04:45:44PM +0000, Lee Jones wrote:
> > On Thu, 12 Nov 2026 14:16:49 +0000, Charles Keepax wrote:
> > > The headphone load detection procedure on cs42l43b is slightly different
> > > and require a register that wasn't used on previous versions of the
> > > chip. Add that register into the driver.
> >
> > Applied, thanks!
> >
> > [1/2] mfd: cs42l43: Add load detection register needed for cs42l43b
> > commit: cc29c6e45db7b4306efc7a76e7a64d549229d4ac
>
> Can I get a tag for this please, I need the register definitions it adds
> to build patch 2?
Sure. Building now.
Note to self: ib-mfd-asoc-7.5
--
Lee Jones
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL] Immutable branch between MFD and Regulator due for the v7.5 merge window
2026-11-19 18:32 ` Lee Jones
@ 2026-11-19 21:15 ` Lee Jones
0 siblings, 0 replies; 7+ messages in thread
From: Lee Jones @ 2026-11-19 21:15 UTC (permalink / raw)
To: Mark Brown
Cc: Charles Keepax, lgirdwood, linux-sound, linux-kernel, mfd, patches
Enjoy!
The following changes since commit 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4:
Linux 7.4-rc1 (2026-11-01 13:26:31 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-asoc-v7.5
for you to fetch changes up to e367b5f639b494c29d5f504a9bbd9fcbac9c7885:
mfd: cs42l43: Add load detection register needed for cs42l43b (2026-11-19 18:31:25 +0000)
----------------------------------------------------------------
Immutable branch between MFD and Regulator due for the v7.5 merge window
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEdrbJNaO+IJqU8IdIUa+KL4f8d2EFAmr/Zr4ACgkQUa+KL4f8
d2EOBg//ePkQ+E5r2KvyfmZfAIuX8o4XhsEmF/ZIa0VAq4ozm3iC2m1gdE2qTRFZ
xFmmwcxVUM5nLd4Bf1wetxEuKLNo3E3Z+PYUTLJIBjCOhNxKVCQxhKphRkBDhfbo
J6yjs3887bTr8UNptB2ypv+RqTeHjtAjibymHbR/W0AEWdf1u0DQPKl6aOLIBVqO
76z5FJJQOzIVfAnVfSR9MnrJaQOLbbPdDMsnk9TITya2K0orH+r8U5A8RmPO20lB
rYQQ5s7UBmlM3c/gUJxKl8q1chFcPxeVw4C1yGt1sCLrS9vpXtwhBSLyKrKgs7QZ
nHEmOi9lAMvlg8U2PQmUV8wVi/qmjV4aVWcCTlpywUqLOjTe8laMyKtY2o4MhEqV
b9nXe4PBnhfcYkiReZgC080zYJiITa/CIVWDUez6iYP0WmcFVg7fbtgdZK8E/cXm
uZm4gXDSyOGHuHd5g/o0zAmC0NmCCPzIg4cewJEDS3yt3zSndtZ3Red8GvWcMw6m
7ng1yiIzG6px+JYhzNhxBgcFxJkPRXubgL38gzbYN7fgDMqXFYhbi+VxAEplkPGH
nD8AEQBrWhTnynhw9qREbl2dWZ/GuylQvexa/w0MH46BLJrxG5vPcnUmYsjeD0pj
ZEk0l6Tam7109K4hk5s03E8yCngHX47P6dcANpBe+2KyVjA8auo=
=dJhZ
-----END PGP SIGNATURE-----
----------------------------------------------------------------
Charles Keepax (1):
mfd: cs42l43: Add load detection register needed for cs42l43b
drivers/mfd/cs42l43.c | 2 ++
include/linux/mfd/cs42l43-regs.h | 2 ++
2 files changed, 4 insertions(+)
--
Lee Jones
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2026-11-19 21:15 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-12 14:16 [PATCH v2 0/2] Update cs42l43b load detection procedure Charles Keepax
2026-11-12 14:16 ` [PATCH v2 1/2] mfd: cs42l43: Add load detection register needed for cs42l43b Charles Keepax
2026-11-19 16:45 ` (subset) " Lee Jones
2026-11-19 16:48 ` Mark Brown
2026-11-19 18:32 ` Lee Jones
2026-11-19 21:15 ` [GIT PULL] Immutable branch between MFD and Regulator due for the v7.5 merge window Lee Jones
2026-11-12 14:16 ` [PATCH v2 2/2] ASoC: cs42l43: Update load detect procedure for cs42l43b Charles Keepax
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®