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

ASoC: mediatek: mt8192: 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-16-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Krzysztof Kozlowski and committed by
Mark Brown
86cfaf99 d1ecaabe

+4 -4
+2 -2
sound/soc/mediatek/mt8192/mt8192-dai-adda.c
··· 435 435 regmap_write(afe->regmap, AFE_ADDA6_MTKAIF_CFG0, 436 436 0x00010000); 437 437 438 - if (strcmp(w->name, "ADDA_MTKAIF_CFG") == 0 && 438 + if (snd_soc_dapm_widget_name_cmp(w, "ADDA_MTKAIF_CFG") == 0 && 439 439 (afe_priv->mtkaif_chosen_phase[0] < 0 || 440 440 afe_priv->mtkaif_chosen_phase[1] < 0)) { 441 441 dev_warn(afe->dev, ··· 444 444 afe_priv->mtkaif_chosen_phase[0], 445 445 afe_priv->mtkaif_chosen_phase[1]); 446 446 break; 447 - } else if (strcmp(w->name, "ADDA6_MTKAIF_CFG") == 0 && 447 + } else if (snd_soc_dapm_widget_name_cmp(w, "ADDA6_MTKAIF_CFG") == 0 && 448 448 afe_priv->mtkaif_chosen_phase[2] < 0) { 449 449 dev_warn(afe->dev, 450 450 "%s(), mtkaif_chosen_phase[2]:%d\n",
+2 -2
sound/soc/mediatek/mt8192/mt8192-dai-i2s.c
··· 623 623 624 624 switch (event) { 625 625 case SND_SOC_DAPM_PRE_PMU: 626 - if (strcmp(w->name, APLL1_W_NAME) == 0) 626 + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0) 627 627 mt8192_apll1_enable(afe); 628 628 else 629 629 mt8192_apll2_enable(afe); 630 630 break; 631 631 case SND_SOC_DAPM_POST_PMD: 632 - if (strcmp(w->name, APLL1_W_NAME) == 0) 632 + if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0) 633 633 mt8192_apll1_disable(afe); 634 634 else 635 635 mt8192_apll2_disable(afe);