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

[PATCH] ASoC: dt-bindings: realtek, rt5682s: Drop Tegra specifics from example
by Rob Herring 28 Jan '22

28 Jan '22

There's no need to complicate examples with a platform specific macro. It also complicates example parsing to figure out the number of interrupt cells in examples (based on bracketing). Signed-off-by: Rob Herring <robh(a)kernel.org> --- .../devicetree/bindings/sound/realtek,rt5682s.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml b/Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml index d65c0ed5060c..ca5b8987b749 100644 --- a/Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml +++ b/Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml @@ -21,6 +21,7 @@ properties: description: I2C address of the device. interrupts: + maxItems: 1 description: The CODEC's interrupt output. realtek,dmic1-data-pin: @@ -94,7 +95,7 @@ required: examples: - | - #include <dt-bindings/gpio/tegra-gpio.h> + #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/irq.h> i2c { @@ -104,10 +105,9 @@ examples: codec@1a { compatible = "realtek,rt5682s"; reg = <0x1a>; - interrupt-parent = <&gpio>; - interrupts = <TEGRA_GPIO(U, 6) IRQ_TYPE_LEVEL_HIGH>; + interrupts = <6 IRQ_TYPE_LEVEL_HIGH>; realtek,ldo1-en-gpios = - <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_HIGH>; + <&gpio 2 GPIO_ACTIVE_HIGH>; realtek,dmic1-data-pin = <1>; realtek,dmic1-clk-pin = <1>; realtek,jd-src = <1>; -- 2.32.0

2 1

[PATCH] ASoC: fsl: Add missing error handling in pcm030_fabric_probe
by Miaoqian Lin 28 Jan '22

28 Jan '22

Add the missing platform_device_put() and platform_device_del() before return from pcm030_fabric_probe in the error handling case. Fixes: c912fa913446 ("ASoC: fsl: register the wm9712-codec") Signed-off-by: Miaoqian Lin <linmq006(a)gmail.com> --- sound/soc/fsl/pcm030-audio-fabric.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c index af3c3b90c0ac..02c4ae20c673 100644 --- a/sound/soc/fsl/pcm030-audio-fabric.c +++ b/sound/soc/fsl/pcm030-audio-fabric.c @@ -93,15 +93,22 @@ static int pcm030_fabric_probe(struct platform_device *op) dev_err(&op->dev, "platform_device_alloc() failed\n"); ret = platform_device_add(pdata->codec_device); - if (ret) + if (ret) { dev_err(&op->dev, "platform_device_add() failed: %d\n", ret); + goto exit_device_put; + } ret = snd_soc_register_card(card); if (ret) dev_err(&op->dev, "snd_soc_register_card() failed: %d\n", ret); platform_set_drvdata(op, pdata); + return ret; +exit_release_dev: + platform_device_del(pdata->codec_device); +exit_device_put: + platform_device_put(pdata->codec_device); return ret; } -- 2.17.1

2 3

[PATCH 0/4] ASoC: qcom: fixes for Qualcomm codecs and q6apm
by Srinivas Kandagatla 28 Jan '22

28 Jan '22

Hi Mark, Some recent testing found few issues with wcd938x and lpass-tx codec drivers. WCD938x was accessing array out of boundaries resulting in corruption and system crashes along with not handling kcontrol put return values correctly and rx-macro had incorrect sidetone registers offsets. One final fix in q6apm to add a check if graph started before stopping it. Thanks, srini Srinivas Kandagatla (4): ASoC: codecs: wcd938x: fix incorrect used of portid ASoC: codecs: lpass-rx-macro: fix sidetone register offsets ASoC: codecs: wcd938x: fix return value of mixer put function ASoC: qdsp6: q6apm-dai: only stop graphs that are started sound/soc/codecs/lpass-rx-macro.c | 8 ++++---- sound/soc/codecs/wcd938x.c | 31 +++++++++++++++++-------------- sound/soc/qcom/qdsp6/q6apm-dai.c | 7 +++++-- 3 files changed, 26 insertions(+), 20 deletions(-) -- 2.21.0

2 7

[PATCH 1/2] ASoC: ops: fix signedness bug in snd_soc_put_volsw()
by Dan Carpenter 28 Jan '22

28 Jan '22

The "val" and "val2" variables need to signed for the checking to work as intended. Fixes: 817f7c9335ec ("ASoC: ops: Reject out of bounds values in snd_soc_put_volsw()") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- sound/soc/soc-ops.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index dc0e7c8d31f3..0091fa96eb48 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -310,8 +310,9 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, unsigned int invert = mc->invert; int err; bool type_2r = false; - unsigned int val2 = 0; - unsigned int val, val_mask; + unsigned int val_mask; + int val2 = 0; + int val; if (sign_bit) mask = BIT(sign_bit + 1) - 1; -- 2.20.1

2 5

[PATCH] ASoC: dt-bindings: Centralize the 'sound-dai' definition
by Rob Herring 28 Jan '22

28 Jan '22

'sound-dai' is a common property, but has duplicate type definitions. Create a new common definition to define the type and then update all the other occurrences to just define how many entries there are just like other phandle+arg properties. The constraints on the number of entries is based on the examples and could be wrong. Cc: Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com> Signed-off-by: Rob Herring <robh(a)kernel.org> --- Please ack, this depends on commit abf0fee97313 ("dt-bindings: Improve phandle-array schemas") in my tree. --- .../bindings/sound/amlogic,gx-sound-card.yaml | 4 ++-- .../bindings/sound/google,sc7180-trogdor.yaml | 6 ++++-- .../bindings/sound/imx-audio-card.yaml | 7 +++++-- .../bindings/sound/qcom,sm8250.yaml | 10 +++++++--- .../bindings/sound/samsung,aries-wm8994.yaml | 5 +---- .../bindings/sound/samsung,midas-audio.yaml | 2 -- .../bindings/sound/samsung,odroid.yaml | 9 +++------ .../devicetree/bindings/sound/sound-dai.yaml | 20 +++++++++++++++++++ 8 files changed, 42 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/sound-dai.yaml diff --git a/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml index 2e35aeaa8781..8b5be4b92f35 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml +++ b/Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml @@ -57,7 +57,7 @@ patternProperties: rate sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array + maxItems: 1 description: phandle of the CPU DAI patternProperties: @@ -71,7 +71,7 @@ patternProperties: properties: sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array + maxItems: 1 description: phandle of the codec DAI required: diff --git a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml index 837e3faa63a9..233caa0ade87 100644 --- a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml +++ b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml @@ -62,13 +62,15 @@ patternProperties: description: Holds subnode which indicates cpu dai. type: object properties: - sound-dai: true + sound-dai: + maxItems: 1 codec: description: Holds subnode which indicates codec dai. type: object properties: - sound-dai: true + sound-dai: + maxItems: 1 required: - link-name diff --git a/Documentation/devicetree/bindings/sound/imx-audio-card.yaml b/Documentation/devicetree/bindings/sound/imx-audio-card.yaml index d1816dd061cf..bb3a435722c7 100644 --- a/Documentation/devicetree/bindings/sound/imx-audio-card.yaml +++ b/Documentation/devicetree/bindings/sound/imx-audio-card.yaml @@ -59,13 +59,16 @@ patternProperties: description: Holds subnode which indicates cpu dai. type: object properties: - sound-dai: true + sound-dai: + maxItems: 1 codec: description: Holds subnode which indicates codec dai. type: object properties: - sound-dai: true + sound-dai: + minItems: 1 + maxItems: 2 fsl,mclk-equal-bclk: description: Indicates mclk can be equal to bclk, especially for sai interface diff --git a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml index 4bfda04b4608..4ecd4080bb96 100644 --- a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml +++ b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml @@ -69,19 +69,23 @@ patternProperties: description: Holds subnode which indicates cpu dai. type: object properties: - sound-dai: true + sound-dai: + maxItems: 1 platform: description: Holds subnode which indicates platform dai. type: object properties: - sound-dai: true + sound-dai: + maxItems: 1 codec: description: Holds subnode which indicates codec dai. type: object properties: - sound-dai: true + sound-dai: + minItems: 1 + maxItems: 4 required: - link-name diff --git a/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml b/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml index eb487ed3ca3b..4ffa275b3c49 100644 --- a/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,aries-wm8994.yaml @@ -27,9 +27,6 @@ properties: sound-dai: minItems: 2 maxItems: 2 - items: - maxItems: 1 - $ref: /schemas/types.yaml#/definitions/phandle-array description: | phandles to the I2S controller and bluetooth codec, in that order @@ -38,7 +35,7 @@ properties: type: object properties: sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array + maxItems: 1 description: phandle to the WM8994 CODEC samsung,audio-routing: diff --git a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml index 095775c598fa..ec50bcb4af5f 100644 --- a/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,midas-audio.yaml @@ -21,7 +21,6 @@ properties: type: object properties: sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array maxItems: 1 description: phandle to the I2S controller required: @@ -31,7 +30,6 @@ properties: type: object properties: sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array maxItems: 1 description: phandle to the WM1811 CODEC required: diff --git a/Documentation/devicetree/bindings/sound/samsung,odroid.yaml b/Documentation/devicetree/bindings/sound/samsung,odroid.yaml index e8122bc87362..db2513f3e168 100644 --- a/Documentation/devicetree/bindings/sound/samsung,odroid.yaml +++ b/Documentation/devicetree/bindings/sound/samsung,odroid.yaml @@ -37,18 +37,15 @@ properties: type: object properties: sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array description: phandles to the I2S controllers codec: type: object properties: sound-dai: - $ref: /schemas/types.yaml#/definitions/phandle-array - description: | - List of phandles to the CODEC nodes, - first entry must be corresponding to the MAX98090 CODEC and - the second entry must be the phandle of the HDMI IP block node. + items: + - description: phandle of the MAX98090 CODEC + - description: phandle of the HDMI IP block node samsung,audio-routing: $ref: /schemas/types.yaml#/definitions/non-unique-string-array diff --git a/Documentation/devicetree/bindings/sound/sound-dai.yaml b/Documentation/devicetree/bindings/sound/sound-dai.yaml new file mode 100644 index 000000000000..61c6f7abc4e7 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/sound-dai.yaml @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/sound-dai.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Digital Audio Interface consumer Device Tree Bindings + +maintainers: + - Rob Herring <robh(a)kernel.org> + +select: true + +properties: + sound-dai: + $ref: /schemas/types.yaml#/definitions/phandle-array + description: A phandle plus args to digital audio interface provider(s) + +additionalProperties: true +... -- 2.32.0

4 5

Fix pre-processor defs parsing with recursive includes
by GitHub pull_request - opened 27 Jan '22

27 Jan '22

alsa-project/alsa-utils pull request #140 was opened from ranj063: Since the Define {} config has been removed form the input_cfg, use the tplg_pp->define_cfg_merged for search for variable definitions. Also, fix the parsing logic to first merge all variables from the conf files recursively and then override them with the command line definitions. Request URL : https://github.com/alsa-project/alsa-utils/pull/140 Patch URL : https://github.com/alsa-project/alsa-utils/pull/140.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

acp6x: add initial support for AMD Yellow Carp - ACP6x
by GitHub pull_request - opened 27 Jan '22

27 Jan '22

alsa-project/alsa-ucm-conf pull request #138 was opened from perexg: https://github.com/alsa-project/alsa-ucm-conf/issues/136 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/138 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/138.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

ucm2: Add intial Amlogic GXL support
by GitHub pull_request - opened 27 Jan '22

27 Jan '22

alsa-project/alsa-ucm-conf pull request #137 was opened from jeromebrunet: This adds the support for the GXL-P241 and the LIBRETECH-CC. I have proposed the related ucm-validator PR: https://github.com/alsa-project/alsa-tests/pull/23 I was not successful with txt check: ``` !!Sysfs card info !!--------------- Traceback (most recent call last): File "/home/jbrunet/work/generic/sound/alsa-tests/python/ucm-validator/./ucm.py", line 238, in <module> main(sys.argv) File "/home/jbrunet/work/generic/sound/alsa-tests/python/ucm-validator/./ucm.py", line 233, in main r = globals()[cmd](*argv[2:]) File "/home/jbrunet/work/generic/sound/alsa-tests/python/ucm-validator/./ucm.py", line 185, in do_configs errors, warnings = config_walk(alsainfo_path) File "/home/jbrunet/work/generic/sound/alsa-tests/python/ucm-validator/./ucm.py", line 129, in config_walk errors1, warnings1 = config_walk(path2) File "/home/jbrunet/work/generic/sound/alsa-tests/python/ucm-validator/./ucm.py", line 142, in config_walk info.load(path2) File "/home/jbrunet/work/generic/sound/alsa-tests/python/ucm-validator/../lib/alsainfo.py", line 314, in load raise AlsaInfoError("%s: unknown section %s" % (filename, repr(name))) alsainfo.AlsaInfoError: configs/Meson/LIBRETECH-CC.txt: unknown section 'Sysfs card info' ``` I also check with the dummy json: ``` *** configuration 'configs/Meson/GXL-P241.json' @ AlsaJsonSoundcard(json='GXL-P241', id='GXL-P241', driver='gx-sound-card', name='GXL-P241', longname='GXL-P241') *** Device file 'conf.d/gx-sound-card/GXL-P241.conf' Verb 'HiFi', file 'Meson/p241/p241-HiFi.conf' Device 'Line' Device 'HDMI' ERR: conf.d/gx-sound-card/GXL-P241.conf: Verb=HiFi Device=Line PlaybackPCM defined in SectionVerb ERR: AlsaJsonSoundcard(json='GXL-P241', id='GXL-P241', driver='gx-sound-card', name='GXL-P241', longname='GXL-P241') ERR: total errors: 1 ``` I'm not quite sure where to put the `PlaybackPCM`, if not in `Verb`. The `Device ` section in not a good fit, as far as I understand. On these devices, we have a single PCM interface. HDMI and Line Devices may be enabled on it (possibly simultaneously). Any suggestion ? Looking at pulseaudio, I'm quite happy with the result: ``` $ pactl list sinks Sink #0 State: SUSPENDED Name: alsa_output.platform-sound.HiFi__hw_LIBRETECHCC_0__sink Description: Built-in Audio HDMI + Analog Lineout Driver: module-alsa-card.c Sample Specification: s16le 2ch 44100Hz Channel Map: front-left,front-right Owner Module: 6 Mute: no Volume: front-left: 65536 / 100% / 0.00 dB, front-right: 65536 / 100% / 0.00 dB balance 0.00 Base Volume: 65536 / 100% / 0.00 dB Monitor Source: alsa_output.platform-sound.HiFi__hw_LIBRETECHCC_0__sink.monitor Latency: 0 usec, configured 0 usec Flags: HARDWARE DECIBEL_VOLUME LATENCY Properties: alsa.resolution_bits = "16" device.api = "alsa" device.class = "sound" alsa.class = "generic" alsa.subclass = "generic-mix" alsa.name = "" alsa.id = "fe.dai-link-0 (*)" alsa.subdevice = "0" alsa.subdevice_name = "subdevice #0" alsa.device = "0" alsa.card = "0" alsa.card_name = "LIBRETECH-CC" alsa.long_card_name = "LIBRETECH-CC" alsa.driver_name = "snd_soc_meson_gx_sound_card" device.bus_path = "platform-sound" sysfs.path = "/devices/platform/sound/sound/card0" device.form_factor = "internal" device.string = "_ucm0001.hw:LIBRETECHCC,0" device.buffering.buffer_size = "352768" device.buffering.fragment_size = "176384" device.access_mode = "mmap+timer" device.profile.name = "HiFi: hw:LIBRETECHCC,0: sink" device.profile.description = "HDMI + Analog Lineout" alsa.mixer_device = "_ucm0001.hw:LIBRETECHCC" device.description = "Built-in Audio HDMI + Analog Lineout" module-udev-detect.discovered = "1" device.icon_name = "audio-card" Ports: [Out] HDMI: HDMI (type: HDMI, priority: 100, availability unknown) [Out] Line: Analog Lineout (type: Line, priority: 100, availability unknown) Active Port: [Out] HDMI Formats: pcm ``` Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/137 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/137.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Mouse stopped working in xterm and rxvt-unicode
by GitHub issues - opened 27 Jan '22

27 Jan '22

alsa-project/alsa-utils issue #139 was opened from m-ou-se: Since 1.2.6, I can't control alsamixer with my mouse's scroll wheel anymore in xterm and rxvt-unicode. I'm assuming it's related to this commit: https://github.com/alsa-project/alsa-utils/commit/31820c5f239fca2de12c8d1a7… Issue URL : https://github.com/alsa-project/alsa-utils/issues/139 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[PATCH] ALSA: hda: Fix signedness of sscanf() arguments
by Takashi Iwai 27 Jan '22

27 Jan '22

The %x format of sscanf() takes an unsigned int pointer, while we pass a signed int pointer. Practically it's OK, but this may result in a compile warning. Let's fix it. Fixes: a235d5b8e550 ("ALSA: hda: Allow model option to specify PCI SSID alias") Reported-by: kernel test robot <lkp(a)intel.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_auto_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c index 82c492b05667..cd1db943b7e0 100644 --- a/sound/pci/hda/hda_auto_parser.c +++ b/sound/pci/hda/hda_auto_parser.c @@ -981,7 +981,7 @@ void snd_hda_pick_fixup(struct hda_codec *codec, int id = HDA_FIXUP_ID_NOT_SET; const char *name = NULL; const char *type = NULL; - int vendor, device; + unsigned int vendor, device; if (codec->fixup_id != HDA_FIXUP_ID_NOT_SET) return; -- 2.31.1

1 0