January 2022 - Alsa-devel - mailman.alsa-project.org

[PATCH 0/2] ASoC: Intel: sof_rt5682: add two derivative options
by Pierre-Louis Bossart 25 Jan '22

25 Jan '22

Add support for platforms without amplifier (headset codec only) and without Intel graphics. Ajye Huang (1): ASoC: Intel: sof_rt5682: Add support for platform without amplifier Yong Zhi (1): ASoC: Intel: sof_rt5682: add support for systems without i915 audio sound/soc/intel/boards/sof_rt5682.c | 40 ++++++++++++++----- .../intel/common/soc-acpi-intel-adl-match.c | 6 +++ 2 files changed, 36 insertions(+), 10 deletions(-) -- 2.25.1

2 3

[PATCH] ASoC: soc-generic-dmaengine-pcm: separate max_buffer_size assignment
by Shengjiu Wang 25 Jan '22

25 Jan '22

The config->pcm_hardware may be NULL when config->prealloc_buffer_size is not zero, so it is better to move max_buffer_size assignment under a separate condition. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/soc-generic-dmaengine-pcm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index c54c8ca8d715..8659cb1794f1 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -237,13 +237,15 @@ static int dmaengine_pcm_new(struct snd_soc_component *component, size_t max_buffer_size; unsigned int i; - if (config && config->prealloc_buffer_size) { + if (config && config->prealloc_buffer_size) prealloc_buffer_size = config->prealloc_buffer_size; - max_buffer_size = config->pcm_hardware->buffer_bytes_max; - } else { + else prealloc_buffer_size = prealloc_buffer_size_kbytes * 1024; + + if (config && config->pcm_hardware && config->pcm_hardware->buffer_bytes_max) + max_buffer_size = config->pcm_hardware->buffer_bytes_max; + else max_buffer_size = SIZE_MAX; - } for_each_pcm_streams(i) { struct snd_pcm_substream *substream = rtd->pcm->streams[i].substream; -- 2.17.1

2 1

[PATCH v3 0/2] ASoC: add support for TAS5805M digital amplifier
by Daniel Beer 25 Jan '22

25 Jan '22

This pair of patches implements support for the TAS5805M class D audio amplifier. This driver, and the example configuration in the device-tree file, were originally based on a 4.19 series kernel and have been modified slightly from the tested version. This resubmission differs from v2 as follows: - The redundant mutex has been removed - DSP configuration is loaded as a firmware image, rather than directly from the device-tree - The volume control returns non-zero when the values have changed, as required - Some corrections to device-tree example Daniel Beer (2): ASoC: add support for TAS5805M digital amplifier ASoC: dt-bindings: add bindings for TI TAS5805M. .../devicetree/bindings/sound/tas5805m.yaml | 56 ++ sound/soc/codecs/Kconfig | 9 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/tas5805m.c | 567 ++++++++++++++++++ 4 files changed, 634 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/tas5805m.yaml create mode 100644 sound/soc/codecs/tas5805m.c -- 2.30.2

2 3

[PATCH] sound/soc/samsung: remove unneeded ret variable
by cgel.zte＠gmail.com 25 Jan '22

25 Jan '22

From: Minghao Chi <chi.minghao(a)zte.com.cn> Return value from io_remap_pfn_range() directly instead of taking this in another redundant variable. Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Minghao Chi <chi.minghao(a)zte.com.cn> Signed-off-by: CGEL ZTE <cgel.zte(a)gmail.com> --- sound/soc/samsung/idma.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c index c3f1b054e238..402ccadad46c 100644 --- a/sound/soc/samsung/idma.c +++ b/sound/soc/samsung/idma.c @@ -244,17 +244,14 @@ static int idma_mmap(struct snd_soc_component *component, { struct snd_pcm_runtime *runtime = substream->runtime; unsigned long size, offset; - int ret; /* From snd_pcm_lib_mmap_iomem */ vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); size = vma->vm_end - vma->vm_start; offset = vma->vm_pgoff << PAGE_SHIFT; - ret = io_remap_pfn_range(vma, vma->vm_start, + return io_remap_pfn_range(vma, vma->vm_start, (runtime->dma_addr + offset) >> PAGE_SHIFT, size, vma->vm_page_prot); - - return ret; } static irqreturn_t iis_irq(int irqno, void *dev_id) -- 2.25.1

3 3

[PATCH v2 0/5] fsl-asoc-card: Add optional dt property for setting mclk-id
by Ariel D'Alessandro 25 Jan '22

25 Jan '22

This is a follow up of patchset: [RFC patch 0/5] Support BCLK input clock in tlv320aic31xx Sound cards may allow using different main clock inputs. In the generic fsl-asoc-card driver, these values are hardcoded for each specific card configuration. Let's make it more flexible, allowing setting mclk-id from the device-tree node. Changes in v2: * Split patch adding mckl-id property. Ariel D'Alessandro (5): dt-bindings: sound: Rename tlv320aic31xx-micbias as tlv320aic31xx dt-bindings: tlv320aic31xx: Define PLL clock inputs ASoC: bindings: fsl-asoc-card: Add mclk-id optional property ASoC: fsl-asoc-card: Add optional dt property for setting mclk-id ASoC: fsl-asoc-card: Remove BCLK default value for tlv320aic31xx card .../devicetree/bindings/sound/fsl-asoc-card.txt | 1 + .../devicetree/bindings/sound/tlv320aic31xx.txt | 2 +- arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- include/dt-bindings/sound/tlv320aic31xx-micbias.h | 9 --------- include/dt-bindings/sound/tlv320aic31xx.h | 14 ++++++++++++++ sound/soc/codecs/tlv320aic31xx.c | 2 +- sound/soc/fsl/fsl-asoc-card.c | 7 ++++++- 7 files changed, 24 insertions(+), 13 deletions(-) delete mode 100644 include/dt-bindings/sound/tlv320aic31xx-micbias.h create mode 100644 include/dt-bindings/sound/tlv320aic31xx.h -- 2.34.1

2 7

[PATCH v2] ASoC: codecs: Check for error pointer after calling devm_regmap_init_mmio
by Jiasheng Jiang 25 Jan '22

25 Jan '22

Since the possible failure of the devm_regmap_init_mmio(), it will return error pointer and be assigned to the regmap. Then the error pointer will be dereferenced. For example rx->regmap will be used in rx_macro_mclk_enable(). Therefore, it should be better to check it. Fixes: af3d54b99764 ("ASoC: codecs: lpass-rx-macro: add support for lpass rx macro") Fixes: c39667ddcfc5 ("ASoC: codecs: lpass-tx-macro: add support for lpass tx macro") Fixes: 809bcbcecebf ("ASoC: codecs: lpass-wsa-macro: Add support to WSA Macro") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- Changelog v1 -> v2 * Change 1. Refine the commit message. --- sound/soc/codecs/lpass-rx-macro.c | 2 ++ sound/soc/codecs/lpass-tx-macro.c | 2 ++ sound/soc/codecs/lpass-wsa-macro.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 07894ec5e7a6..2adbf2e2697f 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -3542,6 +3542,8 @@ static int rx_macro_probe(struct platform_device *pdev) return PTR_ERR(base); rx->regmap = devm_regmap_init_mmio(dev, base, &rx_regmap_config); + if (IS_ERR(rx->regmap)) + return PTR_ERR(rx->regmap); dev_set_drvdata(dev, rx); diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index 27a0d5defd27..e4bbc6bd4925 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -1803,6 +1803,8 @@ static int tx_macro_probe(struct platform_device *pdev) return PTR_ERR(base); tx->regmap = devm_regmap_init_mmio(dev, base, &tx_regmap_config); + if (IS_ERR(tx->regmap)) + return PTR_ERR(tx->regmap); dev_set_drvdata(dev, tx); diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index d3ac318fd6b6..dd1a8b7bc794 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -2405,6 +2405,8 @@ static int wsa_macro_probe(struct platform_device *pdev) return PTR_ERR(base); wsa->regmap = devm_regmap_init_mmio(dev, base, &wsa_regmap_config); + if (IS_ERR(wsa->regmap)) + return PTR_ERR(wsa->regmap); dev_set_drvdata(dev, wsa); -- 2.25.1

2 2

[PATCH v2 0/3] ASoC: topology: Fixes
by Amadeusz Sławiński 25 Jan '22

25 Jan '22

Following series performs few cleanups in topology code. First patch reduces number of prints we get from failure. Second allos TLV controls to be either read or write which should be possible as evidenced by further code in function. Last one cleanups after refactoring of memory handling. v2: - Add missing Fixes tag on second patch - Add Reviewed-by tag from Pierre Amadeusz Sławiński (3): ASoC: topology: Remove superfluous error prints ASoC: topology: Allow TLV control to be either read or write ASoC: topology: Optimize soc_tplg_dapm_graph_elems_load behavior sound/soc/soc-topology.c | 103 ++++++++++----------------------------- 1 file changed, 27 insertions(+), 76 deletions(-) -- 2.25.1

2 4

[PATCH] ASoC: codecs: Check for error pointer after calling devm_regmap_init_mmio
by Jiasheng Jiang 25 Jan '22

25 Jan '22

The devm_regmap_init_mmio() may return error pointer under certain circumstances, for example the possible failure of the kzalloc() in regmap_mmio_gen_context(), which is called by devm_regmap_init_mmio(). Then the error pointer will be dereferenced. For example rx->regmap will be used in rx_macro_mclk_enable(). Therefore, it should be better to check it. Fixes: af3d54b99764 ("ASoC: codecs: lpass-rx-macro: add support for lpass rx macro") Fixes: c39667ddcfc5 ("ASoC: codecs: lpass-tx-macro: add support for lpass tx macro") Fixes: 809bcbcecebf ("ASoC: codecs: lpass-wsa-macro: Add support to WSA Macro") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- sound/soc/codecs/lpass-rx-macro.c | 2 ++ sound/soc/codecs/lpass-tx-macro.c | 2 ++ sound/soc/codecs/lpass-wsa-macro.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 07894ec5e7a6..2adbf2e2697f 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -3542,6 +3542,8 @@ static int rx_macro_probe(struct platform_device *pdev) return PTR_ERR(base); rx->regmap = devm_regmap_init_mmio(dev, base, &rx_regmap_config); + if (IS_ERR(rx->regmap)) + return PTR_ERR(rx->regmap); dev_set_drvdata(dev, rx); diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index 27a0d5defd27..e4bbc6bd4925 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -1803,6 +1803,8 @@ static int tx_macro_probe(struct platform_device *pdev) return PTR_ERR(base); tx->regmap = devm_regmap_init_mmio(dev, base, &tx_regmap_config); + if (IS_ERR(tx->regmap)) + return PTR_ERR(tx->regmap); dev_set_drvdata(dev, tx); diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index d3ac318fd6b6..dd1a8b7bc794 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -2405,6 +2405,8 @@ static int wsa_macro_probe(struct platform_device *pdev) return PTR_ERR(base); wsa->regmap = devm_regmap_init_mmio(dev, base, &wsa_regmap_config); + if (IS_ERR(wsa->regmap)) + return PTR_ERR(wsa->regmap); dev_set_drvdata(dev, wsa); -- 2.25.1

3 3

[PATCH] sound/soc/codecs: remove redundant ret variable
by cgel.zte＠gmail.com 25 Jan '22

25 Jan '22

From: Minghao Chi <chi.minghao(a)zte.com.cn> Return value from devm_snd_soc_register_component() directly instead of taking this in another redundant variable. Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Minghao Chi <chi.minghao(a)zte.com.cn> Signed-off-by: CGEL ZTE <cgel.zte(a)gmail.com> --- sound/soc/codecs/wm8971.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c index 21ae55c32a6d..ddf0e2f5e66a 100644 --- a/sound/soc/codecs/wm8971.c +++ b/sound/soc/codecs/wm8971.c @@ -676,7 +676,6 @@ static int wm8971_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct wm8971_priv *wm8971; - int ret; wm8971 = devm_kzalloc(&i2c->dev, sizeof(struct wm8971_priv), GFP_KERNEL); @@ -689,10 +688,8 @@ static int wm8971_i2c_probe(struct i2c_client *i2c, i2c_set_clientdata(i2c, wm8971); - ret = devm_snd_soc_register_component(&i2c->dev, + return devm_snd_soc_register_component(&i2c->dev, &soc_component_dev_wm8971, &wm8971_dai, 1); - - return ret; } static const struct i2c_device_id wm8971_i2c_id[] = { -- 2.25.1

3 3

[PATCH] ASoC: amd: acp-mach: Fix Left and Right rt1019 amp devices
by Ajit Kumar Pandey 25 Jan '22

25 Jan '22

We're setting wrong card codec conf for rt1019 amp devices in our machine driver. Due to this left and right amp channels data are reversed in our machines as wrong device prefix results in wrong value for "Mono LR Select" rt1019 mixer control. Reverse dev ids in codec conf with Left and Right name_prefix to fix such issue. Signed-off-by: Ajit Kumar Pandey <AjitKumar.Pandey(a)amd.com> --- sound/soc/amd/acp/acp-mach-common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c index c9caade5cb74..cd05ee2802c9 100644 --- a/sound/soc/amd/acp/acp-mach-common.c +++ b/sound/soc/amd/acp/acp-mach-common.c @@ -303,11 +303,11 @@ static const struct snd_soc_dapm_route rt1019_map_lr[] = { static struct snd_soc_codec_conf rt1019_conf[] = { { - .dlc = COMP_CODEC_CONF("i2c-10EC1019:00"), + .dlc = COMP_CODEC_CONF("i2c-10EC1019:01"), .name_prefix = "Left", }, { - .dlc = COMP_CODEC_CONF("i2c-10EC1019:01"), + .dlc = COMP_CODEC_CONF("i2c-10EC1019:00"), .name_prefix = "Right", }, }; -- 2.25.1

2 1