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

[PATCH] ASoC: sam9g20_wm8731: Use dev_err_probe() for snd_soc_register_card()
by Mark Brown 09 May '22

09 May '22

Log the error code when snd_soc_regster_card() fails, but fold in the silencing of deferred probe errors. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/atmel/sam9g20_wm8731.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index 0365b583ba70..4d25fb61c652 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c @@ -171,7 +171,8 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) ret = snd_soc_register_card(card); if (ret) { - dev_err(&pdev->dev, "snd_soc_register_card() failed\n"); + dev_err_probe(&pdev->dev, ret, + "snd_soc_register_card() failed: %d\n", ret); goto err; } -- 2.30.2

2 2

[PATCH] ASoC: SOF: trace: The dtrace is only available with SOF_IPC
by Peter Ujfalusi 09 May '22

09 May '22

Currently the dtrace only supported with SOF_IPC. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- Hi, I have pending series to rework the whole tracing support to allow different tracing solutions to be plugged in for different IPC versions. It is going to be sent at later time, until then we need to make sure that the current dtrace is not used with IPC4. Regards, Peter sound/soc/sof/trace.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/sof/trace.c b/sound/soc/sof/trace.c index ba6361b5d64b..5d171bf8a5ea 100644 --- a/sound/soc/sof/trace.c +++ b/sound/soc/sof/trace.c @@ -457,6 +457,10 @@ int snd_sof_init_trace(struct snd_sof_dev *sdev) { int ret; + /* dtrace is only supported with SOF_IPC */ + if (sdev->pdata->ipc_type != SOF_IPC) + sdev->dtrace_is_supported = false; + if (!sdev->dtrace_is_supported) return 0; -- 2.36.0

2 1

[PATCH 0/3] Add missing dt-binding properties for audio components on mt8192-asurada
by Nícolas F. R. A. Prado 09 May '22

09 May '22

These patches add properties that were missing on the dt-bindings of the audio components used by mt8192-asurada. Namely the i2s-share properties for the sound platform and the #sound-dai-cells on the rt1015p and rt5682 codecs when they're referenced by the machine sound node. Nícolas F. R. A. Prado (3): ASoC: dt-bindings: mediatek: mt8192: Add i2s-share properties ASoC: dt-bindings: rt1015p: Add #sound-dai-cells ASoC: dt-bindings: rt5682: Add #sound-dai-cells Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml | 5 +++++ Documentation/devicetree/bindings/sound/realtek,rt1015p.yaml | 3 +++ Documentation/devicetree/bindings/sound/rt5682.txt | 2 ++ 3 files changed, 10 insertions(+) -- 2.36.0

5 17

[PATCH 2/2] doc: dts: Add device tree information regarding wm8940 codec
by Lukasz Majewski 09 May '22

09 May '22

This commit provides documentation entry for wm8940 codec. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- .../devicetree/bindings/sound/wlf,wm8940.yaml | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8940.yaml diff --git a/Documentation/devicetree/bindings/sound/wlf,wm8940.yaml b/Documentation/devicetree/bindings/sound/wlf,wm8940.yaml new file mode 100644 index 000000000000..8aadcbeed502 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/wlf,wm8940.yaml @@ -0,0 +1,57 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/wlf,wm8940.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Wolfson WM8940 Codec Device Tree Bindings + +maintainers: + - patches(a)opensource.cirrus.com + +properties: + '#sound-dai-cells': + const: 0 + + compatible: + const: wlf,wm8940 + + reg: + maxItems: 1 + + spi-max-frequency: + maximum: 526000 + +required: + - '#sound-dai-cells' + - compatible + - reg + +additionalProperties: false + +examples: + - | + spi { + #address-cells = <1>; + #size-cells = <0>; + + codec@0 { + #sound-dai-cells = <0>; + compatible = "wlf,wm8940"; + reg = <0>; + spi-max-frequency = <500000>; + }; + }; + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + codec@1a { + #sound-dai-cells = <0>; + compatible = "wlf,wm8940"; + reg = <0x1a>; + }; + }; + +... -- 2.35.1

3 2

[PATCH v3 -next] ASoC: mediatek: mt8195: Fix build warning without CONFIG_OF
by YueHaibing 09 May '22

09 May '22

sound/soc/mediatek/mt8195/mt8195-mt6359.c:1639:32: warning: ‘mt8195_mt6359_max98390_rt5682_card’ defined but not used [-Wunused-variable] 1639 | static struct mt8195_card_data mt8195_mt6359_max98390_rt5682_card = { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc/mediatek/mt8195/mt8195-mt6359.c:1634:32: warning: ‘mt8195_mt6359_rt1011_rt5682_card’ defined but not used [-Wunused-variable] 1634 | static struct mt8195_card_data mt8195_mt6359_rt1011_rt5682_card = { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc/mediatek/mt8195/mt8195-mt6359.c:1629:32: warning: ‘mt8195_mt6359_rt1019_rt5682_card’ defined but not used [-Wunused-variable] 1629 | static struct mt8195_card_data mt8195_mt6359_rt1019_rt5682_card = { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Since all users of this driver do need CONFIG_OF anyway, there is no need to save a few bytes on kernel builds while CONFIG_OF disabled, so just remove the #ifdef to fix this warning. Fixes: 86a6b9c9dfff ("ASoC: mediatek: mt8195: add machine support for max98390 and rt5682") Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> Acked-by: Arnd Bergmann <arnd(a)arndb.de> --- v3: rebase on next-20220509 v2: remove #ifdef block as Arnd suggested --- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index 3e32fe801b3c..54a00b0699b1 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -1641,7 +1641,6 @@ static struct mt8195_card_data mt8195_mt6359_max98390_rt5682_card = { .quirk = MAX98390_SPEAKER_AMP_PRESENT, }; -#ifdef CONFIG_OF static const struct of_device_id mt8195_mt6359_dt_match[] = { { .compatible = "mediatek,mt8195_mt6359_rt1019_rt5682", @@ -1657,7 +1656,6 @@ static const struct of_device_id mt8195_mt6359_dt_match[] = { }, {}, }; -#endif static const struct dev_pm_ops mt8195_mt6359_pm_ops = { .poweroff = snd_soc_poweroff, @@ -1667,9 +1665,7 @@ static const struct dev_pm_ops mt8195_mt6359_pm_ops = { static struct platform_driver mt8195_mt6359_driver = { .driver = { .name = "mt8195_mt6359", -#ifdef CONFIG_OF .of_match_table = mt8195_mt6359_dt_match, -#endif .pm = &mt8195_mt6359_pm_ops, }, .probe = mt8195_mt6359_dev_probe, -- 2.17.1

2 1

[PATCH v2 -next] ASoC: mediatek: mt8195: Fix build warning without CONFIG_OF
by YueHaibing 09 May '22

09 May '22

sound/soc/mediatek/mt8195/mt8195-mt6359.c:1639:32: warning: ‘mt8195_mt6359_max98390_rt5682_card’ defined but not used [-Wunused-variable] 1639 | static struct mt8195_card_data mt8195_mt6359_max98390_rt5682_card = { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc/mediatek/mt8195/mt8195-mt6359.c:1634:32: warning: ‘mt8195_mt6359_rt1011_rt5682_card’ defined but not used [-Wunused-variable] 1634 | static struct mt8195_card_data mt8195_mt6359_rt1011_rt5682_card = { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/soc/mediatek/mt8195/mt8195-mt6359.c:1629:32: warning: ‘mt8195_mt6359_rt1019_rt5682_card’ defined but not used [-Wunused-variable] 1629 | static struct mt8195_card_data mt8195_mt6359_rt1019_rt5682_card = { | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Since all users of this driver do need CONFIG_OF anyway, there is no need to save a few bytes on kernel builds while CONFIG_OF disabled, so just remove the #ifdef to fix this warning. Fixes: 86a6b9c9dfff ("ASoC: mediatek: mt8195: add machine support for max98390 and rt5682") Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- v2: remove #ifdef block as Arnd suggested --- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index f90675f14d60..54a00b0699b1 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -1626,7 +1626,6 @@ static int mt8195_mt6359_dev_probe(struct platform_device *pdev) return ret; } -#ifdef CONFIG_OF static struct mt8195_card_data mt8195_mt6359_rt1019_rt5682_card = { .name = "mt8195_r1019_5682", .quirk = RT1019_SPEAKER_AMP_PRESENT, @@ -1657,7 +1656,6 @@ static const struct of_device_id mt8195_mt6359_dt_match[] = { }, {}, }; -#endif static const struct dev_pm_ops mt8195_mt6359_pm_ops = { .poweroff = snd_soc_poweroff, @@ -1667,9 +1665,7 @@ static const struct dev_pm_ops mt8195_mt6359_pm_ops = { static struct platform_driver mt8195_mt6359_driver = { .driver = { .name = "mt8195_mt6359", -#ifdef CONFIG_OF .of_match_table = mt8195_mt6359_dt_match, -#endif .pm = &mt8195_mt6359_pm_ops, }, .probe = mt8195_mt6359_dev_probe, -- 2.17.1

3 4

Re: [Intel-gfx] [PATCH v5 1/2] module: update dependencies at try_module_get()
by Mauro Carvalho Chehab 09 May '22

09 May '22

Em Thu, 5 May 2022 23:35:29 +0200 Andi Shyti <andi.shyti(a)linux.intel.com> escreveu: > Hi Mauro, > > [...] > > > +static int ref_module_dependency(struct module *mod, struct module *this) > > +{ > > + int ret; > > + > > + if (!this || !this->name) > > + return -EINVAL; > > + > > + if (mod == this) > > + return 0; > > + > > + mutex_lock(&module_mutex); > > + > > + ret = ref_module(this, mod); > > + > > +#ifdef CONFIG_MODULE_UNLOAD > > + if (ret) > > + goto ret; > > + > > + ret = sysfs_create_link(mod->holders_dir, > > + &this->mkobj.kobj, this->name); > > +#endif > > + > > +ret: > > + mutex_unlock(&module_mutex); > > + return ret; > > +} > > + > > /* Clear the unload stuff of the module. */ > > static void module_unload_free(struct module *mod) > > { > > @@ -841,24 +886,16 @@ void __module_get(struct module *module) > > } > > EXPORT_SYMBOL(__module_get); > > > > -bool try_module_get(struct module *module) > > +bool try_module_get_owner(struct module *module, struct module *this) > > { > > - bool ret = true; > > + int ret = __try_module_get(module); > > > > - if (module) { > > - preempt_disable(); > > - /* Note: here, we can fail to get a reference */ > > - if (likely(module_is_live(module) && > > - atomic_inc_not_zero(&module->refcnt) != 0)) > > - trace_module_get(module, _RET_IP_); > > - else > > - ret = false; > > + if (ret) > > + ref_module_dependency(module, this); > > do we care about the return value here? I don't think it should care about the return value, as a failure to create a sysfs node for the holder or to add it to the holders list is not fatal: modules can still continue working without that. Also, I opted to be conservative here: currently, not creating these doesn't cause try_module_get() to fail. I'm not sure what would be the impact if this starts to fail. So, right now, I'm opting to just ignore the return value. Perhaps in the future this could a warning (similarly to what sysfs create link does). Regards, Mauro > > Andi > > > > > - preempt_enable(); > > - } > > return ret; > > } > > -EXPORT_SYMBOL(try_module_get); > > +EXPORT_SYMBOL(try_module_get_owner); > > > > void module_put(struct module *module) > > { > > -- > > 2.35.1 Thanks, Mauro

1 0

[PATCH v1] ALSA: hda/realtek: Add quirk for the Framework Laptop
by Dustin L. Howett 09 May '22

09 May '22

Some board revisions of the Framework Laptop have an ALC295 and have an issue detecting headset microphones. The "dell-headset-multi" fixup addresses this issue, but its application requires an end-user or distributor to opt in. f111:0001 is Framework's PCI VID:PID for this board. Signed-off-by: Dustin L. Howett <dustin(a)howett.net> --- 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 4c0c593f3c0a..a1b45c72e9b1 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9294,6 +9294,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x8086, 0x2074, "Intel NUC 8", ALC233_FIXUP_INTEL_NUC8_DMIC), SND_PCI_QUIRK(0x8086, 0x2080, "Intel NUC 8 Rugged", ALC256_FIXUP_INTEL_NUC8_RUGGED), SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", ALC256_FIXUP_INTEL_NUC10), + SND_PCI_QUIRK(0xf111, 0x0001, "Framework Laptop", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), #if 0 /* Below is a quirk table taken from the old code. -- 2.36.0

2 1

[PATCH] ASoC: pcm186x: simplify the return expression of pcm186x_power_off()
by cgel.zte＠gmail.com 09 May '22

09 May '22

From: Minghao Chi <chi.minghao(a)zte.com.cn> Simplify the return expression. Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Minghao Chi <chi.minghao(a)zte.com.cn> --- sound/soc/codecs/pcm186x.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sound/soc/codecs/pcm186x.c b/sound/soc/codecs/pcm186x.c index 2c78dccb3f62..fda9d7ee3fe6 100644 --- a/sound/soc/codecs/pcm186x.c +++ b/sound/soc/codecs/pcm186x.c @@ -534,19 +534,14 @@ static int pcm186x_power_on(struct snd_soc_component *component) static int pcm186x_power_off(struct snd_soc_component *component) { struct pcm186x_priv *priv = snd_soc_component_get_drvdata(component); - int ret; snd_soc_component_update_bits(component, PCM186X_POWER_CTRL, PCM186X_PWR_CTRL_PWRDN, PCM186X_PWR_CTRL_PWRDN); regcache_cache_only(priv->regmap, true); - ret = regulator_bulk_disable(ARRAY_SIZE(priv->supplies), + return regulator_bulk_disable(ARRAY_SIZE(priv->supplies), priv->supplies); - if (ret) - return ret; - - return 0; } static int pcm186x_set_bias_level(struct snd_soc_component *component, -- 2.25.1

2 1

[PATCH] ASoC: mediatek: simplify the return expression of mtk_dai_pcm_prepare()
by cgel.zte＠gmail.com 09 May '22

09 May '22

From: Minghao Chi <chi.minghao(a)zte.com.cn> Simplify the return expression. Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Minghao Chi <chi.minghao(a)zte.com.cn> --- sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c b/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c index 151914c873ac..12644ded83d5 100644 --- a/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c +++ b/sound/soc/mediatek/mt8195/mt8195-dai-pcm.c @@ -213,8 +213,6 @@ static int mtk_dai_pcm_configure(struct snd_pcm_substream *substream, static int mtk_dai_pcm_prepare(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - int ret; - dev_dbg(dai->dev, "%s(), id %d, stream %d, widget active p %d, c %d\n", __func__, dai->id, substream->stream, dai->playback_widget->active, dai->capture_widget->active); @@ -222,11 +220,7 @@ static int mtk_dai_pcm_prepare(struct snd_pcm_substream *substream, if (dai->playback_widget->active || dai->capture_widget->active) return 0; - ret = mtk_dai_pcm_configure(substream, dai); - if (ret) - return ret; - - return 0; + return mtk_dai_pcm_configure(substream, dai); } static int mtk_dai_pcm_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) -- 2.25.1

2 1