Unverified Commit 0fe153a9 authored Oct 23, 2023 by Krzysztof Kozlowski Committed by Mark Brown Oct 26, 2023

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>

parent e84c7f5d

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -321,7 +321,7 @@ static int mtk_adda_mtkaif_cfg_event(struct snd_soc_dapm_widget *w,
		MTKAIF_RXIF_CLKINV_ADC_MASK_SFT,
		BIT(MTKAIF_RXIF_CLKINV_ADC_SFT));

		if (strcmp(w->name, "ADDA_MTKAIF_CFG") == 0) {
		if (snd_soc_dapm_widget_name_cmp(w, "ADDA_MTKAIF_CFG") == 0) {
		if (afe_priv->mtkaif_chosen_phase[0] < 0 &&
		afe_priv->mtkaif_chosen_phase[1] < 0) {
		dev_err(afe->dev,

sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ static int mtk_hw_gain_event(struct snd_soc_dapm_widget *w,

		switch (event) {
		case SND_SOC_DAPM_PRE_PMU:
		if (strcmp(w->name, HW_GAIN_1_EN_W_NAME) == 0) {
		if (snd_soc_dapm_widget_name_cmp(w, HW_GAIN_1_EN_W_NAME) == 0) {
		gain_cur = AFE_GAIN1_CUR;
		gain_con1 = AFE_GAIN1_CON1;
		} else {

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -393,13 +393,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)
		mt8186_apll1_enable(afe);
		else
		mt8186_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)
		mt8186_apll1_disable(afe);
		else
		mt8186_apll2_disable(afe);

sound/soc/mediatek/mt8186/mt8186-dai-src.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -322,7 +322,7 @@ static int mtk_hw_src_event(struct snd_soc_dapm_widget *w,
		struct mtk_afe_src_priv *src_priv;
		unsigned int reg;

		if (strcmp(w->name, HW_SRC_1_EN_W_NAME) == 0)
		if (snd_soc_dapm_widget_name_cmp(w, HW_SRC_1_EN_W_NAME) == 0)
		id = MT8186_DAI_SRC_1;
		else
		id = MT8186_DAI_SRC_2;
		@@ -487,7 +487,7 @@ static int mtk_afe_src_en_connect(struct snd_soc_dapm_widget *source,
		struct mt8186_afe_private *afe_priv = afe->platform_priv;
		struct mtk_afe_src_priv *src_priv;

		if (strcmp(w->name, HW_SRC_1_EN_W_NAME) == 0)
		if (snd_soc_dapm_widget_name_cmp(w, HW_SRC_1_EN_W_NAME) == 0)
		src_priv = afe_priv->dai_priv[MT8186_DAI_SRC_1];
		else
		src_priv = afe_priv->dai_priv[MT8186_DAI_SRC_2];