mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
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>
This commit is contained in:
parent
e84c7f5db9
commit
0fe153a99f
4 changed files with 6 additions and 6 deletions
|
@ -321,7 +321,7 @@ static int mtk_adda_mtkaif_cfg_event(struct snd_soc_dapm_widget *w,
|
||||||
MTKAIF_RXIF_CLKINV_ADC_MASK_SFT,
|
MTKAIF_RXIF_CLKINV_ADC_MASK_SFT,
|
||||||
BIT(MTKAIF_RXIF_CLKINV_ADC_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 &&
|
if (afe_priv->mtkaif_chosen_phase[0] < 0 &&
|
||||||
afe_priv->mtkaif_chosen_phase[1] < 0) {
|
afe_priv->mtkaif_chosen_phase[1] < 0) {
|
||||||
dev_err(afe->dev,
|
dev_err(afe->dev,
|
||||||
|
|
|
@ -47,7 +47,7 @@ static int mtk_hw_gain_event(struct snd_soc_dapm_widget *w,
|
||||||
|
|
||||||
switch (event) {
|
switch (event) {
|
||||||
case SND_SOC_DAPM_PRE_PMU:
|
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_cur = AFE_GAIN1_CUR;
|
||||||
gain_con1 = AFE_GAIN1_CON1;
|
gain_con1 = AFE_GAIN1_CON1;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -393,13 +393,13 @@ static int mtk_apll_event(struct snd_soc_dapm_widget *w,
|
||||||
|
|
||||||
switch (event) {
|
switch (event) {
|
||||||
case SND_SOC_DAPM_PRE_PMU:
|
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);
|
mt8186_apll1_enable(afe);
|
||||||
else
|
else
|
||||||
mt8186_apll2_enable(afe);
|
mt8186_apll2_enable(afe);
|
||||||
break;
|
break;
|
||||||
case SND_SOC_DAPM_POST_PMD:
|
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);
|
mt8186_apll1_disable(afe);
|
||||||
else
|
else
|
||||||
mt8186_apll2_disable(afe);
|
mt8186_apll2_disable(afe);
|
||||||
|
|
|
@ -322,7 +322,7 @@ static int mtk_hw_src_event(struct snd_soc_dapm_widget *w,
|
||||||
struct mtk_afe_src_priv *src_priv;
|
struct mtk_afe_src_priv *src_priv;
|
||||||
unsigned int reg;
|
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;
|
id = MT8186_DAI_SRC_1;
|
||||||
else
|
else
|
||||||
id = MT8186_DAI_SRC_2;
|
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 mt8186_afe_private *afe_priv = afe->platform_priv;
|
||||||
struct mtk_afe_src_priv *src_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];
|
src_priv = afe_priv->dai_priv[MT8186_DAI_SRC_1];
|
||||||
else
|
else
|
||||||
src_priv = afe_priv->dai_priv[MT8186_DAI_SRC_2];
|
src_priv = afe_priv->dai_priv[MT8186_DAI_SRC_2];
|
||||||
|
|
Loading…
Reference in a new issue