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

[PATCH v2 -next] ASoC: stm: Fix PM disable depth imbalance in stm32_i2s_probe
by Zhang Qilong 27 Sep '22

27 Sep '22

The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced according to context. We fix it by moving pm_runtime_enable to the endding of stm32_i2s_probe. Fixes:32a956a1fadf ("ASoC: stm32: i2s: add pm_runtime support") Signed-off-by: Zhang Qilong <zhangqilong3(a)huawei.com> --- v2: - Move pm_runtime_enable to the endding of stm32_i2s_probe and correct fixes commit. --- sound/soc/stm/stm32_i2s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index 6aafe793eec4..ce7f6942308f 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -1136,8 +1136,6 @@ static int stm32_i2s_probe(struct platform_device *pdev) return dev_err_probe(&pdev->dev, PTR_ERR(i2s->regmap), "Regmap init error\n"); - pm_runtime_enable(&pdev->dev); - ret = snd_dmaengine_pcm_register(&pdev->dev, &stm32_i2s_pcm_config, 0); if (ret) return dev_err_probe(&pdev->dev, ret, "PCM DMA register error\n"); @@ -1180,6 +1178,8 @@ static int stm32_i2s_probe(struct platform_device *pdev) FIELD_GET(I2S_VERR_MIN_MASK, val)); } + pm_runtime_enable(&pdev->dev); + return ret; error: -- 2.25.1

2 1

[PATCH -next 0/2] Fix PM disable depth imbalance in stm32 probe
by Zhang Qilong 27 Sep '22

27 Sep '22

The pm_runtime_enable will increase power disable depth. Thus a pairing decrement is needed on the error handling path to keep it balanced. We fix it by moving pm_runtime_enable to the endding of probe. Zhang Qilong (2): ASoC: stm32: dfsdm: Fix PM disable depth imbalance in stm32_adfsdm_probe ASoC: stm32: spdifrx: Fix PM disable depth imbalance in stm32_spdifrx_probe sound/soc/stm/stm32_adfsdm.c | 8 +++++--- sound/soc/stm/stm32_spdifrx.c | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) -- 2.25.1

2 4

[PATCH -next] ASoC: codecs: wcd934x: Fix Kconfig dependency
by Ren Zhijie 27 Sep '22

27 Sep '22

If CONFIG_REGMAP_SLIMBUS is not set, make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu-, will be failed, like this: sound/soc/codecs/wcd934x.o: In function `wcd934x_codec_probe': wcd934x.c:(.text+0x3310): undefined reference to `__regmap_init_slimbus' make: *** [vmlinux] Error 1 Add select REGMAP_SLIMBUS to config SND_SOC_WCD934X. Fixes: a61f3b4f476e ("ASoC: wcd934x: add support to wcd9340/wcd9341 codec") Signed-off-by: Ren Zhijie <renzhijie2(a)huawei.com> --- sound/soc/codecs/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 444cee829a26..e3b90c425faf 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1757,6 +1757,7 @@ config SND_SOC_WCD934X tristate "WCD9340/WCD9341 Codec" depends on COMMON_CLK depends on SLIMBUS + select REGMAP_SLIMBUS select SND_SOC_WCD_MBHC depends on MFD_WCD934X || COMPILE_TEST help -- 2.17.1

3 2

[PATCH RESEND] ASoC: MAINTAINERS: add bindings and APR to Qualcomm Audio entry
by Krzysztof Kozlowski 27 Sep '22

27 Sep '22

Extend the Qualcomm Audio maintainer entry to include sound related bindings and the Qualcomm APR/GPR (Asynchronous/Generic Packet Router) IPC driver, which is tightly related to the Audio DSP. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Acked-by: Bjorn Andersson <andersson(a)kernel.org> --- Resend because it seems I forget to Cc Mark. --- MAINTAINERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 0350effebe8f..453dc6fd0b80 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16710,6 +16710,9 @@ M: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> M: Banajit Goswami <bgoswami(a)quicinc.com> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) S: Supported +F: Documentation/devicetree/bindings/soc/qcom/qcom,apr.yaml +F: Documentation/devicetree/bindings/sound/qcom,* +F: drivers/soc/qcom/apr.c F: include/dt-bindings/sound/qcom,wcd9335.h F: sound/soc/codecs/lpass-rx-macro.* F: sound/soc/codecs/lpass-tx-macro.* -- 2.34.1

2 1

[PATCH 0/2] ASoC: SOF: mediatek: mt8195: Add dsp_ops callback
by Chunxu Li 27 Sep '22

27 Sep '22

ASoC: SOF: mediatek: mt8195: Add pcm_{hw_params,pointer} callback Chunxu Li (2): ASoC: SOF: mediatek: mt8195: Add pcm_hw_params callback ASoC: SOF: mediatek: mt8195: Add pcm_pointer callback sound/soc/sof/mediatek/mt8195/mt8195.c | 44 ++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) -- 2.25.1

3 5

[PATCH 0/6] ASoC: SOF: ipc4/Intel: Improve and enable IPC error dump
by Peter Ujfalusi 27 Sep '22

27 Sep '22

Hi, On Intel platforms the registers for DSP communications are used differently, the IPC dump information is not correct since important registers are not printed and existing ones are used a bit differently for IPC4. As a last step, enable the IPC timeout 'handling' and allow the printout of the now usefull IPC dump. Regards, Peter --- Peter Ujfalusi (6): ASoC: SOF: Intel: cnl: Add separate ops for ipc_dump for IPC4 ASoC: SOF: Intel: hda: Add separate ops for ipc_dump for IPC4 ASoC: SOF: Intel: skl: Use the ipc4 version of the ipc_dump ASoC: SOF: Intel: mtl: Print relevant register in ipc_dump ASoC: SOF: Intel: hda: Only dump firmware registers for IPC3 ASoC: SOF: ipc4: Call snd_sof_handle_fw_exception() in case of timeout sound/soc/sof/intel/apl.c | 7 ++++++- sound/soc/sof/intel/cnl.c | 28 +++++++++++++++++++++++++++- sound/soc/sof/intel/hda-ipc.h | 1 + sound/soc/sof/intel/hda.c | 21 ++++++++++++++++++++- sound/soc/sof/intel/hda.h | 1 + sound/soc/sof/intel/icl.c | 7 ++++++- sound/soc/sof/intel/mtl.c | 17 ++++++++--------- sound/soc/sof/intel/skl.c | 2 +- sound/soc/sof/intel/tgl.c | 7 ++++++- sound/soc/sof/ipc4.c | 1 + 10 files changed, 77 insertions(+), 15 deletions(-) -- 2.37.3

2 7

[PATCH v2 00/12] ASoC: codecs: qcom add support for SM8450 and SC8280XP
by Srinivas Kandagatla 27 Sep '22

27 Sep '22

This patchset adds support for SM8450 and SC8280XP SoC and also some of the fixes requried to get stable audio on X13s. Tested SmartSpeakers and Headset on SM8450 MTP and Lenovo Thinkpad X13s. Changes since v1: - moved va-macro from using of_device_is_compatible to compatible data - added some fixes for qcom codecs. Srinivas Kandagatla (12): ASoC: codecs: wsa-macro: handle swr_reset correctly ASoC: codecs: rx-macro: handle swr_reset correctly ASoC: codecs: tx-macro: handle swr_reset correctly ASoC: codecs: tx-macro: fix active_decimator array ASoC: codecs: tx-macro: fix kcontrol put ASoC: codecs: wsa883x: add clock stop support ASoC: qcom: dt-bindings: add sm8450 and sc8280xp compatibles ASoC: codecs: wsa-macro: add support for sm8450 and sc8280xp ASoC: codecs: tx-macro: add support for sm8450 and sc8280xp ASoC: codecs: rx-macro: add support for sm8450 and sc8280xp ASoC: codecs: va-macro: clear the frame sync counter before enabling ASoC: codecs: va-macro: add support for sm8450 and sc8280xp .../bindings/sound/qcom,lpass-rx-macro.yaml | 2 + .../bindings/sound/qcom,lpass-tx-macro.yaml | 2 + .../bindings/sound/qcom,lpass-va-macro.yaml | 2 + .../bindings/sound/qcom,lpass-wsa-macro.yaml | 2 + sound/soc/codecs/lpass-rx-macro.c | 18 ++-- sound/soc/codecs/lpass-tx-macro.c | 36 ++++---- sound/soc/codecs/lpass-va-macro.c | 82 +++++++++++++++++-- sound/soc/codecs/lpass-wsa-macro.c | 19 ++--- sound/soc/codecs/wsa883x.c | 28 +------ 9 files changed, 120 insertions(+), 71 deletions(-) -- 2.21.0

2 13

[RESEND PATCH] ASoC: fsl_asrc_dma: fully initialize structs
by Shengjiu Wang 27 Sep '22

27 Sep '22

From: Sascha Hauer <s.hauer(a)pengutronix.de> The driver uses two statically ininitialized struct dma_slave_config, but only one of them is initialized to zero. Initialize config_be to zero as well to make sure that no fields are filled with random values. Let the compiler do this instead of explicitly calling memset() which makes it easier to read. Signed-off-by: Sascha Hauer <s.hauer(a)pengutronix.de> Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- sound/soc/fsl/fsl_asrc_dma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c index 12ddf2320f2d..3b81a465814a 100644 --- a/sound/soc/fsl/fsl_asrc_dma.c +++ b/sound/soc/fsl/fsl_asrc_dma.c @@ -139,7 +139,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, struct dma_chan *tmp_chan = NULL, *be_chan = NULL; struct snd_soc_component *component_be = NULL; struct fsl_asrc *asrc = pair->asrc; - struct dma_slave_config config_fe, config_be; + struct dma_slave_config config_fe = {}, config_be = {}; struct sdma_peripheral_config audio_config; enum asrc_pair_index index = pair->index; struct device *dev = component->dev; @@ -183,7 +183,6 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component, return -EINVAL; } - memset(&config_fe, 0, sizeof(config_fe)); ret = snd_dmaengine_pcm_prepare_slave_config(substream, params, &config_fe); if (ret) { dev_err(dev, "failed to prepare DMA config for Front-End\n"); -- 2.34.1

2 1

[PATCH -next] ASoC: Intel: skylake: remove unnecessary dev_set_drvdata()
by Yang Yingliang 27 Sep '22

27 Sep '22

Remove unnecessary dev_set_drvdata() in skl_remove(), the driver_data will be set to NULL in device_unbind_cleanup() after calling ->remove(). Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com> --- sound/soc/intel/skylake/skl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 52a041d6144c..22d9873d12d7 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -1152,7 +1152,6 @@ static void skl_remove(struct pci_dev *pci) if (skl->nhlt) intel_nhlt_free(skl->nhlt); skl_free(bus); - dev_set_drvdata(&pci->dev, NULL); } /* PCI IDs */ -- 2.25.1

2 1

[PATCH 1/2] ASoC: ssm2518: drop support for platform data
by Dmitry Torokhov 27 Sep '22

27 Sep '22

There are currently no users of this driver's platform data in the mainline kernel, so let's drop it. Newer devices should use DT, ACPI, or static software properties to describe the hardware. Signed-off-by: Dmitry Torokhov <dmitry.torokhov(a)gmail.com> --- include/linux/platform_data/ssm2518.h | 21 --------------------- sound/soc/codecs/ssm2518.c | 6 +----- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 include/linux/platform_data/ssm2518.h diff --git a/include/linux/platform_data/ssm2518.h b/include/linux/platform_data/ssm2518.h deleted file mode 100644 index 3f9e632d6f63..000000000000 --- a/include/linux/platform_data/ssm2518.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * SSM2518 amplifier audio driver - * - * Copyright 2013 Analog Devices Inc. - * Author: Lars-Peter Clausen <lars(a)metafoo.de> - */ - -#ifndef __LINUX_PLATFORM_DATA_SSM2518_H__ -#define __LINUX_PLATFORM_DATA_SSM2518_H__ - -/** - * struct ssm2518_platform_data - Platform data for the ssm2518 driver - * @enable_gpio: GPIO connected to the nSD pin. Set to -1 if the nSD pin is - * hardwired. - */ -struct ssm2518_platform_data { - int enable_gpio; -}; - -#endif diff --git a/sound/soc/codecs/ssm2518.c b/sound/soc/codecs/ssm2518.c index 6d8847848299..feee28207e5d 100644 --- a/sound/soc/codecs/ssm2518.c +++ b/sound/soc/codecs/ssm2518.c @@ -13,7 +13,6 @@ #include <linux/slab.h> #include <linux/gpio.h> #include <linux/of_gpio.h> -#include <linux/platform_data/ssm2518.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -736,7 +735,6 @@ static const struct regmap_config ssm2518_regmap_config = { static int ssm2518_i2c_probe(struct i2c_client *i2c) { - struct ssm2518_platform_data *pdata = i2c->dev.platform_data; struct ssm2518 *ssm2518; int ret; @@ -744,9 +742,7 @@ static int ssm2518_i2c_probe(struct i2c_client *i2c) if (ssm2518 == NULL) return -ENOMEM; - if (pdata) { - ssm2518->enable_gpio = pdata->enable_gpio; - } else if (i2c->dev.of_node) { + if (i2c->dev.of_node) { ssm2518->enable_gpio = of_get_gpio(i2c->dev.of_node, 0); if (ssm2518->enable_gpio < 0 && ssm2518->enable_gpio != -ENOENT) return ssm2518->enable_gpio; -- 2.37.3.968.ga6b4b080e4-goog

2 2