Unverified Commit 86cfaf99 authored Oct 23, 2023 by Krzysztof Kozlowski Committed by Mark Brown Oct 26, 2023

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>

parent d1ecaabe

sound/soc/mediatek/mt8192/mt8192-dai-adda.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -435,7 +435,7 @@ static int mtk_adda_mtkaif_cfg_event(struct snd_soc_dapm_widget *w,
		regmap_write(afe->regmap, AFE_ADDA6_MTKAIF_CFG0,
		0x00010000);

		if (strcmp(w->name, "ADDA_MTKAIF_CFG") == 0 &&
		if (snd_soc_dapm_widget_name_cmp(w, "ADDA_MTKAIF_CFG") == 0 &&
		(afe_priv->mtkaif_chosen_phase[0] < 0 \|\|
		afe_priv->mtkaif_chosen_phase[1] < 0)) {
		dev_warn(afe->dev,
		@@ -444,7 +444,7 @@ static int mtk_adda_mtkaif_cfg_event(struct snd_soc_dapm_widget *w,
		afe_priv->mtkaif_chosen_phase[0],
		afe_priv->mtkaif_chosen_phase[1]);
		break;
		} else if (strcmp(w->name, "ADDA6_MTKAIF_CFG") == 0 &&
		} else if (snd_soc_dapm_widget_name_cmp(w, "ADDA6_MTKAIF_CFG") == 0 &&
		afe_priv->mtkaif_chosen_phase[2] < 0) {
		dev_warn(afe->dev,
		"%s(), mtkaif_chosen_phase[2]:%d\n",

sound/soc/mediatek/mt8192/mt8192-dai-i2s.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -623,13 +623,13 @@ static int mtk_apll_event(struct snd_soc_dapm_widget *w,

		switch (event) {
		case SND_SOC_DAPM_PRE_PMU:
		if (strcmp(w->name, APLL1_W_NAME) == 0)
		if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0)
		mt8192_apll1_enable(afe);
		else
		mt8192_apll2_enable(afe);
		break;
		case SND_SOC_DAPM_POST_PMD:
		if (strcmp(w->name, APLL1_W_NAME) == 0)
		if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0)
		mt8192_apll1_disable(afe);
		else
		mt8192_apll2_disable(afe);