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

[PATCH v2 00/15] ASoC: add multi Component support
by Kuninori Morimoto 04 Aug '23

04 Aug '23

Hi Mark These are v2 of multi Component support. On below HW case, we would like to use it as "2 Cards", but unfortunately it is impossible in intuitive way, or possible but not intuitive way. In reality, it is handled as "1 big Card" today. +-- basic board --------+ |+--------+ | || CPU ch0| <--> CodecA | || ch1| <-+ | |+--------+ | | +-------------|---------+ +-- expansion board ----+ | | | | +-> CodecB| +-----------------------+ To handling it as intuitive "2 Cards", this patch-set adds multi Component support. To enable this patch-set, I included [01/15] patch into this patch-set which is posted but not yet accepted. v1 -> v2 - include [01/15] patch into this patch-set - add related member to To - add DT member to [14/15][15/15] Link: https://lore.kernel.org/all/87a6b6cofh.wl-kuninori.morimoto.gx@renesas.com/ Link: https://lore.kernel.org/r/87r0q5blta.wl-kuninori.morimoto.gx@renesas.com Link: https://lore.kernel.org/r/20230623-asoc-fix-meson-probe-v1-1-82b2c2ec5ca4@k… Kuninori Morimoto (15): ASoC: soc-core: protect dlc->of_node under mutex ASoC: soc-core.c: initialize dlc on snd_soc_get_dai_id() ASoC: soc-core.c: cleanup soc_dai_link_sanity_check() ASoC: soc-dai.c: add DAI get/match functions ASoC: soc-core.c: enable multi Component ASoC: soc-core.c: add snd_soc_get_dai_via_args() ASoC: soc-core.c: add snd_soc_dlc_use_cpu_as_platform() ASoC: soc-core.c: add snd_soc_copy_dai_args() ASoC: simple-card-utils.c: enable multi Component support ASoC: simple-card.c: enable multi Component support ASoC: rsnd: use DAI driver ID instead of DAI ID ASoC: rsnd: cleanup rsnd_dai_of_node() ASoC: rsnd: enable multi Component support for Audio Graph Card/Card2 ASoC: dt-bindings: renesas,rsnd.yaml: add common port-def ASoC: dt-bindings: renesas,rsnd.yaml: enable multi ports for multi Component support .../bindings/sound/renesas,rsnd.yaml | 60 ++-- include/sound/simple_card_utils.h | 5 +- include/sound/soc-dai.h | 3 + include/sound/soc.h | 6 + sound/soc/generic/audio-graph-card.c | 2 +- sound/soc/generic/audio-graph-card2.c | 2 +- sound/soc/generic/simple-card-utils.c | 23 +- sound/soc/generic/simple-card.c | 20 +- sound/soc/sh/rcar/core.c | 146 +++++++--- sound/soc/sh/rcar/rsnd.h | 4 + sound/soc/soc-core.c | 273 +++++++++++++----- 11 files changed, 378 insertions(+), 166 deletions(-) -- 2.25.1

3 24

[PATCH v2 0/9] sound: Use -EPROBE_DEFER instead of i915 module loading.
by Maarten Lankhorst 04 Aug '23

04 Aug '23

Explicitly loading i915 becomes a problem when upstreaming the new intel driver for Tiger Lake and higher graphics (xe). By loading i915, it doesn't wait for driver load of xe, and will fail completely before it loads. -EPROBE_DEFER has to be returned before any device is created in probe(), otherwise the removal of the device will cause EPROBE_DEFER to try again in an infinite loop. The conversion is done in gradual steps. First I add an argument to snd_hdac_i915_init to allow for -EPROBE_DEFER so I can convert each driver separately. Then I convert each driver to move snd_hdac_i915_init out of the workqueue. Finally I drop the ability to choose modprobe behavior after the last user is converted. I suspect the avs and skylake drivers used snd_hdac_i915_init purely for the modprobe, but I don't have the hardware to test if it can be safely removed. It can still be done easily in a followup patch to simplify probing. --- New since first version: - snd_hda_core.gpu_bind is added as a mechanism to force gpu binding, for testing. snd_hda_core.gpu_bind=0 forces waiting for GPU bind to off, snd_hda_core.gpu_bind=1 forces waiting for gpu bind. Default setting depends on whether kernel booted with nomodeset. - Incorporated all feedback review. Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Cezary Rojewski <cezary.rojewski(a)intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> Cc: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Cc: Bard Liao <yung-chuan.liao(a)linux.intel.com> Cc: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Cc: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Daniel Baluta <daniel.baluta(a)nxp.com> Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Cc: sound-open-firmware(a)alsa-project.org Maarten Lankhorst (9): ALSA: hda/intel: Fix error handling in azx_probe() ALSA: hda/i915: Allow override of gpu binding. ALSA: hda/i915: Add an allow_modprobe argument to snd_hdac_i915_init ALSA: hda/i915: Allow xe as match for i915_component_master_match ASoC: Intel: avs: Move snd_hdac_i915_init to before probe_work. ASoC: Intel: Skylake: Move snd_hdac_i915_init to before probe_work. ALSA: hda/intel: Move snd_hdac_i915_init to before probe_work. ASoC: SOF: Intel: Remove deferred probe for SOF ALSA: hda/i915: Remove extra argument from snd_hdac_i915_init sound/hda/hdac_i915.c | 25 ++++++++------- sound/pci/hda/hda_intel.c | 60 ++++++++++++++++++----------------- sound/soc/intel/avs/core.c | 13 +++++--- sound/soc/intel/skylake/skl.c | 31 ++++++------------ sound/soc/sof/Kconfig | 19 ----------- sound/soc/sof/core.c | 38 ++-------------------- sound/soc/sof/intel/Kconfig | 1 - sound/soc/sof/intel/hda.c | 32 +++++++++++-------- sound/soc/sof/sof-pci-dev.c | 3 +- sound/soc/sof/sof-priv.h | 5 --- 10 files changed, 85 insertions(+), 142 deletions(-) -- 2.39.2

6 36

[PATCH v3 0/6] ASoC: mediatek: Add support for MT7986 SoC
by Maso Huang 04 Aug '23

04 Aug '23

Changes in v3: - merge clk api to mt7986-afe-pcm.c, remove [2/7] in v2 - refine based on reviewer's suggestions [1/6] [2/6] - fix the comment format, move in clk api, and simplify based on reviewer's suggestions [3/6] - remove redundant prefix in dt-binding [6/6] Changes in v2: - v1 title: [PATCH 0/7] ASoC: mediatek: Add support for MT79xx SoC - add missing maintainers - rename mt79xx to mt7986 in all files - use clk bulk api in mt7986-afe-clk.c [2/7] - refine mt79xx-afe-pcm.c based on reviewer's suggestions [4/7] - refine dt-binding files based on reviewer's suggestions [6/7] [7/7] - transpose [3/7] and [4/7] in v1 to fix test build errors Maso Huang (6): ASoC: mediatek: mt7986: add common header ASoC: mediatek: mt7986: support etdm in platform driver ASoC: mediatek: mt7986: add platform driver ASoC: mediatek: mt7986: add machine driver with wm8960 ASoC: dt-bindings: mediatek,mt7986-wm8960: add mt7986-wm8960 document ASoC: dt-bindings: mediatek,mt7986-afe: add audio afe document .../bindings/sound/mediatek,mt7986-afe.yaml | 89 +++ .../sound/mediatek,mt7986-wm8960.yaml | 53 ++ sound/soc/mediatek/Kconfig | 20 + sound/soc/mediatek/Makefile | 1 + sound/soc/mediatek/mt7986/Makefile | 9 + sound/soc/mediatek/mt7986/mt7986-afe-common.h | 49 ++ sound/soc/mediatek/mt7986/mt7986-afe-pcm.c | 622 ++++++++++++++++++ sound/soc/mediatek/mt7986/mt7986-dai-etdm.c | 420 ++++++++++++ sound/soc/mediatek/mt7986/mt7986-reg.h | 206 ++++++ sound/soc/mediatek/mt7986/mt7986-wm8960.c | 184 ++++++ 10 files changed, 1653 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt7986-afe.yaml create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt7986-wm8960.yaml create mode 100644 sound/soc/mediatek/mt7986/Makefile create mode 100644 sound/soc/mediatek/mt7986/mt7986-afe-common.h create mode 100644 sound/soc/mediatek/mt7986/mt7986-afe-pcm.c create mode 100644 sound/soc/mediatek/mt7986/mt7986-dai-etdm.c create mode 100644 sound/soc/mediatek/mt7986/mt7986-reg.h create mode 100644 sound/soc/mediatek/mt7986/mt7986-wm8960.c -- 2.18.0

5 16

[PATCH v2 0/3] Add PWM-DAC audio support for StarFive JH7110 RISC-V SoC
by Hal Feng 03 Aug '23

03 Aug '23

This patchset adds PWM-DAC audio support for the StarFive JH7110 SoC. The PWM-DAC module does not require a hardware codec, but a dummy codec is needed for the driver. The dummy spdif codec driver, which is already upstream, is compatible with the one which JH7110 PWM-DAC needed. So we use it as the dummy codec driver for the JH7110 PWM-DAC module. The third patch depends on tag next-20230728 in linux-next branch. Changes since v1: - Rebase on tag v6.5-rc3. - Drop patch 1 and 2. - Drop the unneeded space and line in patch 3. - Use the dummy spdif codec driver instead of adding a new one. - Change "dai_link->stop_dma_first = 1" to "dai_link->trigger_stop = SND_SOC_TRIGGER_ORDER_LDC" in patch 4. - Drop the unneeded "status = "okay;" in patch 5. - Change some node names in patch 5. --- v1: https://lore.kernel.org/all/20230626110909.38718-1-hal.feng@starfivetech.co… Hal Feng (3): ASoC: dt-bindings: Add StarFive JH7110 PWM-DAC controller ASoC: starfive: Add JH7110 PWM-DAC driver riscv: dts: starfive: Add JH7110 PWM-DAC support .../sound/starfive,jh7110-pwmdac.yaml | 76 ++ MAINTAINERS | 7 + .../jh7110-starfive-visionfive-2.dtsi | 99 +++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 156 ++++ sound/soc/starfive/Kconfig | 9 + sound/soc/starfive/Makefile | 1 + sound/soc/starfive/jh7110_pwmdac.c | 787 ++++++++++++++++++ 7 files changed, 1135 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/starfive,jh7110-pwmdac.yaml create mode 100644 sound/soc/starfive/jh7110_pwmdac.c base-commit: 6eaae198076080886b9e7d57f4ae06fa782f90ef -- 2.38.1

3 7

[PATCH 0/6] ASoC: SOF: misc updates for 6.6
by Pierre-Louis Bossart 03 Aug '23

03 Aug '23

Cleanups, move of code to promote reuse and Mediatek minor updates. Curtis Malainey (1): ASoC: SOF: Deprecate invalid enums in IPC3 Pierre-Louis Bossart (3): ASoC: SOF: Intel: start simplify the signature of link_slaves_found() ASoC: soc-acpi: move link_slaves_found() ASoC: soc-acpi: improve log messagesin link_slaves_found() Trevor Wu (2): ASoC: SOF: ipc3: update dai_link_fixup for SOF_DAI_MEDIATEK_AFE ASoC: SOF: mediatek: mt8186 modify dram type as non-cache include/linux/soundwire/sdw.h | 5 ++ include/linux/soundwire/sdw_intel.h | 7 +-- include/sound/soc-acpi.h | 6 ++ include/sound/sof/topology.h | 4 +- sound/soc/soc-acpi.c | 73 +++++++++++++++++++++++ sound/soc/sof/intel/hda.c | 81 +------------------------- sound/soc/sof/ipc3-pcm.c | 17 ++++++ sound/soc/sof/mediatek/mt8186/mt8186.c | 40 +++++++------ 8 files changed, 130 insertions(+), 103 deletions(-) -- 2.39.2

3 9

[PATCH] ASoC: intel: use devm_snd_soc_register_dai()
by Kuninori Morimoto 02 Aug '23

02 Aug '23

It is still using snd_soc_{un}register_dai() manually. Let's use devm_snd_soc_register_dai(). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/intel/avs/pcm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/intel/avs/pcm.c b/sound/soc/intel/avs/pcm.c index 1fbb2c2fadb5..dd03db31c2d8 100644 --- a/sound/soc/intel/avs/pcm.c +++ b/sound/soc/intel/avs/pcm.c @@ -1309,8 +1309,6 @@ static void avs_component_hda_unregister_dais(struct snd_soc_component *componen for_each_pcm_streams(stream) snd_soc_dapm_free_widget(snd_soc_dai_get_widget(dai, stream)); - - snd_soc_unregister_dai(dai); } } @@ -1375,7 +1373,7 @@ static int avs_component_hda_probe(struct snd_soc_component *component) } } - dai = snd_soc_register_dai(component, &dais[i], false); + dai = devm_snd_soc_register_dai(component->dev, component, &dais[i], false); if (!dai) { dev_err(component->dev, "register dai for %s failed\n", pcm->name); -- 2.25.1

3 3

How do I set up multiple codecs on one I2S - without TDM?
by John Watts 01 Aug '23

01 Aug '23

Hello there! I have an interesting problem that I'm trying to solve. It will require writing adding driver support but right now I'm struggling to understand how I should go about it all. As a background, this is with the Allwinner D1 or T113. It has a 16 channel I2S controller and each channel can be configured to use a specific pin and TDM time slice. Even channels are low LRCLK, odd are high LRCLK. So for my situation I want to have six channels: - Channel 0: Timeslot 0, Pin 0, LRCLK 0 -> ADC 1 - Channel 1: Timeslot 0, Pin 0, LRCLK 1 -> ADC 1 - Channel 2: Timeslot 0, Pin 1, LRCLK 0 -> ADC 2 - Channel 3: Timeslot 0, Pin 1, LRCLK 1 -> ADC 2 - Channel 4: Timeslot 0, Pin 2, LRCLK 0 -> ADC 3 - Channel 5: Timeslot 0, Pin 2, LRCLK 1 -> ADC 3 These ADCs are WM8782s, completely TDM unaware. If they were TDM aware then I could run even more ADCs by having multiple separate TDMs going on each pin. I have tried to look online for I2S controllers that do the same thing but haven't had much luck. The current driver for this controller only supports TDM. So I will have to add support for this. So my questions are: - How do I express this in terms of ALSA and sound card concepts? - How do I express this in the device tree? My immediate thought is that this is a situation where I have a card with 3 dai-links between the I2S controller and each separate codec. I have written this tree as a test: wm8782_1: stereo-adc { compatible = "wlf,wm8782"; Vdda-supply = <&reg_vcc>; Vdd-supply = <&reg_vcc>; #sound-dai-cells = <0>; }; wm8782_2: stereo-adc { compatible = "wlf,wm8782"; Vdda-supply = <&reg_vcc>; Vdd-supply = <&reg_vcc>; #sound-dai-cells = <0>; }; wm8782_3: stereo-adc { compatible = "wlf,wm8782"; Vdda-supply = <&reg_vcc>; Vdd-supply = <&reg_vcc>; #sound-dai-cells = <0>; }; sound { compatible = "simple-audio-card"; simple-audio-card,name = "Testcard In"; simple-audio-card,format = "i2s"; simple-audio-card,bitclock-master = <&sound_cpu>; simple-audio-card,frame-master = <&sound_cpu>; simple-audio-card,mclk-fs = <128>; #address-cells = <1>; #size-cells = <0>; simple-audio-card,dai-link@0 { reg = <0>; sound_cpu: cpu { sound-dai = <&i2s2>; }; codec { sound-dai = <&wm8782_1>; }; }; simple-audio-card,dai-link@1 { reg = <1>; cpu { sound-dai = <&i2s2>; }; codec { sound-dai = <&wm8782_2>; }; }; simple-audio-card,dai-link@2 { reg = <2>; cpu { sound-dai = <&i2s2>; }; codec { sound-dai = <&wm8782_3>; }; }; }; But I get this kernel error: kobject_add_internal failed for 2034000.i2s-wm8782 with -EEXIST, don't try to register things with the same name asoc-simple-card: probe of sound failed with error -12 The WM8782 doesn't support TDM or multiplexing so I'm not exactly sure if this is correct behaviour or my mistake configuring. I tried adding TDM nodes which didn't help. I also tried having a single link with multiple codecs on sound-dai which did create a sound card but it was unclear to me if this was ignoring the other codecs I had listed or not. I also can't test this at this point as the sunxi codec driver assumes that the number of channels is equal to TDM slots, which isn't true any more. Any pointers in the right direction would be a huge help. Surely someone else has had this problem. Thanks, John.

2 3

[PATCH] ASoC: rt5665: add missed regulator_bulk_disable
by Zhang Shurong 01 Aug '23

01 Aug '23

The driver forgets to call regulator_bulk_disable() Add the missed call to fix it. Fixes: 33ada14a26c8 ("ASoC: add rt5665 codec driver") Signed-off-by: Zhang Shurong <zhang_shurong(a)foxmail.com> --- sound/soc/codecs/rt5665.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c index 83c367af91da..de36cad8a559 100644 --- a/sound/soc/codecs/rt5665.c +++ b/sound/soc/codecs/rt5665.c @@ -4756,6 +4756,13 @@ static void rt5665_calibrate_handler(struct work_struct *work) rt5665_calibrate(rt5665); } +static void rt5665_i2c_disable_regulators(void *data) +{ + struct rt5665_priv *rt5665 = data; + + regulator_bulk_disable(ARRAY_SIZE(rt5665->supplies), rt5665->supplies); +} + static int rt5665_i2c_probe(struct i2c_client *i2c) { struct rt5665_platform_data *pdata = dev_get_platdata(&i2c->dev); @@ -4786,6 +4793,11 @@ static int rt5665_i2c_probe(struct i2c_client *i2c) return ret; } + ret = devm_add_action_or_reset(&i2c->dev, rt5665_i2c_disable_regulators, + rt5665); + if (ret) + return ret; + ret = regulator_bulk_enable(ARRAY_SIZE(rt5665->supplies), rt5665->supplies); if (ret != 0) { -- 2.41.0

2 2

[PATCH 00/23] ASoC: Intel: machine driver updates for 6.6
by Pierre-Louis Bossart 01 Aug '23

01 Aug '23

Lots of small cleanups coming from Bard Liao and Charles Keepax for SoundWire platforms, and minor additions for RVPs and Chromebooks. Balamurugan C (1): ASoC: Intel: soc-acpi: Add entry for rt711-sdca-sdw at link 0 in RPL match table Bard Liao (2): ASoC: Intel: sof_sdw: rename link_id to be_id ASoC: Intel: sof_sdw: break earlier when a adr link contains different codecs Chao Song (1): ASoC: Intel: sof_sdw: add cs35l56 codec info Charles Keepax (13): ASoC: intel: sof_sdw: Use consistent variable naming for links ASoC: intel: sof_sdw: Rename codec_idx to codec_dlc_index ASoC: intel: sof_sdw: Remove some extra line breaks ASoC: intel: sof_sdw: Use a module device table ASoC: intel: sof_sdw: Simplify find_codec_info_acpi ASoC: intel: sof_sdw: Constify parameter to find_codec_part_info ASoC: intel: sof_sdw: Minor tidy up of mc_probe ASoC: intel: sof_sdw: Remove redundant parameters in dai creation ASoC: intel: sof_sdw: Move amp_num initialisation to mc_probe ASoC: intel: sof_sdw: Allow direct specification of CODEC name ASoC: intel: sof_sdw: Clean up DAI link counting ASoC: intel: sof_sdw: Merge codec_conf_alloc into dailink_info ASoC: intel: sof_sdw: Move group_generated logic Pierre-Louis Bossart (3): ASoC: Intel: sof_sdw: reorder SoundWire codecs in Kconfig ASoC: Intel: sof_sdw: allow mockup amplifier to provide feedback ASoC: Intel: sof_sdw: add support for SKU 0AFE Terry Cheong (1): ASoC: Intel: sof_rt5682: add RPL support for MAX98357A speaker Uday M Bhat (1): ASoC: Intel: sof_sdw: Update BT offload config for soundwire config apoorv (1): ASoC: Intel: sof_rt5682 add support for HDMI_In capture sound/soc/intel/boards/Kconfig | 5 +- sound/soc/intel/boards/Makefile | 2 +- sound/soc/intel/boards/sof_rt5682.c | 55 +++ sound/soc/intel/boards/sof_sdw.c | 404 +++++++++--------- sound/soc/intel/boards/sof_sdw_common.h | 7 + sound/soc/intel/boards/sof_sdw_cs_amp.c | 47 ++ .../intel/common/soc-acpi-intel-adl-match.c | 7 + .../intel/common/soc-acpi-intel-rpl-match.c | 27 ++ 8 files changed, 342 insertions(+), 212 deletions(-) create mode 100644 sound/soc/intel/boards/sof_sdw_cs_amp.c -- 2.39.2

2 24

[PATCH v4 0/1] Intel: sof_rt5682: remove quirk flag
by Brent Lu 01 Aug '23

01 Aug '23

We add a helper function to detect amplifier number according to device instance in ACPI table so the SOF_MAX98390_TWEETER_SPEAKER_PRESENT flag and a dmi quirk for 4-amplifier configuration could be safely removed. Also refactor the max_98390_hw_params() function to use an array to handle the TDM parameter. Amplifier number detection and TDM parameter are tested on two Chromebooks. One with 2 MAX98390 and one with 4 MAX98390 amplifier. V2 Changes: - fix some typos in cover letter - use for_each_acpi_dev_match() macro to simplify the codec - use 'unsign int' for codec number variable V3 Changes: - replace pr_err() with dev_err() V4 Changes: - merge two patches to avoid build break - remove redundant assignment in max_98390_hw_params() - refactor MAX_98390_DEVX_NAME macros Brent Lu (2): ASoC: Intel: maxim-common: get codec number from ACPI ASoC: Intel: sof_rt5682: remove SOF_MAX98390_TWEETER_SPEAKER_PRESENT flag Brent Lu (1): ASoC: Intel: maxim-common: get codec number from ACPI table sound/soc/intel/boards/sof_maxim_common.c | 170 +++++++++++++--------- sound/soc/intel/boards/sof_maxim_common.h | 21 ++- sound/soc/intel/boards/sof_rt5682.c | 37 +---- 3 files changed, 111 insertions(+), 117 deletions(-) -- 2.34.1

5 6