From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>

WSA and WSA2 are two instances of WSA codec macro, this can lead
dupicate dapm widgets and mixers resulting in failing to probe
soundcard if both of these instances are part of the dai-link.

Correct way to address this is to add sound-name-prefix to WSA2
instances to avoid such confilcting mixers and dapm widgets.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
---
 arch/arm64/boot/dts/qcom/sm8450.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index fa0822c37854..d8fd01997395 100644
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -2827,6 +2827,7 @@ wsa2macro: codec@31e0000 {
 			#clock-cells = <0>;
 			clock-output-names = "wsa2-mclk";
 			#sound-dai-cells = <1>;
+			sound-name-prefix = "WSA2";
 		};
 
 		swr4: soundwire@31f0000 {
-- 
2.50.0

On Wed, Jul 23, 2025 at 11:27:34PM +0100, srinivas.kandagatla@oss.qualcomm.com wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> 
> WSA and WSA2 are two instances of WSA codec macro, this can lead
> dupicate dapm widgets and mixers resulting in failing to probe
> soundcard if both of these instances are part of the dai-link.
> 
> Correct way to address this is to add sound-name-prefix to WSA2
> instances to avoid such confilcting mixers and dapm widgets.

This looks like a fix for an issue. Please mark it accordinggly and move
towards the start of the series.

> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> ---
>  arch/arm64/boot/dts/qcom/sm8450.dtsi | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> index fa0822c37854..d8fd01997395 100644
> --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> @@ -2827,6 +2827,7 @@ wsa2macro: codec@31e0000 {
>  			#clock-cells = <0>;
>  			clock-output-names = "wsa2-mclk";
>  			#sound-dai-cells = <1>;
> +			sound-name-prefix = "WSA2";
>  		};
>  
>  		swr4: soundwire@31f0000 {
> -- 
> 2.50.0
> 

-- 
With best wishes
Dmitry

On Thu, Jul 24, 2025 at 01:44:09AM +0300, Dmitry Baryshkov wrote:
> On Wed, Jul 23, 2025 at 11:27:34PM +0100, srinivas.kandagatla@oss.qualcomm.com wrote:
> > From: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
> > 
> > WSA and WSA2 are two instances of WSA codec macro, this can lead
> > dupicate dapm widgets and mixers resulting in failing to probe
> > soundcard if both of these instances are part of the dai-link.
> > 
> > Correct way to address this is to add sound-name-prefix to WSA2
> > instances to avoid such confilcting mixers and dapm widgets.
> 
> This looks like a fix for an issue. Please mark it accordinggly and move
> towards the start of the series.
> 

It doesn't really have anything to do with the rest of the series at
all, so those should be ideally sent as a separate series. They can be
picked up much easier compared to the large refactoring of the other
patches.

Thanks,
Stephan