ASoC: codecs: wsa-macro: handle component name prefix
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Tue, 3 Oct 2023 15:57:10 +0000 (17:57 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 9 Oct 2023 12:03:29 +0000 (13:03 +0100)
When comparing widget names in wsa_macro_spk_boost_event(), consider
also the component's name prefix.  Otherwise the WSA codec won't have
proper mixer setup resulting in no sound playback through speakers.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20231003155710.821315-3-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/lpass-wsa-macro.c

index ec6859e..fff4a8b 100644 (file)
@@ -1675,12 +1675,12 @@ static int wsa_macro_spk_boost_event(struct snd_soc_dapm_widget *w,
        u16 boost_path_ctl, boost_path_cfg1;
        u16 reg, reg_mix;
 
-       if (!strcmp(w->name, "WSA_RX INT0 CHAIN")) {
+       if (!snd_soc_dapm_widget_name_cmp(w, "WSA_RX INT0 CHAIN")) {
                boost_path_ctl = CDC_WSA_BOOST0_BOOST_PATH_CTL;
                boost_path_cfg1 = CDC_WSA_RX0_RX_PATH_CFG1;
                reg = CDC_WSA_RX0_RX_PATH_CTL;
                reg_mix = CDC_WSA_RX0_RX_PATH_MIX_CTL;
-       } else if (!strcmp(w->name, "WSA_RX INT1 CHAIN")) {
+       } else if (!snd_soc_dapm_widget_name_cmp(w, "WSA_RX INT1 CHAIN")) {
                boost_path_ctl = CDC_WSA_BOOST1_BOOST_PATH_CTL;
                boost_path_cfg1 = CDC_WSA_RX1_RX_PATH_CFG1;
                reg = CDC_WSA_RX1_RX_PATH_CTL;