Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: mediatek: mt8186: Handle component name prefix

Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names,
to include also the component's name prefix.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20231023095428.166563-14-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Krzysztof Kozlowski and committed by
Mark Brown
0fe153a9 e84c7f5d

+6 -6
+1 -1
sound/soc/mediatek/mt8186/mt8186-dai-adda.c
··· 321 321 MTKAIF_RXIF_CLKINV_ADC_MASK_SFT, 322 322 BIT(MTKAIF_RXIF_CLKINV_ADC_SFT)); 323 323 324 - if (strcmp(w->name, "ADDA_MTKAIF_CFG") == 0) { 324 + if (snd_soc_dapm_widget_name_cmp(w, "ADDA_MTKAIF_CFG") == 0) { 325 325 if (afe_priv->mtkaif_chosen_phase[0] < 0 && 326 326 afe_priv->mtkaif_chosen_phase[1] < 0) { 327 327 dev_err(afe->dev,
+1 -1
sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c
··· 47 47 48 48 switch (event) { 49 49 case SND_SOC_DAPM_PRE_PMU: 50 - if (strcmp(w->name, HW_GAIN_1_EN_W_NAME) == 0) { 50 + if (snd_soc_dapm_widget_name_cmp(w, HW_GAIN_1_EN_W_NAME) == 0) { 51 51 gain_cur = AFE_GAIN1_CUR; 52 52 gain_con1 = AFE_GAIN1_CON1; 53 53 } else {
+2 -2
sound/soc/mediatek/mt8186/mt8186-dai-i2s.c
··· 393 393 394 394 switch (event) { 395 395 case SND_SOC_DAPM_PRE_PMU: 396 - if (strcmp(w->name, APLL1_W_NAME) == 0) 396 + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0) 397 397 mt8186_apll1_enable(afe); 398 398 else 399 399 mt8186_apll2_enable(afe); 400 400 break; 401 401 case SND_SOC_DAPM_POST_PMD: 402 - if (strcmp(w->name, APLL1_W_NAME) == 0) 402 + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0) 403 403 mt8186_apll1_disable(afe); 404 404 else 405 405 mt8186_apll2_disable(afe);
+2 -2
sound/soc/mediatek/mt8186/mt8186-dai-src.c
··· 322 322 struct mtk_afe_src_priv *src_priv; 323 323 unsigned int reg; 324 324 325 - if (strcmp(w->name, HW_SRC_1_EN_W_NAME) == 0) 325 + if (snd_soc_dapm_widget_name_cmp(w, HW_SRC_1_EN_W_NAME) == 0) 326 326 id = MT8186_DAI_SRC_1; 327 327 else 328 328 id = MT8186_DAI_SRC_2; ··· 487 487 struct mt8186_afe_private *afe_priv = afe->platform_priv; 488 488 struct mtk_afe_src_priv *src_priv; 489 489 490 - if (strcmp(w->name, HW_SRC_1_EN_W_NAME) == 0) 490 + if (snd_soc_dapm_widget_name_cmp(w, HW_SRC_1_EN_W_NAME) == 0) 491 491 src_priv = afe_priv->dai_priv[MT8186_DAI_SRC_1]; 492 492 else 493 493 src_priv = afe_priv->dai_priv[MT8186_DAI_SRC_2];