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

[PATCH] ASoC: soc-core.c: use devm_snd_soc_register_dai()
by Kuninori Morimoto 01 Aug '23

01 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/soc-core.c | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index a5b96c17633a..7284363b9088 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2552,48 +2552,28 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component, EXPORT_SYMBOL_GPL(snd_soc_register_dai); /** - * snd_soc_unregister_dais - Unregister DAIs from the ASoC core - * - * @component: The component for which the DAIs should be unregistered - */ -static void snd_soc_unregister_dais(struct snd_soc_component *component) -{ - struct snd_soc_dai *dai, *_dai; - - for_each_component_dais_safe(component, dai, _dai) - snd_soc_unregister_dai(dai); -} - -/** - * snd_soc_register_dais - Register a DAI with the ASoC core + * devm_snd_soc_register_dais - Register a DAI with the ASoC core * * @component: The component the DAIs are registered for * @dai_drv: DAI driver to use for the DAIs * @count: Number of DAIs */ -static int snd_soc_register_dais(struct snd_soc_component *component, - struct snd_soc_dai_driver *dai_drv, - size_t count) +static int devm_snd_soc_register_dais(struct snd_soc_component *component, + struct snd_soc_dai_driver *dai_drv, + size_t count) { struct snd_soc_dai *dai; unsigned int i; - int ret; for (i = 0; i < count; i++) { - dai = snd_soc_register_dai(component, dai_drv + i, count == 1 && - component->driver->legacy_dai_naming); - if (dai == NULL) { - ret = -ENOMEM; - goto err; - } + dai = devm_snd_soc_register_dai(component->dev, + component, dai_drv + i, count == 1 && + component->driver->legacy_dai_naming); + if (!dai) + return -ENOMEM; } return 0; - -err: - snd_soc_unregister_dais(component); - - return ret; } #define ENDIANNESS_MAP(name) \ @@ -2644,8 +2624,6 @@ static void snd_soc_del_component_unlocked(struct snd_soc_component *component) { struct snd_soc_card *card = component->card; - snd_soc_unregister_dais(component); - if (card) snd_soc_unbind_card(card, false); @@ -2696,7 +2674,7 @@ int snd_soc_add_component(struct snd_soc_component *component, } } - ret = snd_soc_register_dais(component, dai_drv, num_dai); + ret = devm_snd_soc_register_dais(component, dai_drv, num_dai); if (ret < 0) { dev_err(component->dev, "ASoC: Failed to register DAIs: %d\n", ret); -- 2.25.1

1 0

[PATCH] ASoC: codecs/hda.c: use devm_snd_soc_register_dai()
by Kuninori Morimoto 01 Aug '23

01 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/codecs/hda.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/codecs/hda.c b/sound/soc/codecs/hda.c index d57b043d6bfe..551bd0cbfc44 100644 --- a/sound/soc/codecs/hda.c +++ b/sound/soc/codecs/hda.c @@ -99,7 +99,7 @@ static int hda_codec_register_dais(struct hda_codec *codec, struct snd_soc_compo list_for_each_entry(pcm, &codec->pcm_list_head, list) { struct snd_soc_dai *dai; - dai = snd_soc_register_dai(component, drvs, false); + dai = devm_snd_soc_register_dai(component->dev, component, drvs, false); if (!dai) { dev_err(component->dev, "register dai for %s failed\n", pcm->name); return -EINVAL; @@ -108,7 +108,6 @@ static int hda_codec_register_dais(struct hda_codec *codec, struct snd_soc_compo ret = snd_soc_dapm_new_dai_widgets(dapm, dai); if (ret < 0) { dev_err(component->dev, "create widgets failed: %d\n", ret); - snd_soc_unregister_dai(dai); return ret; } @@ -135,7 +134,6 @@ static void hda_codec_unregister_dais(struct hda_codec *codec, for_each_pcm_streams(stream) snd_soc_dapm_free_widget(snd_soc_dai_get_widget(dai, stream)); - snd_soc_unregister_dai(dai); break; } } -- 2.25.1

1 0

[PATCH 0/2] ASoC: wm8960: Clocking tweaks
by Mark Brown 01 Aug '23

01 Aug '23

A couple of minor clocking improvements that make the wm8960 driver work a bit better with generic cards. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- Mark Brown (2): ASoC: wm8960: Read initial MCLK rate from clock API ASoC: wm8960: Make automatic the default clocking mode sound/soc/codecs/wm8960.c | 8 ++++++++ sound/soc/codecs/wm8960.h | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) --- base-commit: 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 change-id: 20230730-asoc-wm8960-clk-6c7415ee22b4 Best regards, -- Mark Brown <broonie(a)kernel.org>

2 5

params_free functions don't work
by GitHub issues - opened 31 Jul '23

31 Jul '23

alsa-project/alsa-lib issue #341 was opened from imyxh: The following code segfaults on the call to `snd_pcm_hw_params_free` on my machine: ```c #include <alsa/asoundlib.h> void main() { snd_pcm_hw_params_t *params; snd_pcm_hw_params_alloca(&params); snd_pcm_hw_params_free(params); } ``` The same goes for `s/hw/sw/g`. Am I doing something wrong? In more complex examples it seems to fail with munmap_chunk complaining about an invalid pointer, or free complaining about an invalid size. How are the `*_params_free` functions meant to be used? Issue URL : https://github.com/alsa-project/alsa-lib/issues/341 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH] ASoC: codecs: rx-macro: Enable RX path clock to match POST_PMD
by Krzysztof Kozlowski 31 Jul '23

31 Jul '23

The driver disables RX path clock in SND_SOC_DAPM_POST_PMD of rx_macro_enable_interp_clk() and rx_macro_enable_mix_path(). Make the code symmetrical by enabling the clock in SND_SOC_DAPM_PRE_PMU. This also matches downstream Qualcomm driver for Qualcomm SM8550 SoC. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- sound/soc/codecs/lpass-rx-macro.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 685ca95ef4a9..a758ef4f575a 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -2529,6 +2529,9 @@ static int rx_macro_enable_interp_clk(struct snd_soc_component *component, CDC_RX_PATH_PGA_MUTE_MASK, 0x1); snd_soc_component_write_field(component, dsm_reg, CDC_RX_RXn_DSM_CLK_EN_MASK, 0x1); + snd_soc_component_update_bits(component, main_reg, + CDC_RX_PATH_CLK_EN_MASK, + CDC_RX_PATH_CLK_ENABLE); snd_soc_component_update_bits(component, rx_cfg2_reg, CDC_RX_RXn_HPF_CUT_FREQ_MASK, 0x03); rx_macro_load_compander_coeff(component, rx, interp_idx, event); @@ -2595,6 +2598,9 @@ static int rx_macro_enable_mix_path(struct snd_soc_dapm_widget *w, switch (event) { case SND_SOC_DAPM_PRE_PMU: rx_macro_enable_interp_clk(component, event, w->shift); + snd_soc_component_update_bits(component, mix_reg, + CDC_RX_RXn_MIX_CLK_EN_MASK, + CDC_RX_RXn_MIX_CLK_EN_MASK); break; case SND_SOC_DAPM_POST_PMU: snd_soc_component_write(component, gain_reg, -- 2.34.1

2 1

[PATCH 0/5] ASoC: rsnd: add multi Component support
by Kuninori Morimoto 31 Jul '23

31 Jul '23

Hi Mark These are part of "ASoC: add multi Component support" patch-set. The patch-set supports below case as "2 Cards". +-- basic board --------+ |+--------+ | || CPU ch0| <--> CodecA | || ch1| <-+ | |+--------+ | | +-------------|---------+ +-- expansion board ----+ | | | | +-> CodecB| +-----------------------+ Renesas sound driver and its Doc part were held for observation. Rob mentioned that "definitions" vs "$defs". But I got error on "$defs", no error on "definitions". I believe this change is not mandatory. He also mentioned that "reg" is missing, but I also believe that "reg" is automatically handled somehow/somewhere (I'm not sure detail, but other reviewer indicated it before). He also mentioned that "ports" and "port", but added new "ports" needs special handling. Using "ports" vs "port" are different, not compatible on this driver. This means we need both on Doc. Thus, there is no update for these. Kuninori Morimoto (5): 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 +++---- sound/soc/sh/rcar/core.c | 146 ++++++++++++------ sound/soc/sh/rcar/rsnd.h | 4 + 3 files changed, 134 insertions(+), 76 deletions(-) -- 2.25.1

2 6

Re: [PATCH v3 5/6] ASoC: dt-bindings: mediatek,mt7986-wm8960: add mt7986-wm8960 document
by Krzysztof Kozlowski 31 Jul '23

31 Jul '23

On 31/07/2023 09:31, Maso Huang (黃加竹) wrote: > On Fri, 2023-07-28 at 14:49 +0200, Krzysztof Kozlowski wrote: >> >> External email : Please do not click links or open attachments until >> you have verified the sender or the content. >> On 28/07/2023 11:08, Maso Huang wrote: >>> Add document for mt7986 board with wm8960. >>> >>> Signed-off-by: Maso Huang <maso.huang(a)mediatek.com> >>> --- >>> .../sound/mediatek,mt7986-wm8960.yaml | 53 >> +++++++++++++++++++ >>> 1 file changed, 53 insertions(+) >>> create mode 100644 >> Documentation/devicetree/bindings/sound/mediatek,mt7986-wm8960.yaml >>> >>> diff --git >> a/Documentation/devicetree/bindings/sound/mediatek,mt7986-wm8960.yaml >> b/Documentation/devicetree/bindings/sound/mediatek,mt7986-wm8960.yaml >>> new file mode 100644 >>> index 000000000000..76394f7e5502 >>> --- /dev/null >>> +++ b/Documentation/devicetree/bindings/sound/mediatek,mt7986- >> wm8960.yaml >>> @@ -0,0 +1,53 @@ >>> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) >>> +%YAML 1.2 >>> +--- >>> +$id: >> http://devicetree.org/schemas/sound/mediatek,mt7986-wm8960.yaml# >>> +$schema: http://devicetree.org/meta-schemas/core.yaml# >>> + >>> +title: MediaTek MT7986 sound card with WM8960 codec >>> + >>> +maintainers: >>> + - Maso Huang <maso.huang(a)mediatek.com> >>> + >>> +properties: >>> + compatible: >>> + const: mediatek,mt7986-wm8960-machine >>> + >>> + mediatek,platform: >>> + $ref: /schemas/types.yaml#/definitions/phandle >>> + description: The phandle of MT7986 platform. >>> + >>> + audio-routing: >>> + $ref: /schemas/types.yaml#/definitions/non-unique-string-array >>> + description: >>> + A list of the connections between audio components. Each >> entry is a >>> + sink/source pair of strings. Valid names could be the input >> or output >>> + widgets of audio components, power supplies, MicBias of >> codec and the >>> + software switch. >>> + >>> + mediatek,audio-codec: >>> + $ref: /schemas/types.yaml#/definitions/phandle >>> + description: The phandle of wm8960 codec. >>> + >> >> How did you implement Rob's comment? Or did you just ignore it? >> >> Best regards, >> Krzysztof >> > > Hi Krzysztof, > > Sorry, I did not mean to ignore Rob's comment. > I waited for some suggestion in mail below, but it seems Rob was a > little busy. > > https://lore.kernel.org/lkml/8c6316e79e40406e4d46709f602dcb14a4c00562.camel… > > After gentle ping last week and receiving your advice, I thought that > means to send the v3 patch and might discuss dtbingding in v3 series. > > So sorry for misunderstanding it, I'll check the details with Rob in v3 > series then refine it in v4. The problem is that you did not reference in this patch any ongoing discussion and further questions, so comment looks like addressed, while it was not. Rob said: "in a common schema and reference them " You said: "common part yaml and reference to it" so I think you both agreed on the same. The advice would be to create common binding which is then referenced by other and your bindings. However if you start doing it, you will notice that it is impossible, because you have conflicting types for "audio-codec", so you cannot have one definition. This leads to the point - property is probably wrong and you need dai-link with sound-dai property, just like most cards are doing. Best regards, Krzysztof

1 1

[PATCH 0/3] ASoC: mt8188-mt6359: add SOF support
by Trevor Wu 31 Jul '23

31 Jul '23

This series introduces dynamic pinctrl and adds support for the SOF on the mt8188-mt6359 machine driver. Trevor Wu (3): ASoC: mediatek: mt8188-mt6359: support dynamic pinctrl ASoC: mediatek: common: revise SOF common code ASoC: mediatek: mt8188-mt6359: add SOF support .../soc/mediatek/common/mtk-dsp-sof-common.c | 106 ++++++-- .../soc/mediatek/common/mtk-dsp-sof-common.h | 8 + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 238 +++++++++++++++++- 3 files changed, 325 insertions(+), 27 deletions(-) -- 2.18.0

3 12

[PATCH v4] dt-bindings: sound: gtm601: convert to YAML
by David Heidelberg 31 Jul '23

31 Jul '23

Convert GTM601 binding to the YAML format. Signed-off-by: David Heidelberg <david(a)ixit.cz> --- v4: - added missing required property v3: - incorporated feedback from Krzysztof v2: - add #sound-dai-cells - put kernel(a)puri.sm into maintainers .../devicetree/bindings/sound/gtm601.txt | 19 --------- .../bindings/sound/option,gtm601.yaml | 40 +++++++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/gtm601.txt create mode 100644 Documentation/devicetree/bindings/sound/option,gtm601.yaml diff --git a/Documentation/devicetree/bindings/sound/gtm601.txt b/Documentation/devicetree/bindings/sound/gtm601.txt deleted file mode 100644 index efa32a486c4a..000000000000 --- a/Documentation/devicetree/bindings/sound/gtm601.txt +++ /dev/null @@ -1,19 +0,0 @@ -GTM601 UMTS modem audio interface CODEC - -This device has no configuration interface. The sample rate and channels are -based on the compatible string - "option,gtm601" = 8kHz mono - "broadmobi,bm818" = 48KHz stereo - -Required properties: - - - compatible : one of - "option,gtm601" - "broadmobi,bm818" - - -Example: - -codec: gtm601_codec { - compatible = "option,gtm601"; -}; diff --git a/Documentation/devicetree/bindings/sound/option,gtm601.yaml b/Documentation/devicetree/bindings/sound/option,gtm601.yaml new file mode 100644 index 000000000000..69c2ccc79dc5 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/option,gtm601.yaml @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/option,gtm601.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: GTM601 UMTS modem audio interface CODEC + +maintainers: + - kernel(a)puri.sm + +description: > + This device has no configuration interface. The sample rate and channels are + based on the compatible string + +properties: + compatible: + oneOf: + - items: # 48 kHz stereo + - const: broadmobi,bm818 + - const: option,gtm601 + - const: option,gtm601 # 8 kHz mono + + '#sound-dai-cells': + const: 0 + +required: + - compatible + +allOf: + - $ref: dai-common.yaml# + +additionalProperties: false + +examples: + - | + codec { + compatible = "option,gtm601"; + #sound-dai-cells = <0>; + }; -- 2.40.1

4 3

[PATCH v6 0/6] Add cs42l43 PC focused SoundWire CODEC
by Charles Keepax 31 Jul '23

31 Jul '23

This patch chain adds support for the Cirrus Logic cs42l43 PC focused SoundWire CODEC. The chain is currently based of Lee's for-mfd-next branch. This series is mostly just a resend keeping pace with the kernel under it, except for a minor fixup in the spi stuff. Thanks, Charles Charles Keepax (4): dt-bindings: mfd: cirrus,cs42l43: Add initial DT binding mfd: cs42l43: Add support for cs42l43 core driver pinctrl: cs42l43: Add support for the cs42l43 ASoC: cs42l43: Add support for the cs42l43 Lucas Tanure (2): soundwire: bus: Allow SoundWire peripherals to register IRQ handlers spi: cs42l43: Add SPI controller support .../bindings/sound/cirrus,cs42l43.yaml | 313 +++ MAINTAINERS | 4 + drivers/mfd/Kconfig | 23 + drivers/mfd/Makefile | 3 + drivers/mfd/cs42l43-i2c.c | 98 + drivers/mfd/cs42l43-sdw.c | 239 ++ drivers/mfd/cs42l43.c | 1189 +++++++++ drivers/mfd/cs42l43.h | 28 + drivers/pinctrl/cirrus/Kconfig | 11 + drivers/pinctrl/cirrus/Makefile | 2 + drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 609 +++++ drivers/soundwire/bus.c | 32 + drivers/soundwire/bus_type.c | 12 + drivers/spi/Kconfig | 7 + drivers/spi/Makefile | 1 + drivers/spi/spi-cs42l43.c | 284 ++ include/linux/mfd/cs42l43-regs.h | 1184 +++++++++ include/linux/mfd/cs42l43.h | 102 + include/linux/soundwire/sdw.h | 9 + include/sound/cs42l43.h | 17 + sound/soc/codecs/Kconfig | 16 + sound/soc/codecs/Makefile | 4 + sound/soc/codecs/cs42l43-jack.c | 969 +++++++ sound/soc/codecs/cs42l43-sdw.c | 74 + sound/soc/codecs/cs42l43.c | 2278 +++++++++++++++++ sound/soc/codecs/cs42l43.h | 131 + 26 files changed, 7639 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs42l43.yaml create mode 100644 drivers/mfd/cs42l43-i2c.c create mode 100644 drivers/mfd/cs42l43-sdw.c create mode 100644 drivers/mfd/cs42l43.c create mode 100644 drivers/mfd/cs42l43.h create mode 100644 drivers/pinctrl/cirrus/pinctrl-cs42l43.c create mode 100644 drivers/spi/spi-cs42l43.c create mode 100644 include/linux/mfd/cs42l43-regs.h create mode 100644 include/linux/mfd/cs42l43.h create mode 100644 include/sound/cs42l43.h create mode 100644 sound/soc/codecs/cs42l43-jack.c create mode 100644 sound/soc/codecs/cs42l43-sdw.c create mode 100644 sound/soc/codecs/cs42l43.c create mode 100644 sound/soc/codecs/cs42l43.h -- 2.30.2

5 10