| Message ID | 20220408112928.1326755-1-s.hauer@pengutronix.de |
|---|---|
| Headers | show |
| Series | ASoC: fsl_micfil: Driver updates | expand |
Hi Mark, Ok to apply this series? I just realized that I missed to Cc: you on this series. Let me know if I should resend. Sascha On Fri, Apr 08, 2022 at 01:29:07PM +0200, Sascha Hauer wrote: > This series has a bunch of cleanups for the FSL MICFIL driver. There is > not much chance for regressions in this series as the driver currently > can't work at all. The MICFIL needs multififo support in the i.MX SDMA > engine which is added with this series, see 11/20. > > The multififo support is selected in the dma phandle arguments in the > device tree, the transfer type must be '25' aka IMX_DMATYPE_MULTI_SAI. > This is set already to 25 in the upstream i.MX8M[NM] dtsi files, but the > SDMA driver silently ignores unsupported values instead of throwing an > error. This is fixed in this series and multififo support is added. > > The dmaengine patches have acks from Vinod, so the series is free to > go through the ASoC tree. > > Changes since v4: > - collect more acks > - whitespace cleanup in 16/21 > > Changes since v3: > - Add commit log to "ASoC: fsl_micfil: drop unused variables" > - Fix include name in "ASoC: fsl_micfil: add multi fifo support" > - Drop unnecessary temporary adding of struct fsl_micfil::osr > - Leave default quality setting at 'medium' > - Drop debugging message printed at error level > - collect acks from Shengjiu Wang and Vinod Koul > > Changes since v2: > - Add forgotten commit log to dmaengine patches > - Add patch to move include/linux/platform_data/dma-imx.h to include/linux/dma/imx-dma.h > - Use prefix dmaengine: for dma patches > > Changes since v1: > - Drop unused variable sw_done_sel > - Evaluate sdmac->direction directly instead of storing value in n_fifos > - add missing include linux/bitfield.h > > Sascha Hauer (21): > ASoC: fsl_micfil: Drop unnecessary register read > ASoC: fsl_micfil: Drop unused register read > ASoC: fsl_micfil: drop fsl_micfil_set_mclk_rate() > ASoC: fsl_micfil: do not define SHIFT/MASK for single bits > ASoC: fsl_micfil: use GENMASK to define register bit fields > ASoC: fsl_micfil: use clear/set bits > ASoC: fsl_micfil: drop error messages from failed register accesses > ASoC: fsl_micfil: drop unused variables > dmaengine: imx: Move header to include/dma/ > dmaengine: imx-sdma: error out on unsupported transfer types > dmaengine: imx-sdma: Add multi fifo support > ASoC: fsl_micfil: add multi fifo support > ASoC: fsl_micfil: use define for OSR default value > ASoC: fsl_micfil: Drop get_pdm_clk() > ASoC: fsl_micfil: simplify clock setting > ASoC: fsl_micfil: rework quality setting > ASoC: fsl_micfil: drop unused include > ASoC: fsl_micfil: drop only once used defines > ASoC: fsl_micfil: drop support for undocumented property > ASoC: fsl_micfil: fold fsl_set_clock_params() into its only user > ASoC: fsl_micfil: Remove debug message > > drivers/dma/imx-dma.c | 2 +- > drivers/dma/imx-sdma.c | 76 +++- > drivers/mmc/host/mxcmmc.c | 2 +- > drivers/spi/spi-fsl-lpspi.c | 2 +- > drivers/spi/spi-imx.c | 2 +- > drivers/tty/serial/imx.c | 2 +- > drivers/video/fbdev/mx3fb.c | 2 +- > .../dma-imx.h => dma/imx-dma.h} | 26 +- > sound/soc/fsl/fsl_asrc.c | 2 +- > sound/soc/fsl/fsl_asrc_dma.c | 2 +- > sound/soc/fsl/fsl_easrc.h | 2 +- > sound/soc/fsl/fsl_micfil.c | 369 +++++++----------- > sound/soc/fsl/fsl_micfil.h | 269 +++---------- > sound/soc/fsl/imx-pcm.h | 2 +- > sound/soc/fsl/imx-ssi.h | 2 +- > 15 files changed, 297 insertions(+), 465 deletions(-) > rename include/linux/{platform_data/dma-imx.h => dma/imx-dma.h} (67%) > > -- > 2.30.2 > >
On Thu, Apr 14, 2022 at 09:51:14AM +0200, Sascha Hauer wrote: > Ok to apply this series? I just realized that I missed to Cc: you on > this series. Let me know if I should resend. Please resend. What's the plan with the dmaengine bits - it looks like the ASoC bits are relatively substatantial here?
On Thu, Apr 14, 2022 at 11:29:16AM +0100, Mark Brown wrote: > On Thu, Apr 14, 2022 at 09:51:14AM +0200, Sascha Hauer wrote: > > > Ok to apply this series? I just realized that I missed to Cc: you on > > this series. Let me know if I should resend. > > Please resend. What's the plan with the dmaengine bits - it looks like > the ASoC bits are relatively substatantial here? Ok, I'll resend. I'd like to merge the dmaengine bits through your tree. I have collected the acks from Vinod for this. I just rechecked there are no conflicts with -next so far. Sascha
This series has a bunch of cleanups for the FSL MICFIL driver. There is not much chance for regressions in this series as the driver currently can't work at all. The MICFIL needs multififo support in the i.MX SDMA engine which is added with this series, see 11/20. The multififo support is selected in the dma phandle arguments in the device tree, the transfer type must be '25' aka IMX_DMATYPE_MULTI_SAI. This is set already to 25 in the upstream i.MX8M[NM] dtsi files, but the SDMA driver silently ignores unsupported values instead of throwing an error. This is fixed in this series and multififo support is added. The dmaengine patches have acks from Vinod, so the series is free to go through the ASoC tree. Changes since v4: - collect more acks - whitespace cleanup in 16/21 Changes since v3: - Add commit log to "ASoC: fsl_micfil: drop unused variables" - Fix include name in "ASoC: fsl_micfil: add multi fifo support" - Drop unnecessary temporary adding of struct fsl_micfil::osr - Leave default quality setting at 'medium' - Drop debugging message printed at error level - collect acks from Shengjiu Wang and Vinod Koul Changes since v2: - Add forgotten commit log to dmaengine patches - Add patch to move include/linux/platform_data/dma-imx.h to include/linux/dma/imx-dma.h - Use prefix dmaengine: for dma patches Changes since v1: - Drop unused variable sw_done_sel - Evaluate sdmac->direction directly instead of storing value in n_fifos - add missing include linux/bitfield.h Sascha Hauer (21): ASoC: fsl_micfil: Drop unnecessary register read ASoC: fsl_micfil: Drop unused register read ASoC: fsl_micfil: drop fsl_micfil_set_mclk_rate() ASoC: fsl_micfil: do not define SHIFT/MASK for single bits ASoC: fsl_micfil: use GENMASK to define register bit fields ASoC: fsl_micfil: use clear/set bits ASoC: fsl_micfil: drop error messages from failed register accesses ASoC: fsl_micfil: drop unused variables dmaengine: imx: Move header to include/dma/ dmaengine: imx-sdma: error out on unsupported transfer types dmaengine: imx-sdma: Add multi fifo support ASoC: fsl_micfil: add multi fifo support ASoC: fsl_micfil: use define for OSR default value ASoC: fsl_micfil: Drop get_pdm_clk() ASoC: fsl_micfil: simplify clock setting ASoC: fsl_micfil: rework quality setting ASoC: fsl_micfil: drop unused include ASoC: fsl_micfil: drop only once used defines ASoC: fsl_micfil: drop support for undocumented property ASoC: fsl_micfil: fold fsl_set_clock_params() into its only user ASoC: fsl_micfil: Remove debug message drivers/dma/imx-dma.c | 2 +- drivers/dma/imx-sdma.c | 76 +++- drivers/mmc/host/mxcmmc.c | 2 +- drivers/spi/spi-fsl-lpspi.c | 2 +- drivers/spi/spi-imx.c | 2 +- drivers/tty/serial/imx.c | 2 +- drivers/video/fbdev/mx3fb.c | 2 +- .../dma-imx.h => dma/imx-dma.h} | 26 +- sound/soc/fsl/fsl_asrc.c | 2 +- sound/soc/fsl/fsl_asrc_dma.c | 2 +- sound/soc/fsl/fsl_easrc.h | 2 +- sound/soc/fsl/fsl_micfil.c | 369 +++++++----------- sound/soc/fsl/fsl_micfil.h | 269 +++---------- sound/soc/fsl/imx-pcm.h | 2 +- sound/soc/fsl/imx-ssi.h | 2 +- 15 files changed, 297 insertions(+), 465 deletions(-) rename include/linux/{platform_data/dma-imx.h => dma/imx-dma.h} (67%)