Skip to contentSkip to conversation

ASoC: sdw_utils: cs42l43: allow spk component names to be combined

PATCH In review Maciej Strozek 3 participants 4 messages Apr 17 – Apr 20

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: sdw_utils: cs42l43: allow spk component names to be combined

Move handling of cs42l43-spk component string into SOF mechanism [1] which will allow it to be aggregated with other speakers. Likewise handle the cs35l56-bridge special case which should not be combined to keep compatibility with UCM.

---
 sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c |  6 ------
 sound/soc/sdw_utils/soc_sdw_cs42l43.c        | 10 ----------
 sound/soc/sdw_utils/soc_sdw_utils.c          | 20 ++++++++++++++++----
 3 files changed, 16 insertions(+), 20 deletions(-)
sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c +0 -6
index 2a7109d53cbe3..e0e32a279787c 100644
@@ -40,12 +40,6 @@ static int asoc_sdw_bridge_cs35l56_asp_init(struct snd_soc_pcm_runtime *rtd)
 	struct snd_soc_dai *codec_dai;
 	struct snd_soc_dai *cpu_dai;
 
-	card->components = devm_kasprintf(card->dev, GFP_KERNEL,
-					  "%s spk:cs35l56-bridge",
-					  card->components);
-	if (!card->components)
-		return -ENOMEM;
-
 	ret = snd_soc_dapm_new_controls(dapm, bridge_widgets,
 					ARRAY_SIZE(bridge_widgets));
 	if (ret) {
sound/soc/sdw_utils/soc_sdw_cs42l43.c +0 -10
index 4a451b9d4f137..66aa9958ad184 100644
@@ -110,18 +110,8 @@ int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_so
 	struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;
 	struct snd_soc_card *card = rtd->card;
 	struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
-	struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
 	int ret;
 
-	if (!(ctx->mc_quirk & SOC_SDW_SIDECAR_AMPS)) {
-		/* Will be set by the bridge code in this case */
-		card->components = devm_kasprintf(card->dev, GFP_KERNEL,
-						  "%s spk:cs42l43-spk",
-						  card->components);
-		if (!card->components)
-			return -ENOMEM;
-	}
-
 	ret = snd_soc_limit_volume(card, "cs42l43 Speaker Digital Volume",
 				   CS42L43_SPK_VOLUME_0DB);
 	if (ret)
sound/soc/sdw_utils/soc_sdw_utils.c +16 -4
index 2807f536eef0c..1637cc3f3d598 100644
@@ -758,6 +758,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
 			{
 				.direction = {true, false},
 				.codec_name = "cs42l43-codec",
+				.component_name = "cs42l43-spk",
 				.dai_name = "cs42l43-dp6",
 				.dai_type = SOC_SDW_DAI_TYPE_AMP,
 				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
@@ -1104,6 +1105,7 @@ static int asoc_sdw_find_codec_info_dai_index(const struct asoc_sdw_codec_info *
 int asoc_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
 {
 	struct snd_soc_card *card = rtd->card;
+	struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
 	struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
 	struct asoc_sdw_codec_info *codec_info;
 	struct snd_soc_dai *dai;
@@ -1179,16 +1181,26 @@ int asoc_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
 		/* Generate the spk component string for card->components string */
 		if (codec_info->dais[dai_index].dai_type == SOC_SDW_DAI_TYPE_AMP &&
 		    codec_info->dais[dai_index].component_name) {
+			const char *component;
+
+			/*
+			 * For the special case of cs42l43 with sidecar amps, use only
+			 * "cs35l56-bridge" as the component name in card->components
+			 */
+			if (ctx->mc_quirk & SOC_SDW_SIDECAR_AMPS &&
+			    !strcmp(codec_info->dais[dai_index].component_name, "cs42l43-spk"))
+				component = "cs35l56-bridge";
+			else
+				component = codec_info->dais[dai_index].component_name;
+
 			if (strlen (spk_components) == 0)
 				spk_components =
-					devm_kasprintf(card->dev, GFP_KERNEL, "%s",
-						       codec_info->dais[dai_index].component_name);
+					devm_kasprintf(card->dev, GFP_KERNEL, "%s", component);
 			else
 				/* Append component name to spk_components */
 				spk_components =
 					devm_kasprintf(card->dev, GFP_KERNEL,
-						       "%s+%s", spk_components,
-						       codec_info->dais[dai_index].component_name);
+						       "%s+%s", spk_components, component);
 		}
 
 		codec_info->dais[dai_index].rtd_init_done = true;
Signature · 1 line
2.47.3
Reviewed-by Bard Liao on v1 1/1
#1 lore raw
Quoted 13 lines

-----Original Message-----
From: Maciej Strozek <[email protected]>
Sent: Friday, April 17, 2026 10:45 PM
To: Mark Brown <[email protected]>; Jaroslav Kysela <[email protected]>
Cc: Takashi Iwai <[email protected]>; Bard Liao <yung- [email protected]>; [email protected]; linux- [email protected]; [email protected]; Maciej Strozek <[email protected]>
Subject: [PATCH] ASoC: sdw_utils: cs42l43: allow spk component names to be combined

Quoted 8 lines

Move handling of cs42l43-spk component string into SOF mechanism [1] which will allow it to be aggregated with other speakers. Likewise handle the cs35l56-bridge special case which should not be combined to keep compatibility with UCM.

Quoted 125 lines
---
 sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c |  6 ------
 sound/soc/sdw_utils/soc_sdw_cs42l43.c        | 10 ----------
 sound/soc/sdw_utils/soc_sdw_utils.c          | 20 ++++++++++++++++----
 3 files changed, 16 insertions(+), 20 deletions(-)
sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c +0 -6
index 2a7109d53cbe3..e0e32a279787c 100644
@@ -40,12 +40,6 @@ static int asoc_sdw_bridge_cs35l56_asp_init(struct
 snd_soc_pcm_runtime *rtd)
 	struct snd_soc_dai *codec_dai;
 	struct snd_soc_dai *cpu_dai;
 
-	card->components = devm_kasprintf(card->dev, GFP_KERNEL,
-					  "%s spk:cs35l56-bridge",
-					  card->components);
-	if (!card->components)
-		return -ENOMEM;
-
 	ret = snd_soc_dapm_new_controls(dapm, bridge_widgets,
 					ARRAY_SIZE(bridge_widgets));
sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c +0 -0
 	if (ret) {
sound/soc/sdw_utils/soc_sdw_cs42l43.c +0 -0
index 4a451b9d4f137..66aa9958ad184 100644
@@ -110,18 +110,8 @@ int asoc_sdw_cs42l43_spk_rtd_init(struct

snd_soc_pcm_runtime *rtd, struct snd_so
struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd,
0)->component;

sound/soc/sdw_utils/soc_sdw_cs42l43.c +0 -0
 	struct snd_soc_card *card = rtd->card;
 	struct snd_soc_dapm_context *dapm =

snd_soc_card_to_dapm(card);

sound/soc/sdw_utils/soc_sdw_cs42l43.c +0 -10
-	struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
 	int ret;
 
-	if (!(ctx->mc_quirk & SOC_SDW_SIDECAR_AMPS)) {
-		/* Will be set by the bridge code in this case */
-		card->components = devm_kasprintf(card->dev, GFP_KERNEL,
-						  "%s spk:cs42l43-spk",
-						  card->components);
-		if (!card->components)
-			return -ENOMEM;
-	}
-
 	ret = snd_soc_limit_volume(card, "cs42l43 Speaker Digital Volume",
 				   CS42L43_SPK_VOLUME_0DB);
 	if (ret)
sound/soc/sdw_utils/soc_sdw_utils.c +1 -0
index 2807f536eef0c..1637cc3f3d598 100644
@@ -758,6 +758,7 @@ struct asoc_sdw_codec_info codec_info_list[] = {
 			{
 				.direction = {true, false},
 				.codec_name = "cs42l43-codec",
+				.component_name = "cs42l43-spk",
 				.dai_name = "cs42l43-dp6",
 				.dai_type = SOC_SDW_DAI_TYPE_AMP,
 				.dailink = {SOC_SDW_AMP_OUT_DAI_ID,

SOC_SDW_UNUSED_DAI_ID},

sound/soc/sdw_utils/soc_sdw_utils.c +0 -0
@@ -1104,6 +1105,7 @@ static int

asoc_sdw_find_codec_info_dai_index(const struct asoc_sdw_codec_info *
int asoc_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
{

sound/soc/sdw_utils/soc_sdw_utils.c +1 -0
 	struct snd_soc_card *card = rtd->card;
+	struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
 	struct snd_soc_dapm_context *dapm =

snd_soc_card_to_dapm(card);

sound/soc/sdw_utils/soc_sdw_utils.c +0 -0
 	struct asoc_sdw_codec_info *codec_info;
 	struct snd_soc_dai *dai;
@@ -1179,16 +1181,26 @@ int asoc_sdw_rtd_init(struct
 snd_soc_pcm_runtime *rtd)
 		/* Generate the spk component string for card->components

string */
if (codec_info->dais[dai_index].dai_type ==
SOC_SDW_DAI_TYPE_AMP &&

sound/soc/sdw_utils/soc_sdw_utils.c +4 -0
 		    codec_info->dais[dai_index].component_name) {
+			const char *component;
+
+			/*
+			 * For the special case of cs42l43 with sidecar amps,

use only

sound/soc/sdw_utils/soc_sdw_utils.c +1 -0
+			 * "cs35l56-bridge" as the component name in card-
Quoted 1 line

components

sound/soc/sdw_utils/soc_sdw_utils.c +3 -0
+			 */
+			if (ctx->mc_quirk & SOC_SDW_SIDECAR_AMPS &&
+			    !strcmp(codec_info-
Quoted 1 line

dais[dai_index].component_name, "cs42l43-spk"))

sound/soc/sdw_utils/soc_sdw_utils.c +3 -0
+				component = "cs35l56-bridge";
+			else
+				component = codec_info-
Quoted 1 line

dais[dai_index].component_name;

sound/soc/sdw_utils/soc_sdw_utils.c +1 -1
+
 			if (strlen (spk_components) == 0)
 				spk_components =
-					devm_kasprintf(card->dev,

GFP_KERNEL, "%s",

sound/soc/sdw_utils/soc_sdw_utils.c +0 -1
-						       codec_info-
Quoted 1 line

dais[dai_index].component_name);

sound/soc/sdw_utils/soc_sdw_utils.c +1 -0
+					devm_kasprintf(card->dev,

GFP_KERNEL, "%s", component);

sound/soc/sdw_utils/soc_sdw_utils.c +0 -0
 			else
 				/* Append component name to

spk_components */

sound/soc/sdw_utils/soc_sdw_utils.c +0 -0
 				spk_components =
 					devm_kasprintf(card->dev,

GFP_KERNEL,

sound/soc/sdw_utils/soc_sdw_utils.c +0 -1
-						       "%s+%s",

spk_components,

sound/soc/sdw_utils/soc_sdw_utils.c +0 -1
-						       codec_info-
Quoted 1 line

dais[dai_index].component_name);

sound/soc/sdw_utils/soc_sdw_utils.c +1 -0
+						       "%s+%s",

spk_components, component);

sound/soc/sdw_utils/soc_sdw_utils.c +0 -1
 		}
 
 		codec_info->dais[dai_index].rtd_init_done = true;
--

2.47.3

#2 lore raw
In reply to Maciej Strozek

Hi Maciej,

Tested on hardware, 4x CS35L57 on Links 1&2, cs42l43 on Link 3. Card fails to probe with -524.

In spk_rtd_init(), snd_soc_rtd_to_codec(rtd, 0)->component gets cs35l56 (enumerates first), not cs42l43. cs35l56 has no component-level set_sysclk, so it returns -ENOTSUPP.

Fix: use dai->component instead of snd_soc_rtd_to_codec(rtd, 0)->component.

Thanks,
Aaron

#3 lore raw

W dniu pon, 20.04.2026 o godzinie 15∶47 +0800, użytkownik Aaron Ma

Quoted 10 lines · napisał:

Hi Maciej,

Tested on hardware, 4x CS35L57 on Links 1&2, cs42l43 on Link 3. Card fails to probe with -524.

In spk_rtd_init(), snd_soc_rtd_to_codec(rtd, 0)->component gets cs35l56 (enumerates first), not cs42l43. cs35l56 has no component- level
set_sysclk, so it returns -ENOTSUPP.

Quoted 5 lines

Fix: use dai->component instead of snd_soc_rtd_to_codec(rtd, 0)-

Quoted 1 line

component.

Thanks,
Aaron

Thank you! Going to fix it in v2

Signature · 2 lines
Regards,
Maciej