From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
To: Jonathan Marek <jonathan@marek.ca>, linux-arm-msm@vger.kernel.org
Cc: Banajit Goswami <bgoswami@codeaurora.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
"moderated list:QCOM AUDIO (ASoC) DRIVERS"
<alsa-devel@alsa-project.org>,
open list <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] ASoC: codecs: lpass-va-macro: mute/unmute all active decimators
Date: Fri, 5 Mar 2021 09:22:11 +0000 [thread overview]
Message-ID: <32f49fa9-136c-91a5-5790-373651719fda@linaro.org> (raw)
In-Reply-To: <20210304215646.17956-1-jonathan@marek.ca>
Thanks Jonathan for testing and fixing this use case!
On 04/03/2021 21:56, Jonathan Marek wrote:
> An interface can have multiple decimators enabled, so loop over all active
> decimators. Otherwise only one channel will be unmuted, and other channels
> will be zero. This fixes recording from dual DMIC as a single two channel
> stream.
>
> Also remove the now unused "active_decimator" field.
>
> Fixes: 908e6b1df26e ("ASoC: codecs: lpass-va-macro: Add support to VA Macro")
> Signed-off-by: Jonathan Marek <jonathan@marek.ca>
> ---
LGTM,
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
--srini
> sound/soc/codecs/lpass-va-macro.c | 28 +++++++++++++---------------
> 1 file changed, 13 insertions(+), 15 deletions(-)
>
> diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c
> index 91e6890d6efcb..3d6976a3d9e42 100644
> --- a/sound/soc/codecs/lpass-va-macro.c
> +++ b/sound/soc/codecs/lpass-va-macro.c
> @@ -189,7 +189,6 @@ struct va_macro {
> struct device *dev;
> unsigned long active_ch_mask[VA_MACRO_MAX_DAIS];
> unsigned long active_ch_cnt[VA_MACRO_MAX_DAIS];
> - unsigned long active_decimator[VA_MACRO_MAX_DAIS];
> u16 dmic_clk_div;
>
> int dec_mode[VA_MACRO_NUM_DECIMATORS];
> @@ -549,11 +548,9 @@ static int va_macro_tx_mixer_put(struct snd_kcontrol *kcontrol,
> if (enable) {
> set_bit(dec_id, &va->active_ch_mask[dai_id]);
> va->active_ch_cnt[dai_id]++;
> - va->active_decimator[dai_id] = dec_id;
> } else {
> clear_bit(dec_id, &va->active_ch_mask[dai_id]);
> va->active_ch_cnt[dai_id]--;
> - va->active_decimator[dai_id] = -1;
> }
>
> snd_soc_dapm_mixer_update_power(widget->dapm, kcontrol, enable, update);
> @@ -880,18 +877,19 @@ static int va_macro_digital_mute(struct snd_soc_dai *dai, int mute, int stream)
> struct va_macro *va = snd_soc_component_get_drvdata(component);
> u16 tx_vol_ctl_reg, decimator;
>
> - decimator = va->active_decimator[dai->id];
> -
> - tx_vol_ctl_reg = CDC_VA_TX0_TX_PATH_CTL +
> - VA_MACRO_TX_PATH_OFFSET * decimator;
> - if (mute)
> - snd_soc_component_update_bits(component, tx_vol_ctl_reg,
> - CDC_VA_TX_PATH_PGA_MUTE_EN_MASK,
> - CDC_VA_TX_PATH_PGA_MUTE_EN);
> - else
> - snd_soc_component_update_bits(component, tx_vol_ctl_reg,
> - CDC_VA_TX_PATH_PGA_MUTE_EN_MASK,
> - CDC_VA_TX_PATH_PGA_MUTE_DISABLE);
> + for_each_set_bit(decimator, &va->active_ch_mask[dai->id],
> + VA_MACRO_DEC_MAX) {
> + tx_vol_ctl_reg = CDC_VA_TX0_TX_PATH_CTL +
> + VA_MACRO_TX_PATH_OFFSET * decimator;
> + if (mute)
> + snd_soc_component_update_bits(component, tx_vol_ctl_reg,
> + CDC_VA_TX_PATH_PGA_MUTE_EN_MASK,
> + CDC_VA_TX_PATH_PGA_MUTE_EN);
> + else
> + snd_soc_component_update_bits(component, tx_vol_ctl_reg,
> + CDC_VA_TX_PATH_PGA_MUTE_EN_MASK,
> + CDC_VA_TX_PATH_PGA_MUTE_DISABLE);
> + }
>
> return 0;
> }
>
WARNING: multiple messages have this Message-ID (diff)
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
To: Jonathan Marek <jonathan@marek.ca>, linux-arm-msm@vger.kernel.org
Cc: "moderated list:QCOM AUDIO \(ASoC\) DRIVERS"
<alsa-devel@alsa-project.org>,
Banajit Goswami <bgoswami@codeaurora.org>,
Liam Girdwood <lgirdwood@gmail.com>,
open list <linux-kernel@vger.kernel.org>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Takashi Iwai <tiwai@suse.com>, Mark Brown <broonie@kernel.org>
Subject: Re: [PATCH] ASoC: codecs: lpass-va-macro: mute/unmute all active decimators
Date: Fri, 5 Mar 2021 09:22:11 +0000 [thread overview]
Message-ID: <32f49fa9-136c-91a5-5790-373651719fda@linaro.org> (raw)
In-Reply-To: <20210304215646.17956-1-jonathan@marek.ca>
Thanks Jonathan for testing and fixing this use case!
On 04/03/2021 21:56, Jonathan Marek wrote:
> An interface can have multiple decimators enabled, so loop over all active
> decimators. Otherwise only one channel will be unmuted, and other channels
> will be zero. This fixes recording from dual DMIC as a single two channel
> stream.
>
> Also remove the now unused "active_decimator" field.
>
> Fixes: 908e6b1df26e ("ASoC: codecs: lpass-va-macro: Add support to VA Macro")
> Signed-off-by: Jonathan Marek <jonathan@marek.ca>
> ---
LGTM,
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
--srini
> sound/soc/codecs/lpass-va-macro.c | 28 +++++++++++++---------------
> 1 file changed, 13 insertions(+), 15 deletions(-)
>
> diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c
> index 91e6890d6efcb..3d6976a3d9e42 100644
> --- a/sound/soc/codecs/lpass-va-macro.c
> +++ b/sound/soc/codecs/lpass-va-macro.c
> @@ -189,7 +189,6 @@ struct va_macro {
> struct device *dev;
> unsigned long active_ch_mask[VA_MACRO_MAX_DAIS];
> unsigned long active_ch_cnt[VA_MACRO_MAX_DAIS];
> - unsigned long active_decimator[VA_MACRO_MAX_DAIS];
> u16 dmic_clk_div;
>
> int dec_mode[VA_MACRO_NUM_DECIMATORS];
> @@ -549,11 +548,9 @@ static int va_macro_tx_mixer_put(struct snd_kcontrol *kcontrol,
> if (enable) {
> set_bit(dec_id, &va->active_ch_mask[dai_id]);
> va->active_ch_cnt[dai_id]++;
> - va->active_decimator[dai_id] = dec_id;
> } else {
> clear_bit(dec_id, &va->active_ch_mask[dai_id]);
> va->active_ch_cnt[dai_id]--;
> - va->active_decimator[dai_id] = -1;
> }
>
> snd_soc_dapm_mixer_update_power(widget->dapm, kcontrol, enable, update);
> @@ -880,18 +877,19 @@ static int va_macro_digital_mute(struct snd_soc_dai *dai, int mute, int stream)
> struct va_macro *va = snd_soc_component_get_drvdata(component);
> u16 tx_vol_ctl_reg, decimator;
>
> - decimator = va->active_decimator[dai->id];
> -
> - tx_vol_ctl_reg = CDC_VA_TX0_TX_PATH_CTL +
> - VA_MACRO_TX_PATH_OFFSET * decimator;
> - if (mute)
> - snd_soc_component_update_bits(component, tx_vol_ctl_reg,
> - CDC_VA_TX_PATH_PGA_MUTE_EN_MASK,
> - CDC_VA_TX_PATH_PGA_MUTE_EN);
> - else
> - snd_soc_component_update_bits(component, tx_vol_ctl_reg,
> - CDC_VA_TX_PATH_PGA_MUTE_EN_MASK,
> - CDC_VA_TX_PATH_PGA_MUTE_DISABLE);
> + for_each_set_bit(decimator, &va->active_ch_mask[dai->id],
> + VA_MACRO_DEC_MAX) {
> + tx_vol_ctl_reg = CDC_VA_TX0_TX_PATH_CTL +
> + VA_MACRO_TX_PATH_OFFSET * decimator;
> + if (mute)
> + snd_soc_component_update_bits(component, tx_vol_ctl_reg,
> + CDC_VA_TX_PATH_PGA_MUTE_EN_MASK,
> + CDC_VA_TX_PATH_PGA_MUTE_EN);
> + else
> + snd_soc_component_update_bits(component, tx_vol_ctl_reg,
> + CDC_VA_TX_PATH_PGA_MUTE_EN_MASK,
> + CDC_VA_TX_PATH_PGA_MUTE_DISABLE);
> + }
>
> return 0;
> }
>
next prev parent reply other threads:[~2021-03-05 9:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-04 21:56 [PATCH] ASoC: codecs: lpass-va-macro: mute/unmute all active decimators Jonathan Marek
2021-03-04 21:56 ` Jonathan Marek
2021-03-05 9:22 ` Srinivas Kandagatla [this message]
2021-03-05 9:22 ` Srinivas Kandagatla
2021-03-08 16:06 ` Mark Brown
2021-03-08 16:06 ` Mark Brown
2021-05-26 19:03 ` patchwork-bot+linux-arm-msm
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=32f49fa9-136c-91a5-5790-373651719fda@linaro.org \
--to=srinivas.kandagatla@linaro.org \
--cc=alsa-devel@alsa-project.org \
--cc=bgoswami@codeaurora.org \
--cc=broonie@kernel.org \
--cc=jonathan@marek.ca \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.intel.com \
--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: link
Be 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.