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

[PATCH v3 00/16] Support external boost at CS35l41 ASoC driver
by Lucas Tanure 10 Mar '22

10 Mar '22

Move the support for CS35L41 external boost to its shared library for ASoC use. This move resulted in cs35l41_hda_reg_sequence being removed, and its steps were broken down into regmap writes or functions from the library. And hardware configuration struct was unified for its use in the shared lib. While at it, some minor bugs were found and fixed it. v3 changelog: - Remove patches already accepted - Improved logic in documentation patch - Documentation patch goes before its code - Fixed missing Signed-off-by - Fixed subject for HDA patches v2 changelog: - Instead of removing the log, playback actions will log the last regmap access. - Documentation patch with the correct subject line and fixed bug reported by Rob Herring on the provided example. Previous versions: v1: https://lkml.org/lkml/2022/3/3/759 v2: https://lkml.org/lkml/2022/3/4/743 David Rhodes (1): ASoC: dt-bindings: cs35l41: Document CS35l41 External Boost Lucas Tanure (15): sound: cs35l41: Unify hardware configuration sound: cs35l41: Check hw_config before using it sound: cs35l41: Move cs35l41_gpio_config to shared lib ALSA: hda: cs35l41: Fix I2S params comments ALSA: hda: cs35l41: Always configure the DAI ALSA: hda: cs35l41: Add Boost type flag hda: cs35l41: Put the device into safe mode for external boost hda: cs35l41: Mute the device before shutdown sound: cs35l41: Enable Internal Boost in shared lib ALSA: hda: cs35l41: Move boost config to initialization code ALSA: hda: cs35l41: Remove cs35l41_hda_reg_sequence struct ALSA: hda: cs35l41: Reorganize log for playback actions ALSA: hda: cs35l41: Handle all external boost setups the same way ALSA: hda: cs35l41: Move external boost handling to lib for ASoC use ASoC: cs35l41: Support external boost .../bindings/sound/cirrus,cs35l41.yaml | 44 ++- include/sound/cs35l41.h | 53 +++- sound/pci/hda/cs35l41_hda.c | 295 ++++++------------ sound/pci/hda/cs35l41_hda.h | 27 +- sound/soc/codecs/cs35l41-i2c.c | 4 +- sound/soc/codecs/cs35l41-lib.c | 190 ++++++++++- sound/soc/codecs/cs35l41-spi.c | 4 +- sound/soc/codecs/cs35l41.c | 166 +++++----- sound/soc/codecs/cs35l41.h | 5 +- 9 files changed, 437 insertions(+), 351 deletions(-) -- 2.35.1

5 25

[bug report] ASoC: atmel: mchp-pdmc: add PDMC driver
by Dan Carpenter 10 Mar '22

10 Mar '22

Hello Codrin Ciubotariu, The patch 50291652af52: "ASoC: atmel: mchp-pdmc: add PDMC driver" from Mar 7, 2022, leads to the following Smatch static checker warning: sound/soc/atmel/mchp-pdmc.c:186 mchp_pdmc_af_put() warn: this array is probably non-NULL. 'uvalue->value.integer.value' sound/soc/atmel/mchp-pdmc.c 181 static int mchp_pdmc_af_put(struct snd_kcontrol *kcontrol, 182 struct snd_ctl_elem_value *uvalue) 183 { 184 struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); 185 struct mchp_pdmc *dd = snd_soc_component_get_drvdata(component); --> 186 bool af = uvalue->value.integer.value ? true : false; ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ value is an array, not a pointer. It's always going to be non-NULL. 187 188 if (dd->audio_filter_en == af) 189 return 0; 190 191 dd->audio_filter_en = af; 192 193 return 1; 194 } regards, dan carpenter

2 1

[PATCH] ALSA: hda/realtek - Fix headset mic problem for a HP machine with alc671
by huangwenhui 10 Mar '22

10 Mar '22

On a HP 288 Pro G8, the front Mic could not be detected. Signed-off-by: huangwenhui <huangwenhuia(a)uniontech.com> --- sound/pci/hda/patch_realtek.c | 37 +++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 3a42457984e9..bcd56cdc07af 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -10519,6 +10519,37 @@ static void alc671_fixup_hp_headset_mic2(struct hda_codec *codec, } } +static void alc671_fixup_hp288_headset_mic2(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + struct alc_spec *spec = codec->spec; + hda_nid_t hp_pin = alc_get_hp_pin(spec); + + static const struct hda_pintbl pincfgs[] = { + { 0x19, 0x02a11040 }, /* use as headset mic, with its own jack detect */ + { 0x1b, 0x0181304f }, + { } + }; + + if (!hp_pin) + hp_pin = 0x21; + + switch (action) { + case HDA_FIXUP_ACT_PRE_PROBE: + spec->gen.mixer_nid = 0; + spec->parse_flags |= HDA_PINCFG_HEADSET_MIC; + snd_hda_apply_pincfgs(codec, pincfgs); + break; + case HDA_FIXUP_ACT_INIT: + alc_write_coef_idx(codec, 0x19, 0xa054); + msleep(80); + snd_hda_codec_write(codec, hp_pin, 0, + AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE); + msleep(100); + break; + } +} + static void alc897_hp_automute_hook(struct hda_codec *codec, struct hda_jack_callback *jack) { @@ -10615,6 +10646,7 @@ enum { ALC669_FIXUP_ACER_ASPIRE_ETHOS, ALC669_FIXUP_ACER_ASPIRE_ETHOS_HEADSET, ALC671_FIXUP_HP_HEADSET_MIC2, + ALC671_FIXUP_HP288_HEADSET_MIC2, ALC662_FIXUP_ACER_X2660G_HEADSET_MODE, ALC662_FIXUP_ACER_NITRO_HEADSET_MODE, ALC668_FIXUP_ASUS_NO_HEADSET_MIC, @@ -10986,6 +11018,10 @@ static const struct hda_fixup alc662_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc671_fixup_hp_headset_mic2, }, + [ALC671_FIXUP_HP288_HEADSET_MIC2] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc671_fixup_hp288_headset_mic2, + }, [ALC662_FIXUP_ACER_X2660G_HEADSET_MODE] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) { @@ -11067,6 +11103,7 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x069f, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800), SND_PCI_QUIRK(0x103c, 0x873e, "HP", ALC671_FIXUP_HP_HEADSET_MIC2), + SND_PCI_QUIRK(0x103c, 0x885f, "HP 288 Pro G8", ALC671_FIXUP_HP288_HEADSET_MIC2), SND_PCI_QUIRK(0x1043, 0x1080, "Asus UX501VW", ALC668_FIXUP_HEADSET_MODE), SND_PCI_QUIRK(0x1043, 0x11cd, "Asus N550", ALC662_FIXUP_ASUS_Nx50), SND_PCI_QUIRK(0x1043, 0x129d, "Asus N750", ALC662_FIXUP_ASUS_Nx50), -- 2.20.1

3 3

[PATCH] ASoC: meson: aiu: fix duplicate debugfs directory error
by Heiner Kallweit 10 Mar '22

10 Mar '22

On a S905W-based system I get the following error: debugfs: Directory 'c1105400.audio-controller' with parent 'P230-Q200' already present! Turned out that multiple components having the same name triggers this error in soc_init_component_debugfs(). With the patch the error is gone and that's the debugfs entries. /sys/kernel/debug/asoc/P230-Q200/aiu_acodec:c1105400.audio-controller /sys/kernel/debug/asoc/P230-Q200/aiu_hdmi:c1105400.audio-controller /sys/kernel/debug/asoc/P230-Q200/aiu_cpu:c1105400.audio-controller Because debugfs is affected only, this may not be something for stable. Signed-off-by: Heiner Kallweit <hkallweit1(a)gmail.com> --- sound/soc/meson/aiu.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/sound/soc/meson/aiu.c b/sound/soc/meson/aiu.c index d299a70db..c1a2aea5f 100644 --- a/sound/soc/meson/aiu.c +++ b/sound/soc/meson/aiu.c @@ -68,6 +68,20 @@ int aiu_of_xlate_dai_name(struct snd_soc_component *component, *dai_name = dai->driver->name; + switch (component_id) { + case AIU_CPU: + component->debugfs_prefix = "aiu_cpu"; + break; + case AIU_HDMI: + component->debugfs_prefix = "aiu_hdmi"; + break; + case AIU_ACODEC: + component->debugfs_prefix = "aiu_acodec"; + break; + default: + break; + } + return 0; } -- 2.35.1

4 4

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

10 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. Use wait_for_completion_killable_timeout() for the wait to avoid this problem. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Changes V2->V3: - drop the loop and just use wait_for_completion_killable_timeout() (feedback from Tvrtko Ursulin) - new approach, so dropped the previous reviewed-by tags diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 454474ac5716..efe810af28c5 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -160,8 +160,8 @@ int snd_hdac_i915_init(struct hdac_bus *bus) if (!IS_ENABLED(CONFIG_MODULES) || !request_module("i915")) { /* 60s timeout */ - wait_for_completion_timeout(&acomp->master_bind_complete, - msecs_to_jiffies(60 * 1000)); + wait_for_completion_killable_timeout(&acomp->master_bind_complete, + msecs_to_jiffies(60 * 1000)); } } if (!acomp->ops) { base-commit: 3a0099a1909dea6022690b0ae496938dd2e5771c -- 2.35.1

3 2

[GIT PULL] ASoC fixes for v5.17-rc7
by Mark Brown 10 Mar '22

10 Mar '22

The following changes since commit c5487b9cdea5c1ede38a7ec94db0fc59963c8e86: ASoC: cs4265: Fix the duplicated control name (2022-02-16 16:34:16 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v5.17-rc7 for you to fetch changes up to 5e02fb590e83684f63217f93a9cdeabd6a925f9c: ASoC: cs35l41: Fix DSP mbox start command and global enable order (2022-03-07 13:12:38 +0000) ---------------------------------------------------------------- ASoC: Potential fixes for v5.17 Rather more fixes here than I'm comfortable with, we've had several vendors noticing issues late in the release cycle all of which are valid and reasonable fixes but it adds up to a much larger change set than I'd like. Several of the AMD fixes look like cleanups from the subject lines but are actually fixing user visible problems as well. If you were to merge this for 5.18 rather than 5.17 it wouldn't be the end of the world, stable will probably backport everything anyway. ---------------------------------------------------------------- Ammar Faizi (1): ASoC: SOF: Intel: Fix NULL ptr dereference when ENOMEM David Rhodes (1): ASoC: cs35l41: Fix GPIO2 configuration Derek Fang (1): ASoC: rt5682s: Fix the wrong jack type detected Hans de Goede (1): ASoC: Intel: soc-acpi-byt: Add new WM5102 ACPI HID Lucas Tanure (2): ASoC: cs35l41: Fix max number of TX channels ASoC: cs35l41: Fix DSP mbox start command and global enable order Ricard Wanderlof (1): ASoC: tlv320adc3xxx: Fix buggy return value Srinivas Kandagatla (7): ASoC: codecs: rx-macro: fix accessing compander for aux ASoC: codecs: rx-macro: fix accessing array out of bounds for enum type ASoC: codecs: va-macro: fix accessing array out of bounds for enum type ASoC: codecs: wc938x: fix accessing array out of bounds for enum type ASoC: codecs: wcd938x: fix kcontrol max values ASoC: codecs: wcd934x: fix kcontrol max values ASoC: codecs: wcd934x: fix return value of wcd934x_rx_hph_mode_put Vijendar Mukunda (5): ASoC: amd: vangogh: refactor i2s master mode clock sequence code ASoC: nau8821: enable no_capture_mute flag ASoC: amd: vg: update platform clock control sequence ASoC: amd: vg: apply sample bits pcm constraint ASoC: amd: vg: update acp init and deinit sequence sound/soc/amd/vangogh/acp5x-i2s.c | 26 ++++++-------------- sound/soc/amd/vangogh/acp5x-mach.c | 23 +++++++++++++++++- sound/soc/amd/vangogh/acp5x.h | 29 +++++++++++++++++++++++ sound/soc/amd/vangogh/pci-acp5x.c | 4 ++++ sound/soc/codecs/cs35l41.c | 10 ++++---- sound/soc/codecs/lpass-rx-macro.c | 12 ++++++---- sound/soc/codecs/lpass-va-macro.c | 4 ++-- sound/soc/codecs/nau8821.c | 1 + sound/soc/codecs/rt5682s.c | 26 +++++++------------- sound/soc/codecs/rt5682s.h | 1 - sound/soc/codecs/tlv320adc3xxx.c | 12 ++++++---- sound/soc/codecs/wcd934x.c | 11 +++++---- sound/soc/codecs/wcd938x.c | 10 ++++---- sound/soc/intel/common/soc-acpi-intel-byt-match.c | 2 +- sound/soc/sof/intel/hda-loader.c | 11 +++++---- 15 files changed, 114 insertions(+), 68 deletions(-)

2 1

[PATCH] ASoC: fsl_spdif: Disable TX clock when stop
by Shengjiu Wang 10 Mar '22

10 Mar '22

The TX clock source may be changed in next case, need to disable it when stop, otherwise the TX may not work after changing the clock source, error log is: aplay: pcm_write:2058: write error: Input/output error Fixes: a2388a498ad2 ("ASoC: fsl: Add S/PDIF CPU DAI driver") Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_spdif.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c index 57c41b2f7d17..5f15dae16dd3 100644 --- a/sound/soc/fsl/fsl_spdif.c +++ b/sound/soc/fsl/fsl_spdif.c @@ -610,6 +610,8 @@ static void fsl_spdif_shutdown(struct snd_pcm_substream *substream, mask = SCR_TXFIFO_AUTOSYNC_MASK | SCR_TXFIFO_CTRL_MASK | SCR_TXSEL_MASK | SCR_USRC_SEL_MASK | SCR_TXFIFO_FSEL_MASK; + /* Disable TX clock */ + regmap_update_bits(regmap, REG_SPDIF_STC, STC_TXCLK_ALL_EN_MASK, 0); } else { scr = SCR_RXFIFO_OFF | SCR_RXFIFO_CTL_ZERO; mask = SCR_RXFIFO_FSEL_MASK | SCR_RXFIFO_AUTOSYNC_MASK| -- 2.17.1

3 2

[PATCH -next] ASoC: imx-es8328: Fix error return code in imx_es8328_probe()
by Wang Wensheng 10 Mar '22

10 Mar '22

Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: 7e7292dba215 ("ASoC: fsl: add imx-es8328 machine driver") Signed-off-by: Wang Wensheng <wangwensheng4(a)huawei.com> --- sound/soc/fsl/imx-es8328.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/fsl/imx-es8328.c b/sound/soc/fsl/imx-es8328.c index 09c674ee79f1..168973035e35 100644 --- a/sound/soc/fsl/imx-es8328.c +++ b/sound/soc/fsl/imx-es8328.c @@ -87,6 +87,7 @@ static int imx_es8328_probe(struct platform_device *pdev) if (int_port > MUX_PORT_MAX || int_port == 0) { dev_err(dev, "mux-int-port: hardware only has %d mux ports\n", MUX_PORT_MAX); + ret = -EINVAL; goto fail; } -- 2.17.1

2 1

[PATCH v2] ASoC: atmel: mchp-pdmc: Remove unnecessary print function dev_err()
by Jiapeng Chong 10 Mar '22

10 Mar '22

The print function dev_err() is redundant because platform_get_irq() already prints an error. Eliminate the follow coccicheck warning: ./sound/soc/atmel/mchp-pdmc.c:991:2-9: line 991 is redundant because platform_get_irq() already prints an error. Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> Reviewed-by: Codrin Ciubotariu <codrin.ciubotariu(a)microchip.com> --- Changes in v2: -The braces be removed. sound/soc/atmel/mchp-pdmc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c index c44636f6207d..7b737e3f67b7 100644 --- a/sound/soc/atmel/mchp-pdmc.c +++ b/sound/soc/atmel/mchp-pdmc.c @@ -987,10 +987,8 @@ static int mchp_pdmc_probe(struct platform_device *pdev) return ret; irq = platform_get_irq(pdev, 0); - if (irq < 0) { - dev_err(dev, "failed to get irq: %d\n", irq); + if (irq < 0) return irq; - } dd->pclk = devm_clk_get(dev, "pclk"); if (IS_ERR(dd->pclk)) { -- 2.20.1.7.g153144c

2 1

[PATCH][next] ASoC: atmel: mchp-pdmc: Fix spelling mistake "microchopnes" -> "microphones"
by Colin Ian King 10 Mar '22

10 Mar '22

There is a spelling mistake in a dev_info message. Fix it. Signed-off-by: Colin Ian King <colin.i.king(a)gmail.com> --- sound/soc/atmel/mchp-pdmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/atmel/mchp-pdmc.c b/sound/soc/atmel/mchp-pdmc.c index c44636f6207d..871834fb9b77 100644 --- a/sound/soc/atmel/mchp-pdmc.c +++ b/sound/soc/atmel/mchp-pdmc.c @@ -892,7 +892,7 @@ static int mchp_pdmc_dt_init(struct mchp_pdmc *dd) dd->mic_no /= 2; - dev_info(dd->dev, "%d PDM microchopnes declared\n", dd->mic_no); + dev_info(dd->dev, "%d PDM microphones declared\n", dd->mic_no); /* by default, we consider the order of microphones in mchp,mic-pos to * be the same with the channel mapping; 1st microphone channel 0, 2nd -- 2.35.1

3 2