ASoC: fsl: lpc3xxx-i2s: Fix error handling and DMA configuration
Subsystems (3)
cover ASoC: fsl: lpc3xxx-i2s: Fix error handling and DMA configuration
From: bui duc phuc <[email protected]>
Hi all,
This series simplifies error handling and fixes incorrect DMA depth macro usage.
Compile-tested only.
Best regards,
Phuc
bui duc phuc (2):
ASoC: fsl: lpc3xxx-i2s: Simplify error handling
ASoC: fsl: lpc3xxx-i2s: Fix DMA depth configuration
sound/soc/fsl/lpc3xxx-i2s.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/2 ASoC: fsl: lpc3xxx-i2s: Simplify error handling
From: bui duc phuc <[email protected]>
Return -EBUSY directly when the I2S channel is already in use.
Also remove the redundant error pointer from the regmap initialization error message, as dev_err_probe() already reports the error.
--- sound/soc/fsl/lpc3xxx-i2s.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
sound/soc/fsl/lpc3xxx-i2s.c +2 -3
@@ -82,8 +82,7 @@ static int lpc3xxx_i2s_startup(struct snd_pcm_substream *substream, struct snd_sif (flag & i2s_info_p->streams_in_use) {dev_warn (dev,"I2S channel is busy\n" ); - ret = -EBUSY ; -return ret; +return -EBUSY ; }if (i2s_info_p->streams_in_use ==0 ) {
@@ -320,7 +319,7 @@ static int lpc32xx_i2s_probe(struct platform_device *pdev) i2s_info_p->regs =devm_regmap_init_mmio (dev, iomem, &lpc32xx_i2s_regconfig);if (IS_ERR (i2s_info_p->regs))return dev_err_probe (dev,PTR_ERR (i2s_info_p->regs), -"failed to init register map: %pe\n" , i2s_info_p->regs); +"failed to init register map\n" ); i2s_info_p->clk =devm_clk_get (dev,NULL );if (IS_ERR (i2s_info_p->clk))
Signature · 1 line
2.43.0
PATCH 2/2 ASoC: fsl: lpc3xxx-i2s: Fix DMA depth configuration
In reply to [email protected]From: bui duc phuc <[email protected]>
The transmit and receive paths use the wrong DMA depth macros. Use the macros corresponding to the DMA registers being configured.
--- sound/soc/fsl/lpc3xxx-i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/fsl/lpc3xxx-i2s.c +2 -2
@@ -198,12 +198,12 @@ static int lpc3xxx_i2s_hw_params(struct snd_pcm_substream *substream,if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) {regmap_write (regs,LPC3XXX_REG_I2S_DMA1 , -LPC3XXX_I2S_DMA1_TX_EN |LPC3XXX_I2S_DMA0_TX_DEPTH (4 )); +LPC3XXX_I2S_DMA1_TX_EN |LPC3XXX_I2S_DMA1_TX_DEPTH (4 ));regmap_write (regs,LPC3XXX_REG_I2S_TX_RATE , (clkx <<8 ) | clky);regmap_write (regs,LPC3XXX_REG_I2S_DAO , tmp); }else {regmap_write (regs,LPC3XXX_REG_I2S_DMA0 , -LPC3XXX_I2S_DMA0_RX_EN |LPC3XXX_I2S_DMA1_RX_DEPTH (4 )); +LPC3XXX_I2S_DMA0_RX_EN |LPC3XXX_I2S_DMA0_RX_DEPTH (4 ));regmap_write (regs,LPC3XXX_REG_I2S_RX_RATE , (clkx <<8 ) | clky);regmap_write (regs,LPC3XXX_REG_I2S_DAI , tmp); }
Signature · 1 line
2.43.0
Mark Brown
maintainerQuoted 10 lines · On Wed, 18 Nov 2026 17:06:29 +0700, [email protected] wrote:
ASoC: fsl: lpc3xxx-i2s: Fix error handling and DMA configuration
From: bui duc phuc <[email protected]>
Hi all,
This series simplifies error handling and fixes incorrect DMA depth macro usage.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.5
Thanks!
[1/2] ASoC: fsl: lpc3xxx-i2s: Simplify error handling
https://git.kernel.org/broonie/sound/c/f8b9931f96c0 [2/2] ASoC: fsl: lpc3xxx-i2s: Fix DMA depth configuration https://git.kernel.org/broonie/sound/c/239eb443bf6c
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