Re: [PATCH 7/9] ASoC: codecs: lpass-wsa-macro: add RX4 and RX5

[Jonathan Marek <jonathan@marek.ca>]

On 11/19/25 10:33 AM, Srinivas Kandagatla wrote:
> 
> 
> On 11/17/25 5:15 AM, Jonathan Marek wrote:
>> This allows playback using the WSA_2CH AIF, which feeds RX4 and RX5 on both
>> WSA and WSA2.
> 
> Which SoC have you verified this on?
> 

I am testing with x1e and sm8650 devices.

>> Signed-off-by: Jonathan Marek <jonathan@marek.ca>
>> ---
> 
>>   sound/soc/codecs/lpass-wsa-macro.c | 48 ++++++++++++++++++++++++++++--
>>   1 file changed, 46 insertions(+), 2 deletions(-)
>>
>> diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c
>> index e2e78ff6dd54e..f02153108c275 100644
>> --- a/sound/soc/codecs/lpass-wsa-macro.c
>> +++ b/sound/soc/codecs/lpass-wsa-macro.c
>> @@ -300,6 +300,8 @@ enum {
>>   	WSA_MACRO_RX_MIX,
>>   	WSA_MACRO_RX_MIX0 = WSA_MACRO_RX_MIX,
>>   	WSA_MACRO_RX_MIX1,
> 
> While you are at it, can you add RX2 and RX3, its same for both
> rx_primary  and rx_mix
> 

RX2 is RX_MIX0 and RX3 is RX_MIX1 (different names for the same thing).

I can add RX6, RX7, RX8 (if I can test and verify that they work), I 
didn't try to add them because the downstream driver doesn't support them.

>> +	WSA_MACRO_RX4,
>> +	WSA_MACRO_RX5,
>>   	WSA_MACRO_RX_MAX,
>>   };
>>   
>> @@ -2228,6 +2230,10 @@ static const struct snd_kcontrol_new rx_mux[WSA_MACRO_RX_MAX] = {
>>   			  wsa_macro_rx_mux_get, wsa_macro_rx_mux_put),
>>   	SOC_DAPM_ENUM_EXT("WSA RX_MIX1 Mux", rx_mux_enum,
>>   			  wsa_macro_rx_mux_get, wsa_macro_rx_mux_put),
>> +	SOC_DAPM_ENUM_EXT("WSA RX4 Mux", rx_mux_enum,
>> +			  wsa_macro_rx_mux_get, wsa_macro_rx_mux_put),
>> +	SOC_DAPM_ENUM_EXT("WSA RX5 Mux", rx_mux_enum,
>> +			  wsa_macro_rx_mux_get, wsa_macro_rx_mux_put),
>>   };
>>   
>>   static int wsa_macro_vi_feed_mixer_get(struct snd_kcontrol *kcontrol,
>> @@ -2410,6 +2416,10 @@ static const struct snd_soc_dapm_widget wsa_macro_dapm_widgets_v2_5[] = {
>>   	SND_SOC_DAPM_MUX("WSA_RX1 INP1", SND_SOC_NOPM, 0, 0, &rx1_prim_inp1_mux_v2_5),
>>   	SND_SOC_DAPM_MUX("WSA_RX1 INP2", SND_SOC_NOPM, 0, 0, &rx1_prim_inp2_mux_v2_5),
>>   	SND_SOC_DAPM_MUX("WSA_RX1 MIX INP", SND_SOC_NOPM, 0, 0, &rx1_mix_mux_v2_5),
>> +	SND_SOC_DAPM_MIXER("WSA RX4", SND_SOC_NOPM, 0, 0, NULL, 0),
>> +	SND_SOC_DAPM_MIXER("WSA RX5", SND_SOC_NOPM, 0, 0, NULL, 0),
>> +	SND_SOC_DAPM_MUX("WSA RX4 MUX", SND_SOC_NOPM, WSA_MACRO_RX4, 0, &rx_mux[WSA_MACRO_RX4]),
>> +	SND_SOC_DAPM_MUX("WSA RX5 MUX", SND_SOC_NOPM, WSA_MACRO_RX5, 0, &rx_mux[WSA_MACRO_RX5]),
>>   };
>>   
>>   static const struct snd_soc_dapm_route wsa_audio_map[] = {
>> @@ -2529,6 +2539,31 @@ static const struct snd_soc_dapm_route wsa_audio_map[] = {
>>   	{"WSA_SPK2 OUT", NULL, "WSA_MCLK"},
>>   };
>>   
>> +static const struct snd_soc_dapm_route wsa_audio_map_v2_5[] = {
>> +	{"WSA RX4 MUX", "AIF1_PB", "WSA AIF1 PB"},
>> +	{"WSA RX5 MUX", "AIF1_PB", "WSA AIF1 PB"},
>> +	{"WSA RX4 MUX", "AIF_MIX1_PB", "WSA AIF_MIX1 PB"},
>> +	{"WSA RX5 MUX", "AIF_MIX1_PB", "WSA AIF_MIX1 PB"},
>> +	{"WSA RX4", NULL, "WSA RX4 MUX"},
>> +	{"WSA RX5", NULL, "WSA RX5 MUX"},
>> +	{"WSA_RX0 INP0", "RX4", "WSA RX4"},
>> +	{"WSA_RX0 INP0", "RX5", "WSA RX5"},
>> +	{"WSA_RX0 INP1", "RX4", "WSA RX4"},
>> +	{"WSA_RX0 INP1", "RX5", "WSA RX5"},
>> +	{"WSA_RX0 INP2", "RX4", "WSA RX4"},
>> +	{"WSA_RX0 INP2", "RX5", "WSA RX5"},
>> +	{"WSA_RX0 MIX INP", "RX4", "WSA RX4"},
>> +	{"WSA_RX0 MIX INP", "RX5", "WSA RX5"},
>> +	{"WSA_RX1 INP0", "RX4", "WSA RX4"},
>> +	{"WSA_RX1 INP0", "RX5", "WSA RX5"},
>> +	{"WSA_RX1 INP1", "RX4", "WSA RX4"},
>> +	{"WSA_RX1 INP1", "RX5", "WSA RX5"},
>> +	{"WSA_RX1 INP2", "RX4", "WSA RX4"},
>> +	{"WSA_RX1 INP2", "RX5", "WSA RX5"},
>> +	{"WSA_RX1 MIX INP", "RX4", "WSA RX4"},
>> +	{"WSA_RX1 MIX INP", "RX5", "WSA RX5"},
>> +};
>> +
>>   static int wsa_swrm_clock(struct wsa_macro *wsa, bool enable)
>>   {
>>   	struct regmap *regmap = wsa->regmap;
>> @@ -2562,7 +2597,9 @@ static int wsa_macro_component_probe(struct snd_soc_component *comp)
>>   	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(comp);
>>   	struct wsa_macro *wsa = snd_soc_component_get_drvdata(comp);
>>   	const struct snd_soc_dapm_widget *widgets;
>> -	unsigned int num_widgets;
>> +	const struct snd_soc_dapm_route *routes;
>> +	unsigned int num_widgets, num_routes;
>> +	int ret;
>>   
>>   	snd_soc_component_init_regmap(comp, wsa->regmap);
>>   
>> @@ -2587,6 +2624,7 @@ static int wsa_macro_component_probe(struct snd_soc_component *comp)
>>   	case LPASS_CODEC_VERSION_2_1:
>>   		widgets = wsa_macro_dapm_widgets_v2_1;
>>   		num_widgets = ARRAY_SIZE(wsa_macro_dapm_widgets_v2_1);
>> +		num_routes = 0;
>>   		break;
>>   	case LPASS_CODEC_VERSION_2_5:
>>   	case LPASS_CODEC_VERSION_2_6:
>> @@ -2595,12 +2633,18 @@ static int wsa_macro_component_probe(struct snd_soc_component *comp)
>>   	case LPASS_CODEC_VERSION_2_9:
>>   		widgets = wsa_macro_dapm_widgets_v2_5;
>>   		num_widgets = ARRAY_SIZE(wsa_macro_dapm_widgets_v2_5);
>> +		routes = wsa_audio_map_v2_5;
>> +		num_routes = ARRAY_SIZE(wsa_audio_map_v2_5);
>>   		break;
>>   	default:
>>   		return -EINVAL;
>>   	}
>>   
>> -	return snd_soc_dapm_new_controls(dapm, widgets, num_widgets);
>> +	ret = snd_soc_dapm_new_controls(dapm, widgets, num_widgets);
>> +	if (ret)
>> +		return ret;
>> +
>> +	return snd_soc_dapm_add_routes(dapm, routes, num_routes);
>>   }
>>   
>>   static int swclk_gate_enable(struct clk_hw *hw)
>