[PATCH] ASoC: sdw_utils: cs42l43: allow spk component names to be combined

[PATCH] ASoC: sdw_utils: cs42l43: allow spk component names to be combined

[Maciej Strozek]

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.

Link: https://github.com/thesofproject/linux/pull/5445 [1]
Link: https://github.com/alsa-project/alsa-ucm-conf/pull/747
Signed-off-by: Maciej Strozek <mstrozek@opensource.cirrus.com>
---
 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(-)

diff --git a/sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c b/sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c
index 2a7109d53cbe3..e0e32a279787c 100644
--- a/sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c
+++ b/sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c
@@ -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) {
diff --git a/sound/soc/sdw_utils/soc_sdw_cs42l43.c b/sound/soc/sdw_utils/soc_sdw_cs42l43.c
index 4a451b9d4f137..66aa9958ad184 100644
--- a/sound/soc/sdw_utils/soc_sdw_cs42l43.c
+++ b/sound/soc/sdw_utils/soc_sdw_cs42l43.c
@@ -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)
diff --git a/sound/soc/sdw_utils/soc_sdw_utils.c b/sound/soc/sdw_utils/soc_sdw_utils.c
index 2807f536eef0c..1637cc3f3d598 100644
--- a/sound/soc/sdw_utils/soc_sdw_utils.c
+++ b/sound/soc/sdw_utils/soc_sdw_utils.c
@@ -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;
-- 
2.47.3

RE: [PATCH] ASoC: sdw_utils: cs42l43: allow spk component names to be combined

[Liao, Bard]

> -----Original Message-----
> From: Maciej Strozek <mstrozek@opensource.cirrus.com>
> Sent: Friday, April 17, 2026 10:45 PM
> To: Mark Brown <broonie@kernel.org>; Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiwai@suse.com>; Bard Liao <yung-
> chuan.liao@linux.intel.com>; linux-kernel@vger.kernel.org; linux-
> sound@vger.kernel.org; patches@opensource.cirrus.com; Maciej Strozek
> <mstrozek@opensource.cirrus.com>
> Subject: [PATCH] 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.
> 
> Link: https://github.com/thesofproject/linux/pull/5445 [1]
> Link: https://github.com/alsa-project/alsa-ucm-conf/pull/747
> Signed-off-by: Maciej Strozek <mstrozek@opensource.cirrus.com>

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>

> ---
>  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(-)
> 
> diff --git a/sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c
> b/sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c
> index 2a7109d53cbe3..e0e32a279787c 100644
> --- a/sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c
> +++ b/sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c
> @@ -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) {
> diff --git a/sound/soc/sdw_utils/soc_sdw_cs42l43.c
> b/sound/soc/sdw_utils/soc_sdw_cs42l43.c
> index 4a451b9d4f137..66aa9958ad184 100644
> --- a/sound/soc/sdw_utils/soc_sdw_cs42l43.c
> +++ b/sound/soc/sdw_utils/soc_sdw_cs42l43.c
> @@ -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)
> diff --git a/sound/soc/sdw_utils/soc_sdw_utils.c
> b/sound/soc/sdw_utils/soc_sdw_utils.c
> index 2807f536eef0c..1637cc3f3d598 100644
> --- a/sound/soc/sdw_utils/soc_sdw_utils.c
> +++ b/sound/soc/sdw_utils/soc_sdw_utils.c
> @@ -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;
> --
> 2.47.3
> 

Re: [PATCH] ASoC: sdw_utils: cs42l43: allow spk component names to be combined

[Aaron Ma]

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

Re: [PATCH] ASoC: sdw_utils: cs42l43: allow spk component names to be combined

[Maciej Strozek]

W dniu pon, 20.04.2026 o godzinie 15∶47 +0800, użytkownik Aaron Ma
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.
> 
> Fix: use dai->component instead of snd_soc_rtd_to_codec(rtd, 0)-
> >component.
> 
> Thanks,
> Aaron

Thank you! Going to fix it in v2
-- 
Regards,
Maciej

[PATCH] ASoC: sdw_utils: cs42l43: allow spk component names to be combined

[Maciej Strozek]

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.

Link: https://github.com/thesofproject/linux/pull/5445 [1]
Link: https://github.com/alsa-project/alsa-ucm-conf/pull/747
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Maciej Strozek <mstrozek@opensource.cirrus.com>
---
Changes in v2: use dai->component instead of snd_soc_rtd_to_codec(rtd, 0)->component
---
 sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c |  6 ------
 sound/soc/sdw_utils/soc_sdw_cs42l43.c        | 12 +-----------
 sound/soc/sdw_utils/soc_sdw_utils.c          | 20 ++++++++++++++++----
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c b/sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c
index 2a7109d53cbe3..e0e32a279787c 100644
--- a/sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c
+++ b/sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c
@@ -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) {
diff --git a/sound/soc/sdw_utils/soc_sdw_cs42l43.c b/sound/soc/sdw_utils/soc_sdw_cs42l43.c
index 4a451b9d4f137..e99ea3c4e5dde 100644
--- a/sound/soc/sdw_utils/soc_sdw_cs42l43.c
+++ b/sound/soc/sdw_utils/soc_sdw_cs42l43.c
@@ -107,21 +107,11 @@ EXPORT_SYMBOL_NS(asoc_sdw_cs42l43_hs_rtd_init, "SND_SOC_SDW_UTILS");

 int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
-	struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;
+	struct snd_soc_component *component = dai->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)
diff --git a/sound/soc/sdw_utils/soc_sdw_utils.c b/sound/soc/sdw_utils/soc_sdw_utils.c
index 2807f536eef0c..1637cc3f3d598 100644
--- a/sound/soc/sdw_utils/soc_sdw_utils.c
+++ b/sound/soc/sdw_utils/soc_sdw_utils.c
@@ -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;
--
2.47.3

Re: [PATCH] ASoC: sdw_utils: cs42l43: allow spk component names to be combined

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 222 bytes --]

On Mon, Apr 20, 2026 at 11:37:14AM +0100, Maciej Strozek wrote:
> ---
> Changes in v2: use dai->component instead of snd_soc_rtd_to_codec(rtd, 0)->component
> ---

You say this is v2 but didn't actually send it as a v2 :(

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] ASoC: sdw_utils: cs42l43: allow spk component names to be combined

[Maciej Strozek]

W dniu pon, 20.04.2026 o godzinie 12∶20 +0100, użytkownik Mark Brown
napisał:
> On Mon, Apr 20, 2026 at 11:37:14AM +0100, Maciej Strozek wrote:
> > ---
> > Changes in v2: use dai->component instead of
> > snd_soc_rtd_to_codec(rtd, 0)->component
> > ---
> 
> You say this is v2 but didn't actually send it as a v2 :(

Ahh sorry, missed the subject line, let me resend

-- 
Regards,
Maciej