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

[v2] ASoC: mediatek: mt8183: support wb bt audio
by Jiaxin Yu 08 Mar '22

08 Mar '22

Use "bt-sco-pcm-wb" codec dai driver for wb bt audio. Signed-off-by: Jiaxin Yu <jiaxin.yu(a)mediatek.com> Reviewed-by: Tzung-Bi Shih <tzungbi(a)kernel.org> --- changed from v1: - describe changes in imperative mood - remove description of unnecessary dependenceies sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c index b0ec5ebd4f2d..889f9e4a96aa 100644 --- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c @@ -260,7 +260,7 @@ SND_SOC_DAILINK_DEFS(pcm2, SND_SOC_DAILINK_DEFS(i2s0, DAILINK_COMP_ARRAY(COMP_CPU("I2S0")), - DAILINK_COMP_ARRAY(COMP_CODEC("bt-sco", "bt-sco-pcm")), + DAILINK_COMP_ARRAY(COMP_CODEC("bt-sco", "bt-sco-pcm-wb")), DAILINK_COMP_ARRAY(COMP_EMPTY())); SND_SOC_DAILINK_DEFS(i2s1, @@ -291,7 +291,7 @@ SND_SOC_DAILINK_DEFS(i2s3_rt1015p, SND_SOC_DAILINK_DEFS(i2s5, DAILINK_COMP_ARRAY(COMP_CPU("I2S5")), - DAILINK_COMP_ARRAY(COMP_CODEC("bt-sco", "bt-sco-pcm")), + DAILINK_COMP_ARRAY(COMP_CODEC("bt-sco", "bt-sco-pcm-wb")), DAILINK_COMP_ARRAY(COMP_EMPTY())); SND_SOC_DAILINK_DEFS(tdm, @@ -508,7 +508,6 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .no_pcm = 1, .dpcm_capture = 1, .ignore_suspend = 1, - .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, SND_SOC_DAILINK_REG(i2s0), }, @@ -541,7 +540,6 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = { .no_pcm = 1, .dpcm_playback = 1, .ignore_suspend = 1, - .be_hw_params_fixup = mt8183_i2s_hw_params_fixup, .ops = &mt8183_mt6358_i2s_ops, SND_SOC_DAILINK_REG(i2s5), }, -- 2.25.1

2 1

[PATCH 00/18] Clean ups and preparation for IPC abstraction in the SOF driver
by Ranjani Sridharan 08 Mar '22

08 Mar '22

In preparation for adding support for the new IPC version that has been introduced in the SOF firmware, this patch set includes some clean ups and necessary modifications to commonly used functions that will be re-used across different IPC-specific code. Pierre-Louis Bossart (1): ASoC: SOF: sof-audio: removed unused function Rander Wang (1): ASoC: SOF: move definition of snd_sof_ipc to header file Ranjani Sridharan (16): ASoC: SOF: remove snd_sof_pipeline_find() ASoC: SOF: simplify snd_sof_device_remove() ASoC: SOF: set swidget's core for scheduler widget ASoC: SOF: topology: remove redundant code ASoC: SOF: topology: remove redundant code in sof_link_afe_load() ASoC: SOF: topology: Drop the size parameter from struct sof_topology_token ASoC: SOF: topology: Modify the get_token op for string tokens ASoC: SOF: topology: expose some get_token ops ASoC: SOF: change comp_dai to a pointer in struct snd_sof_dai ASoC: SOF: make struct snd_sof_widget IPC agnostic ASoC: SOF: topology: make sof_route_load() IPC agnostic ASoC: SOF: Add a tuples array to struct snd_sof_widget ASoC: SOF: topology: Modify signature for token parsing functions ASoC: SOF: topology: Rename arguments in sof_parse_token_sets() ASoC: SOF: topology: Rename arguments in sof_parse_tokens() ASoC: SOF: make struct snd_sof_dai IPC agnostic include/sound/sof/dai.h | 5 + include/sound/sof/topology.h | 5 - sound/soc/sof/core.c | 10 +- sound/soc/sof/intel/hda-dai.c | 27 ++- sound/soc/sof/intel/hda.c | 39 +++- sound/soc/sof/ipc.c | 12 -- sound/soc/sof/pcm.c | 77 +++---- sound/soc/sof/sof-audio.c | 108 +++------- sound/soc/sof/sof-audio.h | 30 ++- sound/soc/sof/sof-priv.h | 12 ++ sound/soc/sof/topology.c | 391 +++++++++++++++++----------------- 11 files changed, 354 insertions(+), 362 deletions(-) -- 2.25.1

3 21

[PATCH v2] ASoC: Intel: catpt: use asoc_substream_to_rtd()
by Lianjie Zhang 08 Mar '22

08 Mar '22

Now we can use asoc_substream_to_rtd() macro, let's use it. Signed-off-by: Lianjie Zhang <zhanglianjie(a)uniontech.com> Reviewed-by: Cezary Rojewski <cezary.rojewski(a)intel.com> diff --git a/sound/soc/intel/catpt/pcm.c b/sound/soc/intel/catpt/pcm.c index 939a9b801dec..a26000cd5ceb 100644 --- a/sound/soc/intel/catpt/pcm.c +++ b/sound/soc/intel/catpt/pcm.c @@ -74,7 +74,7 @@ static struct catpt_stream_template *catpt_topology[] = { static struct catpt_stream_template * catpt_get_stream_template(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtm = substream->private_data; + struct snd_soc_pcm_runtime *rtm = asoc_substream_to_rtd(substream); struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtm, 0); enum catpt_stream_type type; @@ -593,7 +593,7 @@ static int catpt_component_pcm_construct(struct snd_soc_component *component, static int catpt_component_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtm = substream->private_data; + struct snd_soc_pcm_runtime *rtm = asoc_substream_to_rtd(substream); if (!rtm->dai_link->no_pcm) snd_soc_set_runtime_hwparams(substream, &catpt_pcm_hardware); @@ -604,7 +604,7 @@ static snd_pcm_uframes_t catpt_component_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtm = substream->private_data; + struct snd_soc_pcm_runtime *rtm = asoc_substream_to_rtd(substream); struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtm, 0); struct catpt_stream_runtime *stream; struct catpt_dev *cdev = dev_get_drvdata(component->dev); -- 2.20.1

3 3

[PATCH] ASoC: rockchip: i2s: Fix missing clk_disable_unprepare() in rockchip_i2s_probe
by Miaoqian Lin 08 Mar '22

08 Mar '22

Fix the missing clk_disable_unprepare() before return from rockchip_i2s_probe() in the error handling case. Fixes: 01605ad12875 ("ASoC: rockchip-i2s: enable "hclk" for rockchip I2S controller") Signed-off-by: Miaoqian Lin <linmq006(a)gmail.com> --- sound/soc/rockchip/rockchip_i2s.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index a6d7656c206e..4ce5d2579387 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -716,19 +716,23 @@ static int rockchip_i2s_probe(struct platform_device *pdev) i2s->mclk = devm_clk_get(&pdev->dev, "i2s_clk"); if (IS_ERR(i2s->mclk)) { dev_err(&pdev->dev, "Can't retrieve i2s master clock\n"); - return PTR_ERR(i2s->mclk); + ret = PTR_ERR(i2s->mclk); + goto err_clk; } regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res); - if (IS_ERR(regs)) - return PTR_ERR(regs); + if (IS_ERR(regs)) { + ret = PTR_ERR(regs); + goto err_clk; + } i2s->regmap = devm_regmap_init_mmio(&pdev->dev, regs, &rockchip_i2s_regmap_config); if (IS_ERR(i2s->regmap)) { dev_err(&pdev->dev, "Failed to initialise managed register map\n"); - return PTR_ERR(i2s->regmap); + ret = PTR_ERR(i2s->regmap); + goto err_clk; } i2s->bclk_ratio = 64; @@ -768,7 +772,8 @@ static int rockchip_i2s_probe(struct platform_device *pdev) i2s_runtime_suspend(&pdev->dev); err_pm_disable: pm_runtime_disable(&pdev->dev); - +err_clk: + clk_disable_unprepare(i2s->hclk); return ret; } -- 2.17.1

2 1

[PATCH -next] ASoC: amd: acp5x-pcm-dma: Fix signedness bug
by YueHaibing 08 Mar '22

08 Mar '22

In acp5x_audio_probe() platform_get_irq() may return error, but i2s_irq now is unsigned int so the error handling is never triggered. Fixes: 87d71a128771 ("ASoC: amd: pcm-dma: Use platform_get_irq() to get the interrupt") Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/amd/vangogh/acp5x.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/vangogh/acp5x.h b/sound/soc/amd/vangogh/acp5x.h index b85d3ee369a3..bd9f1c5684d1 100644 --- a/sound/soc/amd/vangogh/acp5x.h +++ b/sound/soc/amd/vangogh/acp5x.h @@ -85,7 +85,7 @@ struct i2s_dev_data { bool tdm_mode; bool master_mode; - unsigned int i2s_irq; + int i2s_irq; u16 i2s_instance; u32 tdm_fmt; void __iomem *acp5x_base; -- 2.17.1

2 1

[PATCH -next] ASoC: amd: acp3x: Fix signedness bug in acp3x
by YueHaibing 08 Mar '22

08 Mar '22

In acp3x_audio_probe() platform_get_irq() may return error, but i2s_irq now is unsigned int so the error handling is never triggered. Fixes: 87d71a128771 ("ASoC: amd: pcm-dma: Use platform_get_irq() to get the interrupt") Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/amd/raven/acp3x.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index c3f0c8b7545d..7702f628ecd6 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -87,7 +87,7 @@ struct acp3x_platform_info { struct i2s_dev_data { bool tdm_mode; - unsigned int i2s_irq; + int i2s_irq; u16 i2s_instance; u32 tdm_fmt; u32 substream_type; -- 2.17.1

2 1

[PATCH] ALSA: hda/i915 - avoid hung task timeout in i915 wait
by Kai Vehmanen 08 Mar '22

08 Mar '22

If kernel is built with hung task detection enabled and CONFIG_DEFAULT_HUNG_TASK_TIMEOUT set to less than 60 seconds, snd_hdac_i915_init() will trigger the hung task timeout in case i915 is not available and taint the kernel. Split the 60sec wait into a loop of smaller waits to avoid this. Cc: Lucas De Marchi <lucas.demarchi(a)intel.com> Co-developed-by: Ramalingam C <ramalingam.c(a)intel.com> Signed-off-by: Ramalingam C <ramalingam.c(a)intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/hda/hdac_i915.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 454474ac5716..6219de739b56 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -143,7 +143,8 @@ static bool i915_gfx_present(void) int snd_hdac_i915_init(struct hdac_bus *bus) { struct drm_audio_component *acomp; - int err; + unsigned long wait = 0; + int err, i; if (!i915_gfx_present()) return -ENODEV; @@ -159,9 +160,10 @@ int snd_hdac_i915_init(struct hdac_bus *bus) if (!acomp->ops) { if (!IS_ENABLED(CONFIG_MODULES) || !request_module("i915")) { - /* 60s timeout */ - wait_for_completion_timeout(&acomp->master_bind_complete, - msecs_to_jiffies(60 * 1000)); + /* max 60s timeout */ + for (i = 0; !wait && i < 60; i++) + wait = wait_for_completion_timeout(&acomp->master_bind_complete, + msecs_to_jiffies(1000)); } } if (!acomp->ops) { base-commit: fd7698cf0858f8c5e659b655109cd93c2f15cdd3 -- 2.35.1

3 2

[PATCH v3] ASoC: Intel: catpt: use asoc_substream_to_rtd()
by Lianjie Zhang 08 Mar '22

08 Mar '22

Now we can use asoc_substream_to_rtd() macro, let's use it. Signed-off-by: Lianjie Zhang <zhanglianjie(a)uniontech.com> diff --git a/sound/soc/intel/catpt/pcm.c b/sound/soc/intel/catpt/pcm.c index 939a9b801dec..a26000cd5ceb 100644 --- a/sound/soc/intel/catpt/pcm.c +++ b/sound/soc/intel/catpt/pcm.c @@ -74,7 +74,7 @@ static struct catpt_stream_template *catpt_topology[] = { static struct catpt_stream_template * catpt_get_stream_template(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtm = substream->private_data; + struct snd_soc_pcm_runtime *rtm = asoc_substream_to_rtd(substream); struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtm, 0); enum catpt_stream_type type; @@ -593,7 +593,7 @@ static int catpt_component_pcm_construct(struct snd_soc_component *component, static int catpt_component_open(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtm = substream->private_data; + struct snd_soc_pcm_runtime *rtm = asoc_substream_to_rtd(substream); if (!rtm->dai_link->no_pcm) snd_soc_set_runtime_hwparams(substream, &catpt_pcm_hardware); @@ -604,7 +604,7 @@ static snd_pcm_uframes_t catpt_component_pointer(struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtm = substream->private_data; + struct snd_soc_pcm_runtime *rtm = asoc_substream_to_rtd(substream); struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtm, 0); struct catpt_stream_runtime *stream; struct catpt_dev *cdev = dev_get_drvdata(component->dev); -- 2.20.1

1 0

[PATCH 0/2] ALSA: scarlett2: Add "Standalone" switch
by Geoffrey D. Bennett 08 Mar '22

08 Mar '22

Hi Takashi, I discovered an internal "standalone" switch on all the Scarlett Gen 2/3 interfaces with internal mixers. After enabling this switch, the interface will act as a standalone mixer (according to its previous configuration) when not connected to a USB host. The interfaces come from the factory with the switch off, and the vendor driver enables it without question. This patch adds a new ALSA control to set the switch on or off. This is the first configuration item that is common between the Gen 2 and 3 interfaces but with a different offset, so the patch is in two parts. The first patch allows for the same configuration item to have a different offset between Gen 2/3 and the second patch adds the new switch. Regards, Geoffrey. Geoffrey D. Bennett (2): ALSA: scarlett2: Split scarlett2_config_items[] into 3 sections ALSA: scarlett2: Add support for the internal "standalone" switch sound/usb/mixer_scarlett_gen2.c | 171 ++++++++++++++++++++++++++------ 1 file changed, 141 insertions(+), 30 deletions(-) -- 2.35.1

2 3

[PATCH] ALSA: hda/realtek: Add quirk for Clevo NP50PNJ
by Tim Crawford 08 Mar '22

08 Mar '22

Fixes headset detection on Clevo NP50PNJ. Signed-off-by: Tim Crawford <tcrawford(a)system76.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7d85989f585b..595f492c0268 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9144,6 +9144,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1558, 0x8561, "Clevo NH[57][0-9][ER][ACDH]Q", ALC269_FIXUP_HEADSET_MIC), SND_PCI_QUIRK(0x1558, 0x8562, "Clevo NH[57][0-9]RZ[Q]", ALC269_FIXUP_DMIC), SND_PCI_QUIRK(0x1558, 0x8668, "Clevo NP50B[BE]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1558, 0x866d, "Clevo NP5[05]PN[HJK]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x867d, "Clevo NP7[01]PN[HJK]", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x8680, "Clevo NJ50LU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1558, 0x8686, "Clevo NH50[CZ]U", ALC256_FIXUP_MIC_NO_PRESENCE_AND_RESUME), -- 2.35.1

2 1