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

ThinkPad T14 AMD microphone LED always ON
by GitHub issues - opened 16 Jun '21

16 Jun '21

alsa-project/alsa-ucm-conf issue #100 was opened from miquecg: I'm running Arch Linux with `alsa-ucm-conf` 1.2.5.1. This problem was present in previous versions and it's being discussed on a [forum thread](https://bbs.archlinux.org/viewtopic.php?pid=1977273) among other things. So the problem is that microphone LED is always ON but mute/unmute behaviour still works. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/100 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

rate-lav: Convert to libswresample
by GitHub pull_request - opened 16 Jun '21

16 Jun '21

alsa-project/alsa-plugins pull request #27 was opened from tiwai: The libavresample has been deprecated. Convert to the new API for libswresample. The phase shift and cutoff seem to be either redundant or not-working properly, so those are dropped. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> Request URL : https://github.com/alsa-project/alsa-plugins/pull/27 Patch URL : https://github.com/alsa-project/alsa-plugins/pull/27.patch Repository URL: https://github.com/alsa-project/alsa-plugins

1 0

[PATCH -next] ASoC: hdmi-codec: Make symbol 'hdmi_codec_controls' static
by Wei Yongjun 16 Jun '21

16 Jun '21

The sparse tool complains as follows: sound/soc/codecs/hdmi-codec.c:750:25: warning: symbol 'hdmi_codec_controls' was not declared. Should it be static? This symbol is not used outside of hdmi-codec.c, so marks it static. Fixes: 366b45b97448 ("ASoC: hdmi-codec: Rework to support more controls") Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.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 e0460a9bd17a..b61f980cabdc 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -747,7 +747,7 @@ static const struct snd_soc_dai_ops hdmi_codec_spdif_dai_ops = { 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,

2 1

[PATCH -next] ALSA: fm801: Fix missing pci_release_regions() on error in snd_fm801_create()
by Yang Yingliang 16 Jun '21

16 Jun '21

Fix the missing pci_release_regions() before return from snd_fm801_create() in the error handling case. Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- sound/pci/fm801.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c index ed9dae87145b..adac9c6a67f0 100644 --- a/sound/pci/fm801.c +++ b/sound/pci/fm801.c @@ -1254,6 +1254,7 @@ static int snd_fm801_create(struct snd_card *card, IRQF_SHARED, KBUILD_MODNAME, chip)) { dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq); snd_fm801_free(chip); + pci_release_regions(pci); return -EBUSY; } chip->irq = pci->irq; @@ -1266,6 +1267,7 @@ static int snd_fm801_create(struct snd_card *card, err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); if (err < 0) { snd_fm801_free(chip); + pci_release_regions(pci); return err; } @@ -1273,6 +1275,7 @@ static int snd_fm801_create(struct snd_card *card, err = v4l2_device_register(&pci->dev, &chip->v4l2_dev); if (err < 0) { snd_fm801_free(chip); + pci_release_regions(pci); return err; } chip->tea.v4l2_dev = &chip->v4l2_dev; @@ -1285,6 +1288,7 @@ static int snd_fm801_create(struct snd_card *card, if (snd_tea575x_init(&chip->tea, THIS_MODULE)) { dev_err(card->dev, "TEA575x radio not found\n"); snd_fm801_free(chip); + pci_release_regions(pci); return -ENODEV; } } else if ((chip->tea575x_tuner & TUNER_TYPE_MASK) == 0) { -- 2.25.1

2 2

[PATCH][next] ALSA: bebob: Fix bit flag quirk constants
by Colin King 16 Jun '21

16 Jun '21

From: Colin Ian King <colin.king(a)canonical.com> The quirking bit-flags are currently set as contiguous integer enum values and so currently SND_BEBOB_QUIRK_INITIAL_DISCONTINUOUS_DBC is zero and so he quirking never getting set or tested correctly for this quirk. Fix this by setting the quirking constants as shifted bit values. Addresses-Coverity: ("Bitwise-and with zero") Fixes: 93cd12d6e88a ("ALSA: bebob: code refactoring for model-dependent quirks") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/firewire/bebob/bebob.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/firewire/bebob/bebob.h b/sound/firewire/bebob/bebob.h index c06579d9380e..4d73ecb30d79 100644 --- a/sound/firewire/bebob/bebob.h +++ b/sound/firewire/bebob/bebob.h @@ -76,8 +76,8 @@ struct snd_bebob_spec { }; enum snd_bebob_quirk { - SND_BEBOB_QUIRK_INITIAL_DISCONTINUOUS_DBC, - SND_BEBOB_QUIRK_WRONG_DBC, + SND_BEBOB_QUIRK_INITIAL_DISCONTINUOUS_DBC = (1 << 0), + SND_BEBOB_QUIRK_WRONG_DBC = (1 << 1), }; struct snd_bebob { -- 2.31.1

3 2

[PATCH -next] ALSA: ppc: fix error return code in snd_pmac_probe()
by Yang Yingliang 16 Jun '21

16 Jun '21

If snd_pmac_tumbler_init() or snd_pmac_tumbler_post_init() fails, snd_pmac_probe() need return error code. Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- sound/ppc/powermac.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c index 1d2865c43d4b..db414b61157e 100644 --- a/sound/ppc/powermac.c +++ b/sound/ppc/powermac.c @@ -79,7 +79,11 @@ static int snd_pmac_probe(struct platform_device *devptr) sprintf(card->shortname, "PowerMac %s", name_ext); sprintf(card->longname, "%s (Dev %d) Sub-frame %d", card->shortname, chip->device_id, chip->subframe); - if ( snd_pmac_tumbler_init(chip) < 0 || snd_pmac_tumbler_post_init() < 0) + err = snd_pmac_tumbler_init(chip); + if (err < 0) + goto __error; + err = snd_pmac_tumbler_post_init(); + if (err < 0) goto __error; break; case PMAC_AWACS: -- 2.25.1

2 1

Fix a52 for the recent avcodec
by GitHub pull_request - opened 16 Jun '21

16 Jun '21

alsa-project/alsa-plugins pull request #26 was opened from tiwai: Request URL : https://github.com/alsa-project/alsa-plugins/pull/26 Patch URL : https://github.com/alsa-project/alsa-plugins/pull/26.patch Repository URL: https://github.com/alsa-project/alsa-plugins

1 0

[PATCH] 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 y or m. 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> --- 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..140f0a78540e 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) +ifeq ($(CONFIG_USB),$(filter $(CONFIG_USB),y m)) 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

2 4

conf: refine check for snd_config_is_array
by GitHub pull_request - opened 16 Jun '21

16 Jun '21

alsa-project/alsa-lib pull request #158 was opened from ranj063: Apart from checking the index, also check if the node is not compound to qualify a config as an array. For ex: mixer [ "mixer1" ] is an array but mixer.0 { name "mixer 1" } is not an array even though the id is 0. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Request URL : https://github.com/alsa-project/alsa-lib/pull/158 Patch URL : https://github.com/alsa-project/alsa-lib/pull/158.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

Build fails with "undefined macro AM_GNU_GETTEXT"
by GitHub issues - edited 16 Jun '21

16 Jun '21

alsa-project/alsa-utils issue #99 was edited from edward-a: **./gitcompile** fails with the following output: configure.ac:10: warning: macro 'AM_GNU_GETTEXT' not found in library configure.ac:11: warning: macro 'AM_GNU_GETTEXT_VERSION' not found in library ./gitcompile: line 10: gettextize: command not found configure.ac:15: installing './compile' configure.ac:6: installing './install-sh' configure.ac:6: installing './missing' alsactl/Makefile.am: installing './depcomp' axfer/test/Makefile.am:9: warning: source file '../container.c' is in a subdirectory, axfer/test/Makefile.am:9: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. axfer/test/Makefile.am:9: warning: source file '../container-riff-wave.c' is in a subdirectory, axfer/test/Makefile.am:9: but option 'subdir-objects' is disabled axfer/test/Makefile.am:9: warning: source file '../container-au.c' is in a subdirectory, axfer/test/Makefile.am:9: but option 'subdir-objects' is disabled axfer/test/Makefile.am:9: warning: source file '../container-voc.c' is in a subdirectory, axfer/test/Makefile.am:9: but option 'subdir-objects' is disabled axfer/test/Makefile.am:9: warning: source file '../container-raw.c' is in a subdirectory, axfer/test/Makefile.am:9: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../container.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../container-riff-wave.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../container-au.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../container-voc.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../container-raw.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../mapper.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../mapper-single.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../mapper-multiple.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled parallel-tests: installing './test-driver' **configure.ac:10: error: possibly undefined macro: AM_GNU_GETTEXT If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:11: error: possibly undefined macro: AM_GNU_GETTEXT_VERSION** CFLAGS=-O2 -Wall -pipe -g ./configure checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /usr/bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether to enable maintainer-specific portions of Makefiles... yes ./configure: line 2937: syntax error near unexpected token `external' ./configure: line 2937: `AM_GNU_GETTEXT(external)' ### System info: DISTRIB_ID=Ubuntu DISTRIB_RELEASE=20.04 DISTRIB_CODENAME=focal DISTRIB_DESCRIPTION="Ubuntu 20.04.2 LTS" NAME="Ubuntu" VERSION="20.04.2 LTS (Focal Fossa)" ID=ubuntu ID_LIKE=debian PRETTY_NAME="Ubuntu 20.04.2 LTS" VERSION_ID="20.04" HOME_URL="https://www.ubuntu.com/" SUPPORT_URL="https://help.ubuntu.com/" BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/" PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy" VERSION_CODENAME=focal UBUNTU_CODENAME=focal Issue URL : https://github.com/alsa-project/alsa-utils/issues/99 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

Build failes with "undefined macro AM_GNU_GETTEXT"
by GitHub issues - opened 16 Jun '21

16 Jun '21

alsa-project/alsa-utils issue #99 was opened from edward-a: **./gitcompile** fails with the following output: configure.ac:10: warning: macro 'AM_GNU_GETTEXT' not found in library configure.ac:11: warning: macro 'AM_GNU_GETTEXT_VERSION' not found in library ./gitcompile: line 10: gettextize: command not found configure.ac:15: installing './compile' configure.ac:6: installing './install-sh' configure.ac:6: installing './missing' alsactl/Makefile.am: installing './depcomp' axfer/test/Makefile.am:9: warning: source file '../container.c' is in a subdirectory, axfer/test/Makefile.am:9: but option 'subdir-objects' is disabled automake: warning: possible forward-incompatibility. automake: At least a source file is in a subdirectory, but the 'subdir-objects' automake: automake option hasn't been enabled. For now, the corresponding output automake: object file(s) will be placed in the top-level directory. However, automake: this behaviour will change in future Automake versions: they will automake: unconditionally cause object files to be placed in the same subdirectory automake: of the corresponding sources. automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities. axfer/test/Makefile.am:9: warning: source file '../container-riff-wave.c' is in a subdirectory, axfer/test/Makefile.am:9: but option 'subdir-objects' is disabled axfer/test/Makefile.am:9: warning: source file '../container-au.c' is in a subdirectory, axfer/test/Makefile.am:9: but option 'subdir-objects' is disabled axfer/test/Makefile.am:9: warning: source file '../container-voc.c' is in a subdirectory, axfer/test/Makefile.am:9: but option 'subdir-objects' is disabled axfer/test/Makefile.am:9: warning: source file '../container-raw.c' is in a subdirectory, axfer/test/Makefile.am:9: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../container.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../container-riff-wave.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../container-au.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../container-voc.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../container-raw.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../mapper.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../mapper-single.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled axfer/test/Makefile.am:20: warning: source file '../mapper-multiple.c' is in a subdirectory, axfer/test/Makefile.am:20: but option 'subdir-objects' is disabled parallel-tests: installing './test-driver' **configure.ac:10: error: possibly undefined macro: AM_GNU_GETTEXT If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. configure.ac:11: error: possibly undefined macro: AM_GNU_GETTEXT_VERSION** CFLAGS=-O2 -Wall -pipe -g ./configure checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for a thread-safe mkdir -p... /usr/bin/mkdir -p checking for gawk... gawk checking whether make sets $(MAKE)... yes checking whether make supports nested variables... yes checking whether to enable maintainer-specific portions of Makefiles... yes ./configure: line 2937: syntax error near unexpected token `external' ./configure: line 2937: `AM_GNU_GETTEXT(external)' ### System info: DISTRIB_ID=Ubuntu DISTRIB_RELEASE=20.04 DISTRIB_CODENAME=focal DISTRIB_DESCRIPTION="Ubuntu 20.04.2 LTS" NAME="Ubuntu" VERSION="20.04.2 LTS (Focal Fossa)" ID=ubuntu ID_LIKE=debian PRETTY_NAME="Ubuntu 20.04.2 LTS" VERSION_ID="20.04" HOME_URL="https://www.ubuntu.com/" SUPPORT_URL="https://help.ubuntu.com/" BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/" PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy" VERSION_CODENAME=focal UBUNTU_CODENAME=focal Issue URL : https://github.com/alsa-project/alsa-utils/issues/99 Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[PATCH -next] ASoC: dwc: dwc-i2s: Use devm_platform_get_and_ioremap_resource()
by Yang Yingliang 15 Jun '21

15 Jun '21

Use devm_platform_get_and_ioremap_resource() to simplify code. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- sound/soc/dwc/dwc-i2s.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c index fd4160289fac..8ebf76e04702 100644 --- a/sound/soc/dwc/dwc-i2s.c +++ b/sound/soc/dwc/dwc-i2s.c @@ -636,8 +636,7 @@ static int dw_i2s_probe(struct platform_device *pdev) dw_i2s_dai->ops = &dw_i2s_dai_ops; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - dev->i2s_base = devm_ioremap_resource(&pdev->dev, res); + dev->i2s_base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(dev->i2s_base)) return PTR_ERR(dev->i2s_base); -- 2.25.1

2 1

[PATCH] ASoC: codecs: wcd938x: remove incorrect module interdependency
by Srinivas Kandagatla 15 Jun '21

15 Jun '21

For some reason we ended up with cyclic dependency between snd_soc_wcd938x and snd_soc_wcd938x_sdw modules. Remove this cyclic dependency by handling them in respective modules. Without this below error is reported during make modules_install depmod: ERROR: Cycle detected: snd_soc_wcd938x -> snd_soc_wcd938x_sdw -> snd_soc_wcd938x depmod: ERROR: Found 2 modules in dependency cycles! Fixes: 045442228868 ("ASoC: codecs: wcd938x: add audio routing and Kconfig") Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/codecs/wcd938x-sdw.c | 19 ++++++++++++------- sound/soc/codecs/wcd938x.c | 27 +++++---------------------- sound/soc/codecs/wcd938x.h | 4 +--- 3 files changed, 18 insertions(+), 32 deletions(-) diff --git a/sound/soc/codecs/wcd938x-sdw.c b/sound/soc/codecs/wcd938x-sdw.c index d82c40ec6898..d1cabf300c36 100644 --- a/sound/soc/codecs/wcd938x-sdw.c +++ b/sound/soc/codecs/wcd938x-sdw.c @@ -176,8 +176,19 @@ static int wcd9380_interrupt_callback(struct sdw_slave *slave, struct sdw_slave_intr_status *status) { struct wcd938x_sdw_priv *wcd = dev_get_drvdata(&slave->dev); + struct irq_domain *slave_irq = wcd->slave_irq; + struct regmap *regmap = dev_get_regmap(&slave->dev, NULL); + u32 sts1, sts2, sts3; - return wcd938x_handle_sdw_irq(wcd); + do { + handle_nested_irq(irq_find_mapping(slave_irq, 0)); + regmap_read(regmap, WCD938X_DIGITAL_INTR_STATUS_0, &sts1); + regmap_read(regmap, WCD938X_DIGITAL_INTR_STATUS_1, &sts2); + regmap_read(regmap, WCD938X_DIGITAL_INTR_STATUS_2, &sts3); + + } while (sts1 || sts2 || sts3); + + return IRQ_HANDLED; } static struct sdw_slave_ops wcd9380_slave_ops = { @@ -239,16 +250,10 @@ static int wcd9380_probe(struct sdw_slave *pdev, SDW_SCP_INT1_PARITY; pdev->prop.lane_control_support = true; if (wcd->is_tx) { - struct regmap *rm; - pdev->prop.source_ports = GENMASK(WCD938X_MAX_SWR_PORTS, 0); pdev->prop.src_dpn_prop = wcd938x_dpn_prop; wcd->ch_info = &wcd938x_sdw_tx_ch_info[0]; pdev->prop.wake_capable = true; - - rm = devm_regmap_init_sdw(pdev, &wcd938x_regmap_config); - if (IS_ERR(rm)) - return PTR_ERR(rm); } else { pdev->prop.sink_ports = GENMASK(WCD938X_MAX_SWR_PORTS, 0); pdev->prop.sink_dpn_prop = wcd938x_dpn_prop; diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index a2c76dc8fd89..24afe93830ce 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -1198,7 +1198,7 @@ static bool wcd938x_volatile_register(struct device *dev, unsigned int reg) return false; } -struct regmap_config wcd938x_regmap_config = { +static struct regmap_config wcd938x_regmap_config = { .name = "wcd938x_csr", .reg_bits = 32, .val_bits = 8, @@ -1211,7 +1211,6 @@ struct regmap_config wcd938x_regmap_config = { .volatile_reg = wcd938x_volatile_register, .can_multi_write = true, }; -EXPORT_SYMBOL_GPL(wcd938x_regmap_config); static const struct regmap_irq wcd938x_irqs[WCD938X_NUM_IRQS] = { REGMAP_IRQ_REG(WCD938X_IRQ_MBHC_BUTTON_PRESS_DET, 0, 0x01), @@ -3472,24 +3471,6 @@ static int wcd938x_reset(struct wcd938x_priv *wcd938x) return 0; } -int wcd938x_handle_sdw_irq(struct wcd938x_sdw_priv *wcd) -{ - struct wcd938x_priv *wcd938x = wcd->wcd938x; - struct irq_domain *slave_irq = wcd938x->virq; - u32 sts1, sts2, sts3; - - do { - handle_nested_irq(irq_find_mapping(slave_irq, 0)); - regmap_read(wcd938x->regmap, WCD938X_DIGITAL_INTR_STATUS_0, &sts1); - regmap_read(wcd938x->regmap, WCD938X_DIGITAL_INTR_STATUS_1, &sts2); - regmap_read(wcd938x->regmap, WCD938X_DIGITAL_INTR_STATUS_2, &sts3); - - } while (sts1 || sts2 || sts3); - - return IRQ_HANDLED; -} -EXPORT_SYMBOL_GPL(wcd938x_handle_sdw_irq); - static int wcd938x_codec_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) @@ -3573,6 +3554,7 @@ static int wcd938x_bind(struct device *dev) } wcd938x->sdw_priv[AIF1_PB] = dev_get_drvdata(wcd938x->rxdev); wcd938x->sdw_priv[AIF1_PB]->wcd938x = wcd938x; + wcd938x->sdw_priv[AIF1_PB]->slave_irq = wcd938x->virq; wcd938x->txdev = wcd938x_sdw_device_get(wcd938x->txnode); if (!wcd938x->txdev) { @@ -3581,6 +3563,7 @@ static int wcd938x_bind(struct device *dev) } wcd938x->sdw_priv[AIF1_CAP] = dev_get_drvdata(wcd938x->txdev); wcd938x->sdw_priv[AIF1_CAP]->wcd938x = wcd938x; + wcd938x->sdw_priv[AIF1_CAP]->slave_irq = wcd938x->virq; wcd938x->tx_sdw_dev = dev_to_sdw_dev(wcd938x->txdev); if (!wcd938x->tx_sdw_dev) { dev_err(dev, "could not get txslave with matching of dev\n"); @@ -3607,8 +3590,8 @@ static int wcd938x_bind(struct device *dev) return -EINVAL; } - wcd938x->regmap = dev_get_regmap(wcd938x->txdev, NULL); - if (!wcd938x->regmap) { + wcd938x->regmap = devm_regmap_init_sdw(wcd938x->tx_sdw_dev, &wcd938x_regmap_config); + if (IS_ERR(wcd938x->regmap)) { dev_err(dev, "%s: tx csr regmap not found\n", __func__); return PTR_ERR(wcd938x->regmap); } diff --git a/sound/soc/codecs/wcd938x.h b/sound/soc/codecs/wcd938x.h index 9db3ab6e47a6..07b08de4cebf 100644 --- a/sound/soc/codecs/wcd938x.h +++ b/sound/soc/codecs/wcd938x.h @@ -663,11 +663,9 @@ struct wcd938x_sdw_priv { int num_ports; bool is_tx; struct wcd938x_priv *wcd938x; + struct irq_domain *slave_irq; }; -extern struct regmap_config wcd938x_regmap_config; -int wcd938x_handle_sdw_irq(struct wcd938x_sdw_priv *priv); - #if IS_ENABLED(CONFIG_SND_SOC_WCD938X_SDW) int wcd938x_sdw_free(struct wcd938x_sdw_priv *wcd, struct snd_pcm_substream *substream, -- 2.21.0

2 2

[PATCH -next] ASoC: jz4740-i2s: Use devm_platform_get_and_ioremap_resource()
by Yang Yingliang 15 Jun '21

15 Jun '21

Use devm_platform_get_and_ioremap_resource() to simplify code. Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- sound/soc/jz4740/jz4740-i2s.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index 65d0bf939134..7ad5d9a924d8 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c @@ -525,8 +525,7 @@ static int jz4740_i2s_dev_probe(struct platform_device *pdev) i2s->soc_info = device_get_match_data(dev); - mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - i2s->base = devm_ioremap_resource(dev, mem); + i2s->base = devm_platform_get_and_ioremap_resource(pdev, 0, &mem); if (IS_ERR(i2s->base)) return PTR_ERR(i2s->base); -- 2.25.1

2 1

[PATCH 0/4] ASoC: qdsp6: Add Quinary MI2S ports support
by Gabriel David 15 Jun '21

15 Jun '21

Various devices(such as the Motorola Moto G7 Power, codename ocean) use the Quinary MI2S ports for reproducing audio. Add support to them in kernel. Signed-off-by: Gabriel David <ultracoolguy(a)disroot.org> Gabriel David (4): ASoC: q6afe: dt-bindings: Add QUIN_MI2S_RX/TX ASoC: qdsp6: q6afe: Add Quinary MI2S ports ASoC: qdsp6: q6afe-dai: Add Quinary MI2S ports ASoC: qdsp6: q6routing: Add Quinary MI2S ports include/dt-bindings/sound/qcom,q6afe.h | 2 ++ sound/soc/qcom/qdsp6/q6afe-dai.c | 41 ++++++++++++++++++++++++++ sound/soc/qcom/qdsp6/q6afe.c | 8 +++++ sound/soc/qcom/qdsp6/q6afe.h | 2 +- sound/soc/qcom/qdsp6/q6routing.c | 11 +++++++ 5 files changed, 63 insertions(+), 1 deletion(-) --- As a warning, I'm currently the only tester of these patches. If that's gonna be a problem then I understand. -- 2.31.1

3 6