[PATCH 0/3] Add support for MICFIL on i.MX93 platform
This patchset supports MICFIL on i.MX93 platform.
Chancel Liu (3): ASoC: dt-bindings: fsl,micfil: Add compatible string for i.MX93 platform ASoC: fsl_micfil: Add support for i.MX93 platform ASoC: fsl_micfil: Add support when using eDMA
.../devicetree/bindings/sound/fsl,micfil.yaml | 1 + sound/soc/fsl/fsl_micfil.c | 13 +++++++++++++ 2 files changed, 14 insertions(+)
-- 2.25.1
Add compatible string "fsl,imx93-micfil" for i.MX93 platform
Signed-off-by: Chancel Liu chancel.liu@nxp.com --- Documentation/devicetree/bindings/sound/fsl,micfil.yaml | 1 + 1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/sound/fsl,micfil.yaml b/Documentation/devicetree/bindings/sound/fsl,micfil.yaml index 64d57758ee67..4b99a18c79a0 100644 --- a/Documentation/devicetree/bindings/sound/fsl,micfil.yaml +++ b/Documentation/devicetree/bindings/sound/fsl,micfil.yaml @@ -18,6 +18,7 @@ properties: enum: - fsl,imx8mm-micfil - fsl,imx8mp-micfil + - fsl,imx93-micfil
reg: maxItems: 1
On Fri, 28 Oct 2022 16:27:48 +0800, Chancel Liu wrote:
Add compatible string "fsl,imx93-micfil" for i.MX93 platform
Signed-off-by: Chancel Liu chancel.liu@nxp.com
Documentation/devicetree/bindings/sound/fsl,micfil.yaml | 1 + 1 file changed, 1 insertion(+)
Acked-by: Rob Herring robh@kernel.org
Add compatible string and specific soc data to support MICFIL on i.MX93 platform.
Signed-off-by: Chancel Liu chancel.liu@nxp.com --- sound/soc/fsl/fsl_micfil.c | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index eeaa75fb9196..b8a9504441df 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -82,9 +82,18 @@ static struct fsl_micfil_soc_data fsl_micfil_imx8mp = { .formats = SNDRV_PCM_FMTBIT_S32_LE, };
+static struct fsl_micfil_soc_data fsl_micfil_imx93 = { + .imx = true, + .fifos = 8, + .fifo_depth = 32, + .dataline = 0xf, + .formats = SNDRV_PCM_FMTBIT_S32_LE, +}; + static const struct of_device_id fsl_micfil_dt_ids[] = { { .compatible = "fsl,imx8mm-micfil", .data = &fsl_micfil_imx8mm }, { .compatible = "fsl,imx8mp-micfil", .data = &fsl_micfil_imx8mp }, + { .compatible = "fsl,imx93-micfil", .data = &fsl_micfil_imx93 }, {} }; MODULE_DEVICE_TABLE(of, fsl_micfil_dt_ids);
On Fri, Oct 28, 2022 at 4:28 PM Chancel Liu chancel.liu@nxp.com wrote:
Add compatible string and specific soc data to support MICFIL on i.MX93 platform.
Signed-off-by: Chancel Liu chancel.liu@nxp.com
Acked-by: Shengjiu Wang shengjiu.wang@gmail.com
Best regards wang shengjiu
sound/soc/fsl/fsl_micfil.c | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index eeaa75fb9196..b8a9504441df 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -82,9 +82,18 @@ static struct fsl_micfil_soc_data fsl_micfil_imx8mp = { .formats = SNDRV_PCM_FMTBIT_S32_LE, };
+static struct fsl_micfil_soc_data fsl_micfil_imx93 = {
.imx = true,.fifos = 8,.fifo_depth = 32,.dataline = 0xf,.formats = SNDRV_PCM_FMTBIT_S32_LE,+};
static const struct of_device_id fsl_micfil_dt_ids[] = { { .compatible = "fsl,imx8mm-micfil", .data = &fsl_micfil_imx8mm }, { .compatible = "fsl,imx8mp-micfil", .data = &fsl_micfil_imx8mp },
{ .compatible = "fsl,imx93-micfil", .data = &fsl_micfil_imx93 }, {}}; MODULE_DEVICE_TABLE(of, fsl_micfil_dt_ids); -- 2.25.1
On i.MX93 platform MICFIL uses eDMA. The maxburst should be set to the number of channels in eDMA multiple FIFO mode.
Signed-off-by: Chancel Liu chancel.liu@nxp.com --- sound/soc/fsl/fsl_micfil.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index b8a9504441df..22e75c14cac4 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -63,6 +63,7 @@ struct fsl_micfil_soc_data { unsigned int fifo_depth; unsigned int dataline; bool imx; + bool use_edma; u64 formats; };
@@ -88,6 +89,7 @@ static struct fsl_micfil_soc_data fsl_micfil_imx93 = { .fifo_depth = 32, .dataline = 0xf, .formats = SNDRV_PCM_FMTBIT_S32_LE, + .use_edma = true, };
static const struct of_device_id fsl_micfil_dt_ids[] = { @@ -690,6 +692,8 @@ static int fsl_micfil_hw_params(struct snd_pcm_substream *substream, micfil->sdmacfg.n_fifos_src = channels; micfil->sdmacfg.sw_done = true; micfil->dma_params_rx.maxburst = channels * MICFIL_DMA_MAXBURST_RX; + if (micfil->soc->use_edma) + micfil->dma_params_rx.maxburst = channels;
return 0; }
On Fri, Oct 28, 2022 at 4:28 PM Chancel Liu chancel.liu@nxp.com wrote:
On i.MX93 platform MICFIL uses eDMA. The maxburst should be set to the number of channels in eDMA multiple FIFO mode.
Signed-off-by: Chancel Liu chancel.liu@nxp.com
Acked-by: Shengjiu Wang shengjiu.wang@gmail.com
best regards wang shengjiu
sound/soc/fsl/fsl_micfil.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index b8a9504441df..22e75c14cac4 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -63,6 +63,7 @@ struct fsl_micfil_soc_data { unsigned int fifo_depth; unsigned int dataline; bool imx;
bool use_edma; u64 formats;};
@@ -88,6 +89,7 @@ static struct fsl_micfil_soc_data fsl_micfil_imx93 = { .fifo_depth = 32, .dataline = 0xf, .formats = SNDRV_PCM_FMTBIT_S32_LE,
.use_edma = true,};
static const struct of_device_id fsl_micfil_dt_ids[] = { @@ -690,6 +692,8 @@ static int fsl_micfil_hw_params(struct snd_pcm_substream *substream, micfil->sdmacfg.n_fifos_src = channels; micfil->sdmacfg.sw_done = true; micfil->dma_params_rx.maxburst = channels * MICFIL_DMA_MAXBURST_RX;
if (micfil->soc->use_edma)micfil->dma_params_rx.maxburst = channels; return 0;}
2.25.1
On Fri, 28 Oct 2022 16:27:47 +0800, Chancel Liu wrote:
This patchset supports MICFIL on i.MX93 platform.
Chancel Liu (3): ASoC: dt-bindings: fsl,micfil: Add compatible string for i.MX93 platform ASoC: fsl_micfil: Add support for i.MX93 platform ASoC: fsl_micfil: Add support when using eDMA
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/3] ASoC: dt-bindings: fsl,micfil: Add compatible string for i.MX93 platform commit: fb3425689699daebecf27a37d729ae43ef66ebab [2/3] ASoC: fsl_micfil: Add support for i.MX93 platform commit: a10a52541f644a1fdf8876d474f31a54c4142ccc [3/3] ASoC: fsl_micfil: Add support when using eDMA commit: 77a7a6e9a94df0ac7ba46677b5ce4a743a931fce
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
participants (4)
-
Chancel Liu -
Mark Brown -
Rob Herring -
Shengjiu Wang