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

[PATCH] ASoC: codecs: Fix duplicate included sound/soc.h
by Jiapeng Chong 16 Jun '21

16 Jun '21

Clean up the following includecheck warnings: ./sound/soc/codecs/wcd938x.c: sound/soc.h is included more than once. ./sound/soc/codecs/wcd938x-sdw.c: sound/soc.h is included more than once. No functional change. Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> --- sound/soc/codecs/wcd938x-sdw.c | 1 - sound/soc/codecs/wcd938x.c | 1 - 2 files changed, 2 deletions(-) diff --git a/sound/soc/codecs/wcd938x-sdw.c b/sound/soc/codecs/wcd938x-sdw.c index d82c40e..88334d3 100644 --- a/sound/soc/codecs/wcd938x-sdw.c +++ b/sound/soc/codecs/wcd938x-sdw.c @@ -7,7 +7,6 @@ #include <linux/device.h> #include <linux/kernel.h> #include <linux/component.h> -#include <sound/soc.h> #include <linux/pm_runtime.h> #include <linux/irqdomain.h> #include <linux/of.h> diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index 2cf6145..c0d7452 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -9,7 +9,6 @@ #include <linux/kernel.h> #include <linux/pm_runtime.h> #include <linux/component.h> -#include <sound/soc.h> #include <sound/tlv.h> #include <linux/of_gpio.h> #include <linux/of.h> -- 1.8.3.1

2 1

[PATCH] ASoC: hdmi-codec: make hdmi_codec_controls static
by Jiapeng Chong 16 Jun '21

16 Jun '21

This symbol is not used outside of hdmi-codec.c, so marks it static. Fix the following sparse warning: sound/soc/codecs/hdmi-codec.c:750:25: warning: symbol 'hdmi_codec_controls' was not declared. Should it be static? Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> --- sound/soc/codecs/hdmi-codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index e0460a9..b61f980 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -747,7 +747,7 @@ static int hdmi_codec_mute(struct snd_soc_dai *dai, int mute, int direction) SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S32_BE |\ SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE) -struct snd_kcontrol_new hdmi_codec_controls[] = { +static struct snd_kcontrol_new hdmi_codec_controls[] = { { .access = SNDRV_CTL_ELEM_ACCESS_READ, .iface = SNDRV_CTL_ELEM_IFACE_PCM, -- 1.8.3.1

2 1

[PATCH] ASoC: cs42l42: Correct definition of CS42L42_ADC_PDN_MASK
by Richard Fitzgerald 16 Jun '21

16 Jun '21

The definition of CS42L42_ADC_PDN_MASK was incorrectly defined as the HP_PDN bit. Fixes: 2c394ca79604 ("ASoC: Add support for CS42L42 codec") Signed-off-by: Richard Fitzgerald <rf(a)opensource.cirrus.com> --- sound/soc/codecs/cs42l42.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs42l42.h b/sound/soc/codecs/cs42l42.h index 7bf05ff05f74..206b3c81d3e0 100644 --- a/sound/soc/codecs/cs42l42.h +++ b/sound/soc/codecs/cs42l42.h @@ -79,7 +79,7 @@ #define CS42L42_HP_PDN_SHIFT 3 #define CS42L42_HP_PDN_MASK (1 << CS42L42_HP_PDN_SHIFT) #define CS42L42_ADC_PDN_SHIFT 2 -#define CS42L42_ADC_PDN_MASK (1 << CS42L42_HP_PDN_SHIFT) +#define CS42L42_ADC_PDN_MASK (1 << CS42L42_ADC_PDN_SHIFT) #define CS42L42_PDN_ALL_SHIFT 0 #define CS42L42_PDN_ALL_MASK (1 << CS42L42_PDN_ALL_SHIFT) -- 2.20.1

2 1

[PATCH v2] media: Fix Media Controller API config checks
by Shuah Khan 16 Jun '21

16 Jun '21

Smatch static checker warns that "mdev" can be null: sound/usb/media.c:287 snd_media_device_create() warn: 'mdev' can also be NULL If CONFIG_MEDIA_CONTROLLER is disabled, this file should not be included in the build. The below conditions in the sound/usb/Makefile are in place to ensure that media.c isn't included in the build. sound/usb/Makefile: snd-usb-audio-$(CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER) += media.o select SND_USB_AUDIO_USE_MEDIA_CONTROLLER if MEDIA_CONTROLLER && (MEDIA_SUPPORT=y || MEDIA_SUPPORT=SND_USB_AUDIO) The following config check in include/media/media-dev-allocator.h is in place to enable the API only when CONFIG_MEDIA_CONTROLLER and CONFIG_USB are enabled. #if defined(CONFIG_MEDIA_CONTROLLER) && defined(CONFIG_USB) This check doesn't work as intended when CONFIG_USB=m. When CONFIG_USB=m, CONFIG_USB_MODULE is defined and CONFIG_USB is not. The above config check doesn't catch that CONFIG_USB is defined as a module and disables the API. This results in sound/usb enabling Media Controller specific ALSA driver code, while Media disables the Media Controller API. Fix the problem requires two changes: 1. Change the check to use IS_ENABLED to detect when CONFIG_USB is enabled as a module or static. Since CONFIG_MEDIA_CONTROLLER is a bool, leave the check unchanged to be consistent with drivers/media/Makefile. 2. Change the drivers/media/mc/Makefile to include mc-dev-allocator.o in mc-objs when CONFIG_USB is enabled. Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Link: https://lore.kernel.org/alsa-devel/YLeAvT+R22FQ%2FEyw@mwanda/ Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> --- Changes since v1: - Fixed the drivers/media/mc/Makefile incorrect logic to check CONFIG_USB value. Test with CONFIG_USB_SUPPORT enabled/disabled CONFIG_USB y/m and disabled. drivers/media/mc/Makefile | 2 +- include/media/media-dev-allocator.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/mc/Makefile b/drivers/media/mc/Makefile index 119037f0e686..2b7af42ba59c 100644 --- a/drivers/media/mc/Makefile +++ b/drivers/media/mc/Makefile @@ -3,7 +3,7 @@ mc-objs := mc-device.o mc-devnode.o mc-entity.o \ mc-request.o -ifeq ($(CONFIG_USB),y) +ifneq ($(CONFIG_USB),) mc-objs += mc-dev-allocator.o endif diff --git a/include/media/media-dev-allocator.h b/include/media/media-dev-allocator.h index b35ea6062596..2ab54d426c64 100644 --- a/include/media/media-dev-allocator.h +++ b/include/media/media-dev-allocator.h @@ -19,7 +19,7 @@ struct usb_device; -#if defined(CONFIG_MEDIA_CONTROLLER) && defined(CONFIG_USB) +#if defined(CONFIG_MEDIA_CONTROLLER) && IS_ENABLED(CONFIG_USB) /** * media_device_usb_allocate() - Allocate and return struct &media device * -- 2.30.2

1 0

HDSPconf don't recognize RME RayDat
by GitHub issues - opened 16 Jun '21

16 Jun '21

alsa-project/alsa-tools issue #6 was opened from profejuanca: Hi, I'm using a RME Raydat (PCI express) many years ago, but HDSPconf don't recognize my card never, hdspmixer and the rest of jack/alsa tools see my card without problems, but hdspconf in various distros never sees my card. The output is: `HDSPConf 1.4 - Copyright (C) 2003 Thomas Charbonnel <thomas(a)undata.org> This program comes WITH ABSOLUTELY NO WARRANTY HDSPConf is free software, see the file copying for details Looking for HDSP cards : Card 0 : RME RayDAT S/N 0x3250cb at 0xfe300000, irq 57 Card 1 : HDA ATI SB at 0xfe800000 irq 16 Card 2 : HDA NVidia at 0xfe080000 irq 60 No Hammerfall DSP card found. ` Card 0 es my RME card... I suposse that raydat is not in the list of the tool. Issue URL : https://github.com/alsa-project/alsa-tools/issues/6 Repository URL: https://github.com/alsa-project/alsa-tools

1 0

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

16 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. 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

alsa-lib errors on boot
by GitHub issues - opened 16 Jun '21

16 Jun '21

alsa-project/alsa-lib issue #159 was opened from miquecg: ``` alsactl[769]: alsa-lib parser.c:242:(error_node) UCM is not supported for this HDA model (HD-Audio Generic at 0xfd3c8000 irq 108) alsactl[769]: alsa-lib main.c:1405:(snd_use_case_mgr_open) error: failed to import hw:0 use case configuration -6 alsactl[769]: alsa-lib parser.c:242:(error_node) UCM is not supported for this HDA model (HD-Audio Generic at 0xfd3c0000 irq 109) alsactl[769]: alsa-lib main.c:1405:(snd_use_case_mgr_open) error: failed to import hw:1 use case configuration -6 ``` This is happening on a ThinkPad T14 AMD running Arch Linux and `alsa-lib` 1.2.5.1. Previous version also had this issue. Issue URL : https://github.com/alsa-project/alsa-lib/issues/159 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH 2/2] ASoC: sun50i-dmic: dt-bindings: add DT bindings for DMIC controller
by Ban Tao 16 Jun '21

16 Jun '21

The Allwinner SoCs feature an I2S controller across multiple SoC generations. Signed-off-by: Ban Tao <fengzheng923(a)gmail.com> --- .../sound/allwinner,sun50i-h6-dmic.yaml | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml diff --git a/Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml b/Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml new file mode 100644 index 000000000000..81d40c374e44 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/allwinner,sun50i-h6-dmic.yaml @@ -0,0 +1,66 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/allwinner,sun50i-h6-dmic.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Allwinner H6 DMIC Controller Device Tree Bindings + +maintainers: + - Ban Tao <fengzheng923(a)gmail.com> + +properties: + "#sound-dai-cells": + const: 0 + + compatible: + const: allwinner,sun50i-h6-dmic + + reg: + maxItems: 1 + + clocks: + items: + - description: Bus Clock + - description: Module Clock + + clock-names: + items: + - const: apb + - const: dmic + + dmas: + maxItems: 1 + + dma-names: + const: rx + + resets: + maxItems: 1 + +required: + - "#sound-dai-cells" + - compatible + - reg + - clocks + - clock-names + - dmas + - dma-names + - resets + +additionalProperties: false + +examples: + - | + spdif: spdif@5095000 { + #sound-dai-cells = <0>; + compatible = "allwinner,sun50i-h6-dmic"; + reg = <0x05095000 0x400>; + clocks = <&ccu CLK_BUS_DMIC>, <&ccu CLK_DMIC>; + clock-names = "apb", "dmic"; + dmas = <&dma 7>; + dma-names = "rx"; + resets = <&ccu RST_BUS_DMIC>; + }; + +... -- 2.29.0

4 4

[PATCH] ALSA: oss: Remove redundant assignment to src_access
by Jiapeng Chong 16 Jun '21

16 Jun '21

Variable src_access is set to 'dst_access', but this value is never read as it is not used later on, hence it is a redundant assignment and can be removed. Clean up the following clang-analyzer warning: sound/core/oss/pcm_plugin.c:472:4: warning: Value stored to 'src_access' is never read [clang-analyzer-deadcode.DeadStores]. Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> --- sound/core/oss/pcm_plugin.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/core/oss/pcm_plugin.c b/sound/core/oss/pcm_plugin.c index 061ba06..a7c0e50 100644 --- a/sound/core/oss/pcm_plugin.c +++ b/sound/core/oss/pcm_plugin.c @@ -469,7 +469,6 @@ int snd_pcm_plug_format_plugins(struct snd_pcm_substream *plug, return err; } srcformat = tmpformat; - src_access = dst_access; } tmpformat.rate = dstformat.rate; err = snd_pcm_plugin_build_rate(plug, -- 1.8.3.1

2 1

ALSA: usb-audio: Fix rate on Ozone Z90 USB headset
by Daehwan Jung 16 Jun '21

16 Jun '21

It mislabels its 96 kHz altsetting and that's why it causes some noise Signed-off-by: Daehwan Jung <dh10.jung(a)samsung.com> --- sound/usb/format.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/usb/format.c b/sound/usb/format.c index 2287f8c..eb216fe 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -223,9 +223,11 @@ static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof continue; /* C-Media CM6501 mislabels its 96 kHz altsetting */ /* Terratec Aureon 7.1 USB C-Media 6206, too */ + /* Ozone Z90 USB C-Media, too */ if (rate == 48000 && nr_rates == 1 && (chip->usb_id == USB_ID(0x0d8c, 0x0201) || chip->usb_id == USB_ID(0x0d8c, 0x0102) || + chip->usb_id == USB_ID(0x0d8c, 0x0078) || chip->usb_id == USB_ID(0x0ccd, 0x00b1)) && fp->altsetting == 5 && fp->maxpacksize == 392) rate = 96000; -- 2.7.4

2 1