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

[PATCH 0/8] ASoC: mediatek: Add support for MT8195 SoC
by Trevor Wu 23 Jun '21

23 Jun '21

This series of patches adds support for Mediatek AFE of MT8195 SoC. Patches are based on broonie tree "for-next" branch. Trevor Wu (8): ASoC: mediatek: mt8195: update mediatek common driver ASoC: mediatek: mt8195: support etdm in platform driver ASoC: mediatek: mt8195: support adda in platform driver ASoC: mediatek: mt8195: support pcm in platform driver ASoC: mediatek: mt8195: add platform driver dt-bindings: mediatek: mt8195: add audio afe document ASoC: mediatek: mt8195: add machine driver with mt6359, rt1019 and rt5682 dt-bindings: mediatek: mt8195: add mt8195-mt6359-rt1019-rt5682 document .../bindings/sound/mt8195-afe-pcm.yaml | 72 + .../sound/mt8195-mt6359-rt1019-rt5682.yaml | 39 + sound/soc/mediatek/Kconfig | 23 + sound/soc/mediatek/Makefile | 1 + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 20 +- sound/soc/mediatek/common/mtk-base-afe.h | 10 +- sound/soc/mediatek/mt8195/Makefile | 14 + sound/soc/mediatek/mt8195/mt8195-afe-clk.c | 899 +++++ sound/soc/mediatek/mt8195/mt8195-afe-clk.h | 201 + sound/soc/mediatek/mt8195/mt8195-afe-common.h | 200 + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 3264 +++++++++++++++++ sound/soc/mediatek/mt8195/mt8195-dai-adda.c | 929 +++++ sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 2666 ++++++++++++++ sound/soc/mediatek/mt8195/mt8195-dai-pcm.c | 393 ++ .../mt8195/mt8195-mt6359-rt1019-rt5682.c | 974 +++++ sound/soc/mediatek/mt8195/mt8195-reg.h | 2793 ++++++++++++++ 16 files changed, 12494 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/mt8195-afe-pcm.yaml create mode 100644 Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml create mode 100644 sound/soc/mediatek/mt8195/Makefile create mode 100644 sound/soc/mediatek/mt8195/mt8195-afe-clk.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-afe-clk.h create mode 100644 sound/soc/mediatek/mt8195/mt8195-afe-common.h create mode 100644 sound/soc/mediatek/mt8195/mt8195-afe-pcm.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-dai-adda.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-dai-etdm.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-dai-pcm.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-reg.h -- 2.18.0

3 13

[PATCH] MAINTAINERS: Add Focusrite Scarlett Gen 2/3 Mixer Driver entry
by Geoffrey D. Bennett 23 Jun '21

23 Jun '21

Add Focusrite Scarlett Gen 2/3 Mixer Driver entry. Signed-off-by: Geoffrey D. Bennett <g(a)b4.vu> --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index bd7aff0c120f..71e327d970d7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7103,6 +7103,13 @@ L: linux-input(a)vger.kernel.org S: Maintained F: drivers/input/joystick/fsia6b.c +FOCUSRITE SCARLETT GEN 2/3 MIXER DRIVER +M: Geoffrey D. Bennett <g(a)b4.vu> +L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) +S: Maintained +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git +F: sound/usb/mixer_scarlett_gen2.c + FORCEDETH GIGABIT ETHERNET DRIVER M: Rain River <rain.1986.08.12(a)gmail.com> M: Zhu Yanjun <zyjzyj2000(a)gmail.com> -- 2.31.1

2 1

Lenovo Legion/Yoga Slim 7 speaker output
by Cameron Berkenpas 23 Jun '21

23 Jun '21

Hello, I'm working on a patch to get audio output working on the speakers of the Lenovo Legion/Yoga Slim 7 laptops: https://bugzilla.kernel.org/attachment.cgi?id=297559&action=diff Please let me know if this isn't the right place for these types of questions. Both of these laptops have ALC287's that both seem to need some codec initialization to get the speakers working. For both laptops, the specs report ALC3306, but Linux on both systems reports that it's an ALC287, and looking at the PCI ID's on Windows agrees that it's an ALC287. This is my first time working on such a patch, and I'm having a headphone related problem: 1. When plugging headphones into the audio jack, I get sound on the headphones as expected. I see that the speakers are muted and the headphones are unmuted as expected in alsamixer. 2. When I unplug the headphones, I can no longer get speaker output. Monitoring alsamixer, I observe that unplugging the headphones results in the speakers being unmuted and the headphones are muted as expected. However, I am unable to get speaker output in this case. 3. If I plug in the headphones, don't play any sound, and then unplug the headphones, I see the same behavior in alsamixer, BUT speaker output still works. 4. If I apply the initialization verbs via hda-verb (the same verbs that I'm using in my patch), speaker output works again. 5. If speaker output is no longer working (due to #2), putting the laptop to sleep and resuming fixes the speakers. The code in the kernel seems to call the sound card's init again so this makes sense. In short, it seems I need to re-initialize the speakers when the headphones are unplugged. Studying sound/pci/hda/patch_realtek.c, there's alc_headset_mode_unplugged(), but as there's currently no case for 0x10ec0287 at all. I'm not sure adding in a case that re-initializes makes sense if the vast majority of ALC287's don't need to when headphones are unplugged. It seems none of the other cards, at least as far as I can tell, do a re-init when headphones are unplugged either. They just seem to setup some pins and coefficients for the most part if anything at all. How can I re-init the speakers when headphones are unplugged specifically for these specific models? The initial-initialization is only done for these laptops, I'm just unclear what, if any, mechanism there is for initialization on headphone unplugs? Thanks! -Cameron

1 2

[PATCH] ALSA: hdsp: fix a test for copy_to_user() failure
by Dan Carpenter 22 Jun '21

22 Jun '21

The copy_to_user() function returns the number of bytes remaining to be copied. It doesn't return negatives. Fixes: 66c8f75919dd ("ALSA: hdsp: Fix assignment in if condition") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/pci/rme9652/hdsp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c index e3e4fabf4abf..8457a4bbc3df 100644 --- a/sound/pci/rme9652/hdsp.c +++ b/sound/pci/rme9652/hdsp.c @@ -4877,9 +4877,8 @@ static int snd_hdsp_hwdep_ioctl(struct snd_hwdep *hw, struct file *file, unsigne memset(&hdsp_version, 0, sizeof(hdsp_version)); hdsp_version.io_type = hdsp->io_type; hdsp_version.firmware_rev = hdsp->firmware_rev; - err = copy_to_user(argp, &hdsp_version, sizeof(hdsp_version)); - if (err < 0) - return -EFAULT; + if (copy_to_user(argp, &hdsp_version, sizeof(hdsp_version))) + return -EFAULT; break; } case SNDRV_HDSP_IOCTL_UPLOAD_FIRMWARE: { -- 2.30.2

2 1

[PATCH -next] ASoC: SOF: imx: Add missing of_node_put() in imx8_probe()
by Yang Yingliang 22 Jun '21

22 Jun '21

This node pointer is returned by of_parse_phandle() with refcount incremented in this function. of_node_put() on it before exiting this function. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- sound/soc/sof/imx/imx8.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c index 4e7dccadd7d0..12fedf0984bd 100644 --- a/sound/soc/sof/imx/imx8.c +++ b/sound/soc/sof/imx/imx8.c @@ -315,6 +315,7 @@ static int imx8_probe(struct snd_sof_dev *sdev) } ret = of_address_to_resource(res_node, 0, &res); + of_node_put(res_node); if (ret) { dev_err(&pdev->dev, "failed to get reserved region address\n"); goto exit_pdev_unregister; -- 2.25.1

2 1

[PATCH] ASoC: fsl-asoc-card: change dev_err to dev_dbg for defer probe
by Shengjiu Wang 22 Jun '21

22 Jun '21

Don't need to print error message for defer probe Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl-asoc-card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 4f55b316cf0f..b40ba910ae9d 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -709,7 +709,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) of_node_put(framemaster); if (!fsl_asoc_card_is_ac97(priv) && !codec_dev) { - dev_err(&pdev->dev, "failed to find codec device\n"); + dev_dbg(&pdev->dev, "failed to find codec device\n"); ret = -EPROBE_DEFER; goto asrc_fail; } -- 2.27.0

4 4

[PATCH v2 00/10] ASoC: Intel: machine driver corrections
by Pierre-Louis Bossart 22 Jun '21

22 Jun '21

Some of these patches dealing with Sparse warnings were submitted earlier but not merged. I grouped them with a couple of fixes from Kai. v2: added Mark Brown in CC, was missed in v1 added Richard Fitzgerald Tested-by Kai Vehmanen (3): ASoC: Intel: sof_sdw: use mach data for ADL RVP DMIC count ASoC: Intel: sof_sdw: remove hdac-hdmi support ASoC: Intel: skl_hda_dsp_generic: Update Kconfig documentation Pierre-Louis Bossart (7): ASoC: Intel: sof_rt5682: shrink platform_id names below 20 characters ASoC: Intel: glk_rt5682_max98357a: shrink platform_id below 20 characters ASoC: Intel: kbl_da7219_max98357a: shrink platform_id below 20 characters ASoC: Intel: sof_da7219_max98373: shrink platform_id below 20 characters ASoC: Intel: sof_sdw: fix signed/unsigned warning ASoC: Intel: soc-acpi: add ull suffix for SoundWire _ADR values ASoC: Intel: use MODULE_DEVICE_TABLE with platform_device_id tables sound/soc/intel/boards/Kconfig | 7 ++-- sound/soc/intel/boards/bxt_da7219_max98357a.c | 4 +- sound/soc/intel/boards/bxt_rt298.c | 3 +- sound/soc/intel/boards/ehl_rt5660.c | 2 +- sound/soc/intel/boards/glk_rt5682_max98357a.c | 4 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 4 +- sound/soc/intel/boards/kbl_da7219_max98927.c | 5 +-- sound/soc/intel/boards/kbl_rt5660.c | 2 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 3 +- .../intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- .../soc/intel/boards/skl_nau88l25_max98357a.c | 3 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 3 +- sound/soc/intel/boards/skl_rt286.c | 3 +- sound/soc/intel/boards/sof_cs42l42.c | 3 +- sound/soc/intel/boards/sof_da7219_max98373.c | 6 +-- sound/soc/intel/boards/sof_rt5682.c | 20 +++------- sound/soc/intel/boards/sof_sdw.c | 5 +-- sound/soc/intel/boards/sof_sdw_common.h | 1 - sound/soc/intel/boards/sof_sdw_hdmi.c | 37 +----------------- .../intel/common/soc-acpi-intel-adl-match.c | 28 +++++++------- .../intel/common/soc-acpi-intel-cml-match.c | 20 +++++----- .../intel/common/soc-acpi-intel-cnl-match.c | 2 +- .../intel/common/soc-acpi-intel-glk-match.c | 2 +- .../intel/common/soc-acpi-intel-icl-match.c | 12 +++--- .../intel/common/soc-acpi-intel-jsl-match.c | 6 +-- .../intel/common/soc-acpi-intel-kbl-match.c | 2 +- .../intel/common/soc-acpi-intel-tgl-match.c | 38 +++++++++---------- 27 files changed, 83 insertions(+), 144 deletions(-) -- 2.25.1

2 11

[PATCH 1/2] ASoC: codecs: wcd938x: fix unused variable warning
by Srinivas Kandagatla 22 Jun '21

22 Jun '21

This patch fixes below warning: unused variable wcd938x_dt_match by placing device match table under CONFIG_OF Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/codecs/wcd938x.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index 4be61122b0b5..427f51fade37 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -3714,12 +3714,14 @@ static int wcd938x_remove(struct platform_device *pdev) return 0; } +#if defined(CONFIG_OF) static const struct of_device_id wcd938x_dt_match[] = { { .compatible = "qcom,wcd9380-codec" }, { .compatible = "qcom,wcd9385-codec" }, {} }; MODULE_DEVICE_TABLE(of, wcd938x_dt_match); +#endif static struct platform_driver wcd938x_codec_driver = { .probe = wcd938x_probe, -- 2.21.0

2 2

[PATCH RFC 00/15] ASoC: add Audio Graph Card2 driver
by Kuninori Morimoto 22 Jun '21

22 Jun '21

Hi Mark, Rob We already have Audio-Graph-Card which is Of-Graph base general sound card driver. Basically it supports basic CPU-Codec connection, and is also supporting DPCM connection. Because it was forcibly expanded to DPCM, DT parsing is very limited and very difficult to add new features on it, for example Multi CPU/Codec support, Codec2Codec support, etc. And some users want to use Audio-Graph-Card as basic connection and expand its own settings on it. This patch adds more flexible new Audio-Graph-Card2 driver for it. Audio-Graph-Card and Audio-Graph-Card2 are similar, but don't have full compatibility. Audio-Graph-Card2 supports Normal Connection, DPCM Connection, Multi CPU/Codec Connection, Codec2Codec Connection, and possible to Customizing. This patch-set adds Audio-Graph-Card2 driver and customized driver sample, and DT settings sample which can be used for testing. To enable testing/debuging, this patch-set also adds Test-Component driver. We already have Dummy Component and/or Dummy DAI on soc-utils, but 1) we can't use it from DT, 2) it do nothing. Added new Test-Component can be used from DT, and it indicates called function name. We can use it to trace callback order / understanding ALSA SoC behavior, etc. Sample DT settings which can be used for testing is using Test-Component. This patch set includes sample DT for custome driver and/or audio-graph-card2. You can easily try to use/test it if you added below line to your DT file. It needs below CONFIGs. It will probe sample Sound Card which has Normal/DPCM/Multi/Codec2Codec connections. #include "../../../../../sound/soc/generic/audio-graph-card2-sample.dtsi" CONFIG_SND_AUDIO_GRAPH_CARD2 CONFIG_SND_SAMPLE_CUSTOM_CARD CONFIG_SND_TEST_COMPONENT There are some notes. Because Audio Graph Card2 is still under experimental stage, it will indicate such warning when probing, and the DT might be updated/exchanged. It can use Codec2Codec, but it will start automatically when probed, and can't stop it so far. It should be updated. 1 : add Of-Graph *port base* loop which is used at Audio-Graph-Card2 2 - 3 : add Test-Component driver 4 - 10 : add Audio-Graph-Card2 driver 11 : add Audio-Graph-Card2 base custome driver sample 12 - 15 : Audio-Graph-Card2 driver / custome driver DT sample Link: https://lore.kernel.org/r/87k0xszlep.wl-kuninori.morimoto.gx@renesas.com Kuninori Morimoto (15): 1 of: property: add port base loop 2 ASoC: dt-bindings: test-component: add Test Component YAML bindings 3 ASoC: test-component: add Test Component for Sound debug/test 4 ASoC: simple-card-utils: add asoc_graph_is_ports0() 5 ASoC: simple-card-utils: add codec2codec support 6 ASoC: audio-graph-card2: add Audio Graph Card2 driver 7 ASoC: audio-graph-card2: add DPCM support 8 ASoC: audio-graph-card2: add Multi CPU/Codec support 9 ASoC: audio-graph-card2: add Codec2Codec support 10 ASoC: audio-graph-card2: add Yaml Document 11 ASoC: sample-custom-card: add Audio Graph Card2 custome sample 12 ASoC: audio-graph-card2-sample.dtsi: add Sample DT for Audio Graph Card2 13 ASoC: audio-graph-card2-sample.dtsi: add DPCM sample 14 ASoC: audio-graph-card2-sample.dtsi: add Multi CPU/Codec sample 15 ASoC: audio-graph-card2-sample.dtsi: add Codec2Codec sample. .../sound/audio-graph-card2-items.yaml | 36 + .../bindings/sound/audio-graph-card2.yaml | 45 + .../bindings/sound/audio-graph-port2.yaml | 74 + .../bindings/sound/test-component.yaml | 33 + drivers/of/property.c | 69 +- include/linux/of_graph.h | 14 + include/sound/graph_card.h | 24 + include/sound/simple_card_utils.h | 4 + sound/soc/generic/Kconfig | 20 + sound/soc/generic/Makefile | 6 + .../soc/generic/audio-graph-card2-sample.dtsi | 140 ++ sound/soc/generic/audio-graph-card2.c | 1253 +++++++++++++++++ sound/soc/generic/sample-custom-card.c | 160 +++ sound/soc/generic/simple-card-utils.c | 46 +- sound/soc/generic/test-component.c | 659 +++++++++ 15 files changed, 2572 insertions(+), 11 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card2-items.yaml create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-card2.yaml create mode 100644 Documentation/devicetree/bindings/sound/audio-graph-port2.yaml create mode 100644 Documentation/devicetree/bindings/sound/test-component.yaml create mode 100644 sound/soc/generic/audio-graph-card2-sample.dtsi create mode 100644 sound/soc/generic/audio-graph-card2.c create mode 100644 sound/soc/generic/sample-custom-card.c create mode 100644 sound/soc/generic/test-component.c -- 2.25.1

2 17

[PATCH] pci: hda: Add IRQ check for platform_get_irq()
by Jiajun Cao 22 Jun '21

22 Jun '21

The function hda_tegra_first_init() neglects to check the return value after executing platform_get_irq(). hda_tegra_first_init() should check the return value (if negative error number) for errors so as to not pass a negative value to the devm_request_irq(). Fix it by adding a check for the return value irq_id. Signed-off-by: Jiajun Cao <jjcao20(a)fudan.edu.cn> Signed-off-by: Xin Tan <tanxin.ctf(a)gmail.com> --- sound/pci/hda/hda_tegra.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c index 6f2b743b9d75..6c6dc3fcde60 100644 --- a/sound/pci/hda/hda_tegra.c +++ b/sound/pci/hda/hda_tegra.c @@ -262,6 +262,9 @@ static int hda_tegra_first_init(struct azx *chip, struct platform_device *pdev) const char *sname, *drv_name = "tegra-hda"; struct device_node *np = pdev->dev.of_node; + if (irq_id < 0) + return irq_id; + err = hda_tegra_init_chip(chip, pdev); if (err) return err; -- 2.17.1

3 2