From: Mark Brown <broonie@kernel.org> To: Liam Girdwood <lgirdwood@gmail.com>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, Matthias Brugger <matthias.bgg@gmail.com>, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Cc: "Nícolas F. R. A. Prado" <nfraprado@collabora.com>, alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, "Mark Brown" <broonie@kernel.org> Subject: [PATCH 2/4] ASoC: mt8192: Fix event generation for controls Date: Fri, 24 Feb 2023 14:03:56 +0000 [thread overview] Message-ID: <20230223-asoc-mt8192-quick-fixes-v1-2-9a85f90368e1@kernel.org> (raw) In-Reply-To: <20230223-asoc-mt8192-quick-fixes-v1-0-9a85f90368e1@kernel.org> ALSA controls put() operations should return 1 if the value changed and 0 if it remains the same, fix the mt8192 driver to do so. Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sound/soc/mediatek/mt8192/mt8192-dai-adda.c b/sound/soc/mediatek/mt8192/mt8192-dai-adda.c index bc8753f1001c..a33d1ce33349 100644 --- a/sound/soc/mediatek/mt8192/mt8192-dai-adda.c +++ b/sound/soc/mediatek/mt8192/mt8192-dai-adda.c @@ -591,16 +591,19 @@ static int stf_positive_gain_set(struct snd_kcontrol *kcontrol, struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt); struct mt8192_afe_private *afe_priv = afe->platform_priv; int gain_db = ucontrol->value.integer.value[0]; + bool change = false; afe_priv->stf_positive_gain_db = gain_db; if (gain_db >= 0 && gain_db <= 24) { - regmap_update_bits(afe->regmap, - AFE_SIDETONE_GAIN, - POSITIVE_GAIN_MASK_SFT, - (gain_db / 6) << POSITIVE_GAIN_SFT); + regmap_update_bits_check(afe->regmap, + AFE_SIDETONE_GAIN, + POSITIVE_GAIN_MASK_SFT, + (gain_db / 6) << POSITIVE_GAIN_SFT, + &change); } - return 0; + + return change; } static int mt8192_adda_dmic_get(struct snd_kcontrol *kcontrol, @@ -621,12 +624,17 @@ static int mt8192_adda_dmic_set(struct snd_kcontrol *kcontrol, struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt); struct mt8192_afe_private *afe_priv = afe->platform_priv; int dmic_on; + bool change; dmic_on = ucontrol->value.integer.value[0]; + change = (afe_priv->mtkaif_dmic != dmic_on) || + (afe_priv->mtkaif_dmic_ch34 != dmic_on); + afe_priv->mtkaif_dmic = dmic_on; afe_priv->mtkaif_dmic_ch34 = dmic_on; - return 0; + + return change; } static int mt8192_adda6_only_get(struct snd_kcontrol *kcontrol, @@ -647,11 +655,14 @@ static int mt8192_adda6_only_set(struct snd_kcontrol *kcontrol, struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt); struct mt8192_afe_private *afe_priv = afe->platform_priv; int mtkaif_adda6_only; + bool change; mtkaif_adda6_only = ucontrol->value.integer.value[0]; + change = afe_priv->mtkaif_adda6_only != mtkaif_adda6_only; afe_priv->mtkaif_adda6_only = mtkaif_adda6_only; - return 0; + + return change; } static const struct snd_kcontrol_new mtk_adda_controls[] = { -- 2.30.2
WARNING: multiple messages have this Message-ID (diff)
From: Mark Brown <broonie@kernel.org> To: Liam Girdwood <lgirdwood@gmail.com>, Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, Matthias Brugger <matthias.bgg@gmail.com>, AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Cc: "Nícolas F. R. A. Prado" <nfraprado@collabora.com>, alsa-devel@alsa-project.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, "Mark Brown" <broonie@kernel.org> Subject: [PATCH 2/4] ASoC: mt8192: Fix event generation for controls Date: Fri, 24 Feb 2023 14:03:56 +0000 [thread overview] Message-ID: <20230223-asoc-mt8192-quick-fixes-v1-2-9a85f90368e1@kernel.org> (raw) In-Reply-To: <20230223-asoc-mt8192-quick-fixes-v1-0-9a85f90368e1@kernel.org> ALSA controls put() operations should return 1 if the value changed and 0 if it remains the same, fix the mt8192 driver to do so. Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/sound/soc/mediatek/mt8192/mt8192-dai-adda.c b/sound/soc/mediatek/mt8192/mt8192-dai-adda.c index bc8753f1001c..a33d1ce33349 100644 --- a/sound/soc/mediatek/mt8192/mt8192-dai-adda.c +++ b/sound/soc/mediatek/mt8192/mt8192-dai-adda.c @@ -591,16 +591,19 @@ static int stf_positive_gain_set(struct snd_kcontrol *kcontrol, struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt); struct mt8192_afe_private *afe_priv = afe->platform_priv; int gain_db = ucontrol->value.integer.value[0]; + bool change = false; afe_priv->stf_positive_gain_db = gain_db; if (gain_db >= 0 && gain_db <= 24) { - regmap_update_bits(afe->regmap, - AFE_SIDETONE_GAIN, - POSITIVE_GAIN_MASK_SFT, - (gain_db / 6) << POSITIVE_GAIN_SFT); + regmap_update_bits_check(afe->regmap, + AFE_SIDETONE_GAIN, + POSITIVE_GAIN_MASK_SFT, + (gain_db / 6) << POSITIVE_GAIN_SFT, + &change); } - return 0; + + return change; } static int mt8192_adda_dmic_get(struct snd_kcontrol *kcontrol, @@ -621,12 +624,17 @@ static int mt8192_adda_dmic_set(struct snd_kcontrol *kcontrol, struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt); struct mt8192_afe_private *afe_priv = afe->platform_priv; int dmic_on; + bool change; dmic_on = ucontrol->value.integer.value[0]; + change = (afe_priv->mtkaif_dmic != dmic_on) || + (afe_priv->mtkaif_dmic_ch34 != dmic_on); + afe_priv->mtkaif_dmic = dmic_on; afe_priv->mtkaif_dmic_ch34 = dmic_on; - return 0; + + return change; } static int mt8192_adda6_only_get(struct snd_kcontrol *kcontrol, @@ -647,11 +655,14 @@ static int mt8192_adda6_only_set(struct snd_kcontrol *kcontrol, struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt); struct mt8192_afe_private *afe_priv = afe->platform_priv; int mtkaif_adda6_only; + bool change; mtkaif_adda6_only = ucontrol->value.integer.value[0]; + change = afe_priv->mtkaif_adda6_only != mtkaif_adda6_only; afe_priv->mtkaif_adda6_only = mtkaif_adda6_only; - return 0; + + return change; } static const struct snd_kcontrol_new mtk_adda_controls[] = { -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-02-24 14:07 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-02-24 14:03 [PATCH 0/4] ASoC: mt8192: Fixes from initial glance at kselftest run Mark Brown 2023-02-24 14:03 ` Mark Brown 2023-02-24 14:03 ` [PATCH 1/4] ASoC: mt8192: Remove spammy log messages Mark Brown 2023-02-24 14:03 ` Mark Brown 2023-02-24 19:06 ` Nícolas F. R. A. Prado 2023-02-24 19:06 ` Nícolas F. R. A. Prado 2023-02-24 19:06 ` Nícolas F. R. A. Prado 2023-02-24 19:15 ` Mark Brown 2023-02-24 19:15 ` Mark Brown 2023-02-24 19:15 ` Mark Brown 2023-02-27 8:52 ` AngeloGioacchino Del Regno 2023-02-27 8:52 ` AngeloGioacchino Del Regno 2023-02-24 14:03 ` Mark Brown [this message] 2023-02-24 14:03 ` [PATCH 2/4] ASoC: mt8192: Fix event generation for controls Mark Brown 2023-02-24 19:14 ` Nícolas F. R. A. Prado 2023-02-24 19:14 ` Nícolas F. R. A. Prado 2023-02-24 19:14 ` Nícolas F. R. A. Prado 2023-02-27 8:52 ` AngeloGioacchino Del Regno 2023-02-27 8:52 ` AngeloGioacchino Del Regno 2023-02-24 14:03 ` [PATCH 3/4] ASoC: mt8192: Report an error if when an invalid sidetone gain is written Mark Brown 2023-02-24 14:03 ` Mark Brown 2023-02-24 19:15 ` Nícolas F. R. A. Prado 2023-02-24 19:15 ` Nícolas F. R. A. Prado 2023-02-24 19:15 ` Nícolas F. R. A. Prado 2023-02-27 8:52 ` AngeloGioacchino Del Regno 2023-02-27 8:52 ` AngeloGioacchino Del Regno 2023-02-24 14:03 ` [PATCH 4/4] ASoC: mt8192: Fix range for sidetone positive gain Mark Brown 2023-02-24 14:03 ` Mark Brown 2023-02-24 19:19 ` Nícolas F. R. A. Prado 2023-02-24 19:19 ` Nícolas F. R. A. Prado 2023-02-24 19:19 ` Nícolas F. R. A. Prado 2023-02-27 8:52 ` AngeloGioacchino Del Regno 2023-02-27 8:52 ` AngeloGioacchino Del Regno 2023-02-24 19:40 ` [PATCH 0/4] ASoC: mt8192: Fixes from initial glance at kselftest run Nícolas F. R. A. Prado 2023-02-24 19:40 ` Nícolas F. R. A. Prado 2023-02-24 19:40 ` Nícolas F. R. A. Prado 2023-02-28 18:00 ` Mark Brown 2023-02-28 18:00 ` Mark Brown
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230223-asoc-mt8192-quick-fixes-v1-2-9a85f90368e1@kernel.org \ --to=broonie@kernel.org \ --cc=alsa-devel@alsa-project.org \ --cc=angelogioacchino.delregno@collabora.com \ --cc=lgirdwood@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=matthias.bgg@gmail.com \ --cc=nfraprado@collabora.com \ --cc=perex@perex.cz \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.