From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D53DC4332F for ; Sun, 29 Oct 2023 23:31:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232725AbjJ2XbB (ORCPT ); Sun, 29 Oct 2023 19:31:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232682AbjJ2Xa3 (ORCPT ); Sun, 29 Oct 2023 19:30:29 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6D40478A; Sun, 29 Oct 2023 15:58:41 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FCECC433CC; Sun, 29 Oct 2023 22:57:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698620278; bh=4Rr4bO0kW+bnd/zUoCV0qh2f5gDiB1877T6VPSg0gSQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oKmB3+RgpLIGUXqebhpASov34QEIYKhQhCyIiP3Vbg+LiwSdAcfsh8WwJs7H2tr/r PbiibNNC9gOQSbfLUCPY6dhsWkapRglZJHk2AZv2U+KoEXGKqrREYUcOcuoAbOb6DJ NPixUPifwedRgbJvvq9syHlYE3Kr8G8PQionTdfkrPuynE2fFRzz1wgnJgmuNZmTrz VPNP0RzP2zso1m3H18UNvaDqiTbDM3TumGtcJEHD3PNCXS5Ykuyf9UqVp14zzTnoqv 3z1tIeJnzJ3htsLohh13RKOSEAqZPEU6XLiwKStnLFK6bDwlLExXU3o/LlE7VjwtyG Dfp/H/Bd2sx5w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Krzysztof Kozlowski , Mark Brown , Sasha Levin , srinivas.kandagatla@linaro.org, bgoswami@quicinc.com, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 6.1 13/39] ASoC: codecs: wsa-macro: handle component name prefix Date: Sun, 29 Oct 2023 18:56:45 -0400 Message-ID: <20231029225740.790936-13-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231029225740.790936-1-sashal@kernel.org> References: <20231029225740.790936-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.60 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Krzysztof Kozlowski [ Upstream commit c29e5263d32a6d0ec094d425ae7fef3fa8d4da1c ] 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 Link: https://lore.kernel.org/r/20231003155710.821315-3-krzysztof.kozlowski@linaro.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/lpass-wsa-macro.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index 8ed48c86ccb33..1495e4b9b4318 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -1672,12 +1672,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; -- 2.42.0