From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
To: "Alexandre Mergnat" <amergnat@baylibre.com>,
"Liam Girdwood" <lgirdwood@gmail.com>,
"Mark Brown" <broonie@kernel.org>,
"Rob Herring" <robh+dt@kernel.org>,
"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
"Conor Dooley" <conor+dt@kernel.org>,
"Matthias Brugger" <matthias.bgg@gmail.com>,
"Lee Jones" <lee@kernel.org>, "Flora Fu" <flora.fu@mediatek.com>,
"Jaroslav Kysela" <perex@perex.cz>,
"Takashi Iwai" <tiwai@suse.com>,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Christian König" <christian.koenig@amd.com>,
"Catalin Marinas" <catalin.marinas@arm.com>,
"Will Deacon" <will@kernel.org>, "Rob Herring" <robh@kernel.org>,
"Krzysztof Kozlowski" <krzk+dt@kernel.org>
Cc: linux-sound@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-media@vger.kernel.org,
dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org
Subject: Re: [PATCH v4 08/16] ASoC: mediatek: mt8365: Add DMIC DAI support
Date: Mon, 20 May 2024 12:27:14 +0200 [thread overview]
Message-ID: <76814cba-3613-4c3e-afb5-aacf5f5db06c@collabora.com> (raw)
In-Reply-To: <20240226-audio-i350-v4-8-082b22186d4c@baylibre.com>
Il 26/04/24 19:22, Alexandre Mergnat ha scritto:
> Add Digital Micro Device Audio Interface support for MT8365 SoC.
>
> Signed-off-by: Alexandre Mergnat <amergnat@baylibre.com>
> ---
> sound/soc/mediatek/mt8365/mt8365-dai-dmic.c | 347 ++++++++++++++++++++++++++++
> 1 file changed, 347 insertions(+)
>
> diff --git a/sound/soc/mediatek/mt8365/mt8365-dai-dmic.c b/sound/soc/mediatek/mt8365/mt8365-dai-dmic.c
> new file mode 100644
> index 000000000000..0dd606274d8e
> --- /dev/null
> +++ b/sound/soc/mediatek/mt8365/mt8365-dai-dmic.c
> @@ -0,0 +1,347 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Mediatek 8365 ALSA SoC Audio DAI DMIC Control
> + *
> + * Copyright (c) 2024 MediaTek Inc.
> + * Authors: Jia Zeng <jia.zeng@mediatek.com>
> + * Alexandre Mergnat <amergnat@baylibre.com>
> + */
> +
> +#include <linux/bitops.h>
> +#include <linux/regmap.h>
> +#include <sound/pcm_params.h>
> +#include "mt8365-afe-clk.h"
> +#include "mt8365-afe-common.h"
> +
> +struct mt8365_dmic_data {
> + bool two_wire_mode;
> + unsigned int clk_phase_sel_ch1;
> + unsigned int clk_phase_sel_ch2;
> + bool iir_on;
> + unsigned int irr_mode;
> + unsigned int dmic_mode;
> + unsigned int dmic_channel;
> +};
> +
> +static int get_chan_reg(unsigned int channel)
> +{
> + switch (channel) {
> + case 8:
> + fallthrough;
> + case 7:
> + return AFE_DMIC3_UL_SRC_CON0;
> + case 6:
> + fallthrough;
> + case 5:
> + return AFE_DMIC2_UL_SRC_CON0;
> + case 4:
> + fallthrough;
> + case 3:
> + return AFE_DMIC1_UL_SRC_CON0;
> + case 2:
> + fallthrough;
> + case 1:
> + return AFE_DMIC0_UL_SRC_CON0;
> + default:
> + return -EINVAL;
> + }
> +}
> +
> +/* DAI Drivers */
> +
> +static void audio_dmic_adda_enable(struct mtk_base_afe *afe)
> +{
> + mt8365_dai_enable_adda_on(afe);
> + regmap_update_bits(afe->regmap, AFE_ADDA_UL_DL_CON0,
> + AFE_ADDA_UL_DL_DMIC_CLKDIV_ON,
> + AFE_ADDA_UL_DL_DMIC_CLKDIV_ON);
> +}
> +
> +static void audio_dmic_adda_disable(struct mtk_base_afe *afe)
> +{
> + regmap_update_bits(afe->regmap, AFE_ADDA_UL_DL_CON0,
> + AFE_ADDA_UL_DL_DMIC_CLKDIV_ON,
> + ~AFE_ADDA_UL_DL_DMIC_CLKDIV_ON);
> + mt8365_dai_disable_adda_on(afe);
> +}
> +
> +static void mt8365_dai_enable_dmic(struct mtk_base_afe *afe,
> + struct snd_pcm_substream *substream,
> + struct snd_soc_dai *dai)
> +{
> + struct mt8365_afe_private *afe_priv = afe->platform_priv;
> + struct mt8365_dmic_data *dmic_data = afe_priv->dai_priv[MT8365_AFE_IO_DMIC];
> + unsigned int val_mask;
> + int reg = get_chan_reg(dmic_data->dmic_channel);
> +
> + if (reg < 0)
> + return;
> +
> + /* val and mask will be always same to enable */
> + val_mask = DMIC_TOP_CON_CH1_ON |
> + DMIC_TOP_CON_CH2_ON |
> + DMIC_TOP_CON_SRC_ON;
> +
> + regmap_update_bits(afe->regmap, reg, val_mask, val_mask);
> +}
> +
> +static void mt8365_dai_disable_dmic(struct mtk_base_afe *afe,
> + struct snd_pcm_substream *substream,
> + struct snd_soc_dai *dai)
> +{
> + struct mt8365_afe_private *afe_priv = afe->platform_priv;
> + struct mt8365_dmic_data *dmic_data = afe_priv->dai_priv[MT8365_AFE_IO_DMIC];
> + unsigned int mask;
> + int reg = get_chan_reg(dmic_data->dmic_channel);
> +
> + if (reg < 0)
> + return;
> +
> + dev_info(afe->dev, "%s dmic_channel %d\n",
> + __func__, dmic_data->dmic_channel);
Please, either remove this print, or use dev_dbg().
In case you're not removing it, fits in one line.
> +
> + mask = DMIC_TOP_CON_CH1_ON |
> + DMIC_TOP_CON_CH2_ON |
> + DMIC_TOP_CON_SRC_ON |
> + DMIC_TOP_CON_SDM3_LEVEL_MODE;
> +
> + /* Set all masked values to 0 */
> + regmap_update_bits(afe->regmap, reg, mask, 0);
> +}
> +
> +static const struct reg_sequence mt8365_dmic_iir_coeff[] = {
> + { AFE_DMIC0_IIR_COEF_02_01, 0x00000000 },
> + { AFE_DMIC0_IIR_COEF_04_03, 0x00003FB8 },
> + { AFE_DMIC0_IIR_COEF_06_05, 0x3FB80000 },
> + { AFE_DMIC0_IIR_COEF_08_07, 0x3FB80000 },
> + { AFE_DMIC0_IIR_COEF_10_09, 0x0000C048 },
> + { AFE_DMIC1_IIR_COEF_02_01, 0x00000000 },
> + { AFE_DMIC1_IIR_COEF_04_03, 0x00003FB8 },
> + { AFE_DMIC1_IIR_COEF_06_05, 0x3FB80000 },
> + { AFE_DMIC1_IIR_COEF_08_07, 0x3FB80000 },
> + { AFE_DMIC1_IIR_COEF_10_09, 0x0000C048 },
> + { AFE_DMIC2_IIR_COEF_02_01, 0x00000000 },
> + { AFE_DMIC2_IIR_COEF_04_03, 0x00003FB8 },
> + { AFE_DMIC2_IIR_COEF_06_05, 0x3FB80000 },
> + { AFE_DMIC2_IIR_COEF_08_07, 0x3FB80000 },
> + { AFE_DMIC2_IIR_COEF_10_09, 0x0000C048 },
> + { AFE_DMIC3_IIR_COEF_02_01, 0x00000000 },
> + { AFE_DMIC3_IIR_COEF_04_03, 0x00003FB8 },
> + { AFE_DMIC3_IIR_COEF_06_05, 0x3FB80000 },
> + { AFE_DMIC3_IIR_COEF_08_07, 0x3FB80000 },
> + { AFE_DMIC3_IIR_COEF_10_09, 0x0000C048 },
> +};
> +
> +static int mt8365_dai_load_dmic_iir_coeff_table(struct mtk_base_afe *afe)
> +{
> + return regmap_multi_reg_write(afe->regmap,
> + mt8365_dmic_iir_coeff,
> + ARRAY_SIZE(mt8365_dmic_iir_coeff));
> +}
> +
> +static int mt8365_dai_configure_dmic(struct mtk_base_afe *afe,
> + struct snd_pcm_substream *substream,
> + struct snd_soc_dai *dai)
> +{
> + struct mt8365_afe_private *afe_priv = afe->platform_priv;
> + struct mt8365_dmic_data *dmic_data = afe_priv->dai_priv[MT8365_AFE_IO_DMIC];
> + bool two_wire_mode = dmic_data->two_wire_mode;
> + unsigned int clk_phase_sel_ch1 = dmic_data->clk_phase_sel_ch1;
> + unsigned int clk_phase_sel_ch2 = dmic_data->clk_phase_sel_ch2;
> + unsigned int val = 0;
> + unsigned int mask = 0;
> + unsigned int rate = dai->rate;
> + int reg = get_chan_reg(dai->channels);
> +
> + if (reg < 0)
> + return -EINVAL;
> +
> + dmic_data->dmic_channel = dai->channels;
> +
> + val |= DMIC_TOP_CON_SDM3_LEVEL_MODE;
> + mask |= DMIC_TOP_CON_SDM3_LEVEL_MODE;
> +
> + if (two_wire_mode) {
> + val |= DMIC_TOP_CON_TWO_WIRE_MODE;
> + mask |= DMIC_TOP_CON_TWO_WIRE_MODE;
> + } else {
> + val |= FIELD_PREP(DMIC_TOP_CON_CK_PHASE_SEL_CH1,
> + clk_phase_sel_ch1);
> + val |= FIELD_PREP(DMIC_TOP_CON_CK_PHASE_SEL_CH2,
> + clk_phase_sel_ch2);
> + mask |= DMIC_TOP_CON_CK_PHASE_SEL_CH1;
> + mask |= DMIC_TOP_CON_CK_PHASE_SEL_CH2;
> + }
> +
> + switch (rate) {
> + case 48000:
> + val |= DMIC_TOP_CON_VOICE_MODE_48K;
> + break;
> + case 32000:
> + val |= DMIC_TOP_CON_VOICE_MODE_32K;
> + break;
> + case 16000:
> + val |= DMIC_TOP_CON_VOICE_MODE_16K;
> + break;
> + case 8000:
> + val |= DMIC_TOP_CON_VOICE_MODE_8K;
> + break;
> + default:
> + return -EINVAL;
> + }
> + mask |= DMIC_TOP_CON_VOICE_MODE_MASK;
You initialize the mask...
> +
> + regmap_update_bits(afe->regmap, reg, DMIC_TOP_CON_CONFIG_MASK, val);
...but then you don't use it? :-)
> +
> + return 0;
> +}
Cheers,
Angelo
next prev parent reply other threads:[~2024-05-20 10:27 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-26 17:22 [PATCH v4 00/16] Add audio support for the MediaTek Genio 350-evk board Alexandre Mergnat
2024-04-26 17:22 ` [PATCH v4 01/16] ASoC: dt-bindings: mediatek,mt8365-afe: Add audio afe document Alexandre Mergnat
2024-04-29 5:58 ` Krzysztof Kozlowski
2024-04-26 17:22 ` [PATCH v4 02/16] ASoC: dt-bindings: mediatek,mt8365-mt6357: Add audio sound card document Alexandre Mergnat
2024-04-29 5:59 ` Krzysztof Kozlowski
2024-04-26 17:22 ` [PATCH v4 03/16] dt-bindings: mfd: mediatek: Add codec property for MT6357 PMIC Alexandre Mergnat
2024-04-29 6:03 ` Krzysztof Kozlowski
2024-04-26 17:22 ` [PATCH v4 04/16] ASoC: mediatek: mt8365: Add common header Alexandre Mergnat
2024-04-26 17:22 ` [PATCH v4 05/16] SoC: mediatek: mt8365: support audio clock control Alexandre Mergnat
2024-04-29 14:44 ` Mark Brown
2024-05-20 10:38 ` AngeloGioacchino Del Regno
2024-04-26 17:22 ` [PATCH v4 06/16] ASoC: mediatek: mt8365: Add I2S DAI support Alexandre Mergnat
2024-05-20 10:27 ` AngeloGioacchino Del Regno
2024-04-26 17:22 ` [PATCH v4 07/16] ASoC: mediatek: mt8365: Add ADDA " Alexandre Mergnat
2024-05-20 10:27 ` AngeloGioacchino Del Regno
2024-05-22 9:23 ` Alexandre Mergnat
2024-04-26 17:22 ` [PATCH v4 08/16] ASoC: mediatek: mt8365: Add DMIC " Alexandre Mergnat
2024-05-20 10:27 ` AngeloGioacchino Del Regno [this message]
2024-04-26 17:22 ` [PATCH v4 09/16] ASoC: mediatek: mt8365: Add PCM " Alexandre Mergnat
2024-05-20 10:28 ` AngeloGioacchino Del Regno
2024-04-26 17:22 ` [PATCH v4 10/16] ASoc: mediatek: mt8365: Add a specific soundcard for EVK amergnat
2024-05-20 10:30 ` AngeloGioacchino Del Regno
2024-04-26 17:22 ` [PATCH v4 11/16] ASoC: mediatek: mt8365: Add platform driver Alexandre Mergnat
2024-05-20 10:32 ` AngeloGioacchino Del Regno
2024-04-26 17:22 ` [PATCH v4 12/16] ASoC: codecs: add MT6357 support amergnat
2024-04-26 17:22 ` [PATCH v4 13/16] ASoC: mediatek: Add MT8365 support Alexandre Mergnat
2024-04-26 17:22 ` [PATCH v4 14/16] arm64: defconfig: enable mt8365 sound Alexandre Mergnat
2024-05-20 10:39 ` AngeloGioacchino Del Regno
2024-04-26 17:22 ` [PATCH v4 15/16] arm64: dts: mediatek: add afe support for mt8365 SoC Alexandre Mergnat
2024-04-26 17:22 ` [PATCH v4 16/16] arm64: dts: mediatek: add audio support for mt8365-evk Alexandre Mergnat
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=76814cba-3613-4c3e-afb5-aacf5f5db06c@collabora.com \
--to=angelogioacchino.delregno@collabora.com \
--cc=amergnat@baylibre.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=christian.koenig@amd.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=flora.fu@mediatek.com \
--cc=krzk+dt@kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lee@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-sound@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=perex@perex.cz \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
--cc=sumit.semwal@linaro.org \
--cc=tiwai@suse.com \
--cc=will@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).