From nobody Tue Dec 16 19:24:32 2025 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 BA485E7AD74 for ; Tue, 3 Oct 2023 15:57:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232055AbjJCP5g (ORCPT ); Tue, 3 Oct 2023 11:57:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232181AbjJCP5W (ORCPT ); Tue, 3 Oct 2023 11:57:22 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5D73B7 for ; Tue, 3 Oct 2023 08:57:17 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-991c786369cso184635566b.1 for ; Tue, 03 Oct 2023 08:57:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696348636; x=1696953436; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=168VbodA38Hdi5eAfuNgKvUwcfZckCEtb5Hwk95lQ/Q=; b=CeAeEuVxmM9DqP0YxPLd+BognG8hCbMNVcieM9ACDCulZq7HW1KoAx9r7IICzdXLJ9 TnncwebT87V89+b4AqI+TSrG9nzLYh6fkWXsMM1sQGitNih+6e0AaEekuhkQXsBmVP2o 0z8oRGglXiUq8lj/NpHNhxFoPL01fWmmCKgPu4TygX7hbAsVDe44vDtVKRcUGO/5yWb+ 8oIPhss6CFRBiwOESDDx2wB0ZEmhE6efN3YcEK6HEfpJ4CbcwKPCl1mgVGKgjjG0kQ83 HGmL2ny7J+rYe9uvxv6QTw1ai4x9uJDG6iSqPl0DluXMaEpB0siu3yNir56C9Mik3hhl Tt1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696348636; x=1696953436; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=168VbodA38Hdi5eAfuNgKvUwcfZckCEtb5Hwk95lQ/Q=; b=QMSCKL5x0Vmo/8sEm4eDqzLF12zcaUPN5jk54cCHUvlLjOdZ10bgCJnYeIb5tICJ3G LPCyjlNyVF3tFxWQBJwD9vUvgF+jac0dm15EoNKKi2DYW2lg3ZOLxYaT57KNeJJvaHlv L2xNTjv7iJU5b2IqK4nGKN4SD5yymfvIGkm8KSvIiF+aBmkGC0nu5/fFbEi7f3NIbIG/ Of31mHRHfFZRUGZYxUr9G2qsrRI3FGvKHnR9RAP+y9Kcrp2y2dGLP1uFKaeTK6UaPBYE 4v/1Y5LGk0GRWX99d3Ny5K7Je0aOVJHoQ/8S1vU/qcSr2mzeeZJxG8o+8JshvmezKXpw I90Q== X-Gm-Message-State: AOJu0Yxpo9uvdXn8LSPuHAtUMi6+cr78PS9irKMuQgDw+kO4XrY62Q8+ 9Grrx9GE71MNFgYlTOi2M1blCA== X-Google-Smtp-Source: AGHT+IFxb7p6HyTQDTwuHqjaxVz5+dsTwm+VvkHaxagLHnQgS8VYvxoMpoZBnybgXCeiPC4gYQTmqQ== X-Received: by 2002:a17:906:51db:b0:9b2:abda:2543 with SMTP id v27-20020a17090651db00b009b2abda2543mr14616486ejk.65.1696348636295; Tue, 03 Oct 2023 08:57:16 -0700 (PDT) Received: from krzk-bin.. (5-157-101-10.dyn.eolo.it. [5.157.101.10]) by smtp.gmail.com with ESMTPSA id w25-20020a170906481900b0099bc2d1429csm1288088ejq.72.2023.10.03.08.57.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 08:57:15 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Srinivas Kandagatla , Banajit Goswami , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/2] ASoC: soc-dapm: Add helper for comparing widget name Date: Tue, 3 Oct 2023 17:57:09 +0200 Message-Id: <20231003155710.821315-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231003155710.821315-1-krzysztof.kozlowski@linaro.org> References: <20231003155710.821315-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some drivers use one event callback for multiple widgets but still need to perform a bit different actions based on actual widget. This is done by comparing widget name, however drivers tend to miss possible name prefix. Add a helper to solve common mistakes. Signed-off-by: Krzysztof Kozlowski --- include/sound/soc-dapm.h | 1 + sound/soc/soc-component.c | 1 + sound/soc/soc-dapm.c | 12 ++++++++++++ 3 files changed, 14 insertions(+) diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index d2faec9a323e..433543eb82b9 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -469,6 +469,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_s= oc_card *card); =20 int snd_soc_dapm_update_dai(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai); +int snd_soc_dapm_widget_name_cmp(struct snd_soc_dapm_widget *widget, const= char *s); =20 /* dapm path setup */ int snd_soc_dapm_new_widgets(struct snd_soc_card *card); diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c index 69198de39e79..4d7c2e3c929a 100644 --- a/sound/soc/soc-component.c +++ b/sound/soc/soc-component.c @@ -242,6 +242,7 @@ int snd_soc_component_notify_control(struct snd_soc_com= ponent *component, char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; struct snd_kcontrol *kctl; =20 + /* When updating, change also snd_soc_dapm_widget_name_cmp() */ if (component->name_prefix) snprintf(name, ARRAY_SIZE(name), "%s %s", component->name_prefix, ctl); else diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 2512aadf95f7..8f22ce857f4a 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2728,6 +2728,18 @@ int snd_soc_dapm_update_dai(struct snd_pcm_substream= *substream, } EXPORT_SYMBOL_GPL(snd_soc_dapm_update_dai); =20 +int snd_soc_dapm_widget_name_cmp(struct snd_soc_dapm_widget *widget, const= char *s) +{ + struct snd_soc_component *component =3D snd_soc_dapm_to_component(widget-= >dapm); + const char *wname =3D widget->name; + + if (component->name_prefix) + wname +=3D strlen(component->name_prefix) + 1; /* plus space */ + + return strcmp(wname, s); +} +EXPORT_SYMBOL_GPL(snd_soc_dapm_widget_name_cmp); + /* * dapm_update_widget_flags() - Re-compute widget sink and source flags * @w: The widget for which to update the flags --=20 2.34.1 From nobody Tue Dec 16 19:24:32 2025 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 469BAE7AD72 for ; Tue, 3 Oct 2023 15:57:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231422AbjJCP5b (ORCPT ); Tue, 3 Oct 2023 11:57:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232096AbjJCP5X (ORCPT ); Tue, 3 Oct 2023 11:57:23 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 29C149E for ; Tue, 3 Oct 2023 08:57:19 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-99bdeae1d0aso198488366b.1 for ; Tue, 03 Oct 2023 08:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696348637; x=1696953437; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GTMTkkvOrFaQjz0yOJaB7Q7/cPC8x6m+P9hBCS11kOw=; b=dyGtL9vVsFUMN/ZVcJsdpKPa6rpnPkhfC4dWHIA8hvJER+OuM+N7tfOOm+aBI5FgvD ooaSgZeCxHiGnwd7XrEpryNwTDK29A/TKd+SV2TqI/+BY86igyBQwLujLxoPsLcyeaNC 3boQtHZ1/bodJ7zGVSo+A35eVq9kZzTPnBMFvW1bVCQVWbvGSjrA3QfiDkYc4YxsPLqX dncTZWVqoyDtpKTlTOc1XJyBa18pRhxukxhDTvin1oz4V9GOGyu/JbpWAnynJIexeD2O xdCbhhyN/DPEaoyz6y5Ku8Q9+YHJqrfNKGF6Z8o/88qPSIPMzNrho/uH/TW9n0KIxL7h F6fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696348637; x=1696953437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GTMTkkvOrFaQjz0yOJaB7Q7/cPC8x6m+P9hBCS11kOw=; b=d6B+El1wcGFKWDOvD4D9nj5pZTWGsNqbcriV7Q+ZMNlFVCSkMxZduJYtkGVqVIfv/f 1B+Km5fuUnFGf/DZtL4p2etdRqOsD95S+4Mrt5okAW6/atuGxms37ksSs5mTMA9XKyq6 qlgqlNjhkdCzfOCBBqwfXg+evfT/Uh5kdRZBlV8/2viLWGqV2pq+6gJfVYc9oidYIQr7 ftsA0p31hMw27Sx+Vtf3wzdF4+vYlexDSbcErmO6R4VtP9jHXypP/3KGJg1A9koCaH2o Ys/sSccre6Nvh3C1K302OIxh1BL/mjT3lFE81lSi9FP+eeTKkar4jG3It+s74hV6LTsk c8WA== X-Gm-Message-State: AOJu0YwRFOa7THYYrz7zTux9gQ2LyjFZMhFral4c4kVHdKKh6zYLTnZi 9nplI2qjvHtf+AKetEvVX51J8I6uU//KAywZmVBMOg== X-Google-Smtp-Source: AGHT+IH6Iv8pRe5kVjLJr/VnS5qxhiKaTIKJ7fgCvAijxKTfbrDX6qtvCp9N5M3hF1FzRbOXyUwQig== X-Received: by 2002:a17:906:7383:b0:9ae:5aa5:ee6c with SMTP id f3-20020a170906738300b009ae5aa5ee6cmr14822922ejl.12.1696348637599; Tue, 03 Oct 2023 08:57:17 -0700 (PDT) Received: from krzk-bin.. (5-157-101-10.dyn.eolo.it. [5.157.101.10]) by smtp.gmail.com with ESMTPSA id w25-20020a170906481900b0099bc2d1429csm1288088ejq.72.2023.10.03.08.57.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 08:57:17 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Srinivas Kandagatla , Banajit Goswami , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 2/2] ASoC: codecs: wsa-macro: handle component name prefix Date: Tue, 3 Oct 2023 17:57:10 +0200 Message-Id: <20231003155710.821315-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231003155710.821315-1-krzysztof.kozlowski@linaro.org> References: <20231003155710.821315-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- 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-ws= a-macro.c index ea6e3fa7e9e1..7e21cec3c2fb 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -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; =20 - if (!strcmp(w->name, "WSA_RX INT0 CHAIN")) { + if (!snd_soc_dapm_widget_name_cmp(w, "WSA_RX INT0 CHAIN")) { boost_path_ctl =3D CDC_WSA_BOOST0_BOOST_PATH_CTL; boost_path_cfg1 =3D CDC_WSA_RX0_RX_PATH_CFG1; reg =3D CDC_WSA_RX0_RX_PATH_CTL; reg_mix =3D 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 =3D CDC_WSA_BOOST1_BOOST_PATH_CTL; boost_path_cfg1 =3D CDC_WSA_RX1_RX_PATH_CFG1; reg =3D CDC_WSA_RX1_RX_PATH_CTL; --=20 2.34.1