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

[PATCH] ASoC: sh: rz-ssi: Check return value of pm_runtime_resume_and_get()
by Heiner Kallweit 21 Dec '21

21 Dec '21

The return value of pm_runtime_resume_and_get() needs to be checked to avoid a usage count imbalance in the error case. This fix is basically the same as 92c959bae2e5 ("reset: renesas: Fix Runtime PM usage"), and the last step before pm_runtime_resume_and_get() can be annotated as __must_check. Fixes: 03e786bd4341 ("ASoC: sh: Add RZ/G2L SSIF-2 driver") Cc: stable(a)vger.kernel.org Signed-off-by: Heiner Kallweit <hkallweit1(a)gmail.com> --- sound/soc/sh/rz-ssi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sound/soc/sh/rz-ssi.c b/sound/soc/sh/rz-ssi.c index fa0cc08f7..850387dd8 100644 --- a/sound/soc/sh/rz-ssi.c +++ b/sound/soc/sh/rz-ssi.c @@ -1020,7 +1020,12 @@ static int rz_ssi_probe(struct platform_device *pdev) reset_control_deassert(ssi->rstc); pm_runtime_enable(&pdev->dev); - pm_runtime_resume_and_get(&pdev->dev); + ret = pm_runtime_resume_and_get(&pdev->dev); + if (ret < 0) { + pm_runtime_disable(ssi->dev); + reset_control_assert(ssi->rstc); + return dev_err_probe(ssi->dev, ret, "pm_runtime_resume_and_get failed\n"); + } spin_lock_init(&ssi->lock); dev_set_drvdata(&pdev->dev, ssi); -- 2.34.1

2 1

[PATCH v4 00/22] Support HDMI audio on NVIDIA Tegra20
by Dmitry Osipenko 21 Dec '21

21 Dec '21

This series revives Tegra20 S/PDIF driver which was upstreamed long time ago, but never was used. It also turns Tegra DRM HDMI driver into HDMI audio CODEC provider. Finally, HDMI audio is enabled in device-trees. For now the audio is enable only for Acer A500 tablet and Toshiba AC100 netbook because they're already supported by upstream, later on ASUS TF101 tablet will join them. I based S/PDIF patches on Arnd's Bergmann patch from a separate series [1] that removes obsolete slave_id. This eases merging of the patches by removing the merge conflict. This is a note for Mark Brown. I also based this series on top of power management series [2]. I.e. [2] should be applied first, otherwise "Add S/PDIF node to Tegra20 device-tree" patch should have merge conflict. This is a note for Thierry. [1] https://patchwork.ozlabs.org/project/linux-tegra/list/?series=273312 [2] https://patchwork.ozlabs.org/project/linux-tegra/list/?series=274534 Changelog: v4: - Added patches that update multi_v7_defconfig with the enabled S/PDIF and APB DMA drivers. v3: - Renamed S/PDIF device-tree clocks as was suggested by Rob Herring. - Added r-bs and acks that were given by Rob Herring to v2. v2: - Corrected I2S yaml problem that was reported by the DT bot for v1 by removing the non-existent required clock-names property. - Removed assigned-clocks property from S/PDIF yaml since this property is now inherited from the clocks property. - Reordered the "tegra20: spdif: Set FIFO trigger level" patch, making it the first sound/soc patch in the series, like it was suggested by Mark Brown in the comment to v1. Also reworded commit message of this patch to *not* make it looks like it should be backported to stable kernels. Arnd Bergmann (1): ASoC: tegra20-spdif: stop setting slave_id Dmitry Osipenko (21): ASoC: dt-bindings: Add binding for Tegra20 S/PDIF ASoC: dt-bindings: tegra20-i2s: Convert to schema ASoC: dt-bindings: tegra20-i2s: Document new nvidia,fixed-parent-rate property dt-bindings: host1x: Document optional HDMI sound-dai-cells ASoC: tegra20: spdif: Set FIFO trigger level ASoC: tegra20: spdif: Support device-tree ASoC: tegra20: spdif: Improve driver's code ASoC: tegra20: spdif: Use more resource-managed helpers ASoC: tegra20: spdif: Reset hardware ASoC: tegra20: spdif: Support system suspend ASoC: tegra20: spdif: Filter out unsupported rates ASoC: tegra20: i2s: Filter out unsupported rates drm/tegra: hdmi: Unwind tegra_hdmi_init() errors drm/tegra: hdmi: Register audio CODEC on Tegra20 ARM: tegra_defconfig: Enable S/PDIF driver ARM: config: multi v7: Enable NVIDIA Tegra20 S/PDIF driver ARM: config: multi v7: Enable NVIDIA Tegra20 APB DMA driver ARM: tegra: Add S/PDIF node to Tegra20 device-tree ARM: tegra: Add HDMI audio graph to Tegra20 device-tree ARM: tegra: acer-a500: Enable S/PDIF and HDMI audio ARM: tegra: paz00: Enable S/PDIF and HDMI audio .../display/tegra/nvidia,tegra20-host1x.txt | 1 + .../bindings/sound/nvidia,tegra20-i2s.txt | 30 --- .../bindings/sound/nvidia,tegra20-i2s.yaml | 77 +++++++ .../bindings/sound/nvidia,tegra20-spdif.yaml | 85 ++++++++ .../boot/dts/tegra20-acer-a500-picasso.dts | 8 + arch/arm/boot/dts/tegra20-paz00.dts | 8 + arch/arm/boot/dts/tegra20.dtsi | 40 +++- arch/arm/configs/multi_v7_defconfig | 2 + arch/arm/configs/tegra_defconfig | 1 + drivers/gpu/drm/tegra/Kconfig | 3 + drivers/gpu/drm/tegra/hdmi.c | 168 +++++++++++++-- sound/soc/tegra/tegra20_i2s.c | 49 +++++ sound/soc/tegra/tegra20_spdif.c | 197 ++++++++++++------ sound/soc/tegra/tegra20_spdif.h | 1 + sound/soc/tegra/tegra_pcm.c | 6 + sound/soc/tegra/tegra_pcm.h | 1 + 16 files changed, 574 insertions(+), 103 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.yaml create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-spdif.yaml -- 2.33.1

4 50

[PATCH 0/3] ASoC: SOF: couple of cleanups
by Pierre-Louis Bossart 21 Dec '21

21 Dec '21

Guennadi spotted inconsistencies with our 'const' handling, Ajit Kumar flagged a missing check for a null pointer and we missed the definition of debug zones. This should be queued for 5.17. Ajit Kumar Pandey (1): ASoC: SOF: ipc: Add null pointer check for substream->runtime Guennadi Liakhovetski (1): ASoC: SOF: avoid casting "const" attribute away Karol Trzcinski (1): ipc: debug: Add shared memory heap to memory scan include/sound/sof/debug.h | 2 ++ sound/soc/sof/amd/renoir.c | 7 +++-- sound/soc/sof/intel/atom.c | 13 +++++---- sound/soc/sof/intel/atom.h | 4 +-- sound/soc/sof/intel/bdw.c | 11 +++---- sound/soc/sof/intel/hda.c | 60 ++++++++++++++++++-------------------- sound/soc/sof/intel/hda.h | 4 +-- sound/soc/sof/ipc.c | 3 +- sound/soc/sof/ops.h | 8 +++-- sound/soc/sof/sof-audio.c | 9 +++--- sound/soc/sof/sof-priv.h | 4 +-- 11 files changed, 66 insertions(+), 59 deletions(-) -- 2.25.1

2 4

[PATCH 0/3] ASoC: SOF: remove suport for TRIGGER_RESUME
by Pierre-Louis Bossart 21 Dec '21

21 Dec '21

None of the SOF platforms support INFO_RESUME, and rely on the indirect path used by the ALSA core with the prepare and TRIGGER_START steps. Let's remove the left-over dead code. Ranjani Sridharan (3): ASoC: SOF: pcm: remove support for RESUME trigger ASoC: SOF: Intel: hda: remove support for RESUME trigger ASoC: SOF: Intel: hda: remove support for RESUME in platform trigger sound/soc/sof/intel/hda-dai.c | 10 ---------- sound/soc/sof/intel/hda-stream.c | 1 - sound/soc/sof/pcm.c | 20 -------------------- 3 files changed, 31 deletions(-) -- 2.25.1

2 4

[PATCH] ASoC: SOF: Kconfig: Make the SOF_DEVELOPER_SUPPORT depend on SND_SOC_SOF
by Pierre-Louis Bossart 21 Dec '21

21 Dec '21

From: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> SND_SOC_SOF_DEVELOPER_SUPPORT contains options affecting how the built SOF driver stack will behave, enables debug options and other features. These options have no meaning if the SND_SOC_SOF is not even enabled. If we have SOF client options under developer_support and debug they can be selected to be built even without the core, but they do need symbols from the core (the sof-client API) which can result build failure. In Kconfig we can have SND_SOC_SOF_TOPLEVEL=y SND_SOC_SOF_DEBUG_IPC_FLOOD_TEST=y for example, which will make the flood client to be built, but the SOF core is not as SND_SOC_SOF is not selected. Reviewed-by: Paul Olaru <paul.olaru(a)oss.nxp.com> Reviewed-by: Daniel Baluta <daniel.baluta(a)nxp.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig index ac34c330cf0c..1a7d6cefd3b7 100644 --- a/sound/soc/sof/Kconfig +++ b/sound/soc/sof/Kconfig @@ -63,7 +63,7 @@ config SND_SOC_SOF_DEBUG_PROBES config SND_SOC_SOF_DEVELOPER_SUPPORT bool "SOF developer options support" - depends on EXPERT + depends on EXPERT && SND_SOC_SOF help This option unlocks SOF developer options for debug/performance/ code hardening. -- 2.25.1

2 1

[PATCH v2] ASoC: dt-bindings: audio-graph-port: enable both flag/phandle for bitclock/frame-master
by Kuninori Morimoto 21 Dec '21

21 Dec '21

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> snd_soc_daifmt_parse_clock_provider_raw() is handling both bitclock/frame-master, and is supporting both flag/phandle. Current DT is assuming it is flag style. This patch allows both case. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- v1 -> v2 - anyOf -> oneOf .../devicetree/bindings/sound/audio-graph-port.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml index 43e7f86e3b23..476dcb49ece6 100644 --- a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml +++ b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml @@ -42,10 +42,15 @@ patternProperties: $ref: /schemas/types.yaml#/definitions/flag frame-master: description: Indicates dai-link frame master. - $ref: /schemas/types.yaml#/definitions/phandle + oneOf: + - $ref: /schemas/types.yaml#/definitions/flag + - $ref: /schemas/types.yaml#/definitions/phandle bitclock-master: description: Indicates dai-link bit clock master - $ref: /schemas/types.yaml#/definitions/phandle + oneOf: + - $ref: /schemas/types.yaml#/definitions/flag + - $ref: /schemas/types.yaml#/definitions/phandle + dai-format: description: audio format. items: -- 2.25.1

3 2

[PATCH 00/22] ASoC: Use dev_err_probe() helper
by Kuninori Morimoto 21 Dec '21

21 Dec '21

I'm now posting below patch to ASoC/DT ML, sorry for my multi post, but this patch-set is independent from it. ASoC: dt-bindings: audio-graph-port: enable both flag/phandle for bitclock/frame-master https://lore.kernel.org/r/20211208064852.507977-1-kuninori.morimoto.gx@rene… This patch-set tries to use dev_err_probe() helper function instead of manual dev_err() code. I hope ASoC will be more clean code by this patch-set. - if (err < 0) { - if (err != -EPROBE_DEFER) - dev_err(...); - return err; - } + if (err < 0) + return dev_err_probe(...); Kuninori Morimoto (22): ASoC: codecs: ak4118: Use dev_err_probe() helper ASoC: codecs: es7241: Use dev_err_probe() helper ASoC: codecs: max9759: Use dev_err_probe() helper ASoC: codecs: max9860: Use dev_err_probe() helper ASoC: codecs: pcm3168a: Use dev_err_probe() helper ASoC: codecs: sgtl5000: Use dev_err_probe() helper ASoC: codecs: simple-amplifier: Use dev_err_probe() helper ASoC: codecs: simple-mux: Use dev_err_probe() helper ASoC: codecs: ssm2305: Use dev_err_probe() helper ASoC: codecs: tlv320aic31xx: Use dev_err_probe() helper ASoC: ateml: Use dev_err_probe() helper ASoC: ti: Use dev_err_probe() helper ASoC: fsl: Use dev_err_probe() helper ASoC: generic: Use dev_err_probe() helper ASoC: img: Use dev_err_probe() helper ASoC: meson: Use dev_err_probe() helper ASoC: mxs: Use dev_err_probe() helper ASoC: qcom: Use dev_err_probe() helper ASoC: rockchip: Use dev_err_probe() helper ASoC: samsung: Use dev_err_probe() helper ASoC: stm: Use dev_err_probe() helper ASoC: sunxi: Use dev_err_probe() helper sound/soc/atmel/mikroe-proto.c | 6 +-- sound/soc/atmel/tse850-pcm5142.c | 32 +++++-------- sound/soc/codecs/ak4118.c | 18 +++---- sound/soc/codecs/es7241.c | 28 ++++------- sound/soc/codecs/max9759.c | 28 ++++------- sound/soc/codecs/max9860.c | 12 ++--- sound/soc/codecs/pcm3168a.c | 22 +++------ sound/soc/codecs/sgtl5000.c | 5 +- sound/soc/codecs/simple-amplifier.c | 10 ++-- sound/soc/codecs/simple-mux.c | 10 ++-- sound/soc/codecs/ssm2305.c | 11 ++--- sound/soc/codecs/tlv320aic31xx.c | 16 ++----- sound/soc/fsl/fsl-asoc-card.c | 3 +- sound/soc/fsl/imx-card.c | 17 +++---- sound/soc/fsl/imx-sgtl5000.c | 4 +- sound/soc/fsl/imx-spdif.c | 4 +- sound/soc/generic/audio-graph-card.c | 5 +- sound/soc/generic/audio-graph-card2.c | 4 +- sound/soc/generic/simple-card.c | 3 +- sound/soc/img/img-i2s-in.c | 8 ++-- sound/soc/img/img-i2s-out.c | 24 ++++------ sound/soc/img/img-parallel-out.c | 24 ++++------ sound/soc/img/img-spdif-in.c | 8 ++-- sound/soc/img/img-spdif-out.c | 24 ++++------ sound/soc/img/pistachio-internal-dac.c | 9 ++-- sound/soc/meson/aiu.c | 36 +++++--------- sound/soc/meson/axg-fifo.c | 16 ++----- sound/soc/meson/axg-pdm.c | 25 +++------- sound/soc/meson/axg-spdifin.c | 17 ++----- sound/soc/meson/axg-spdifout.c | 17 ++----- sound/soc/meson/axg-tdm-formatter.c | 50 ++++++-------------- sound/soc/meson/axg-tdm-interface.c | 25 +++------- sound/soc/meson/meson-card-utils.c | 8 ++-- sound/soc/meson/t9015.c | 14 ++---- sound/soc/mxs/mxs-sgtl5000.c | 8 +--- sound/soc/qcom/common.c | 10 ++-- sound/soc/rockchip/rk3288_hdmi_analog.c | 10 ++-- sound/soc/samsung/aries_wm8994.c | 17 +++---- sound/soc/samsung/arndale.c | 5 +- sound/soc/samsung/littlemill.c | 5 +- sound/soc/samsung/lowland.c | 5 +- sound/soc/samsung/odroid.c | 4 +- sound/soc/samsung/smdk_wm8994.c | 4 +- sound/soc/samsung/smdk_wm8994pcm.c | 4 +- sound/soc/samsung/snow.c | 9 ++-- sound/soc/samsung/speyside.c | 5 +- sound/soc/samsung/tm2_wm5110.c | 3 +- sound/soc/samsung/tobermory.c | 5 +- sound/soc/stm/stm32_i2s.c | 62 +++++++++---------------- sound/soc/stm/stm32_sai.c | 37 ++++++--------- sound/soc/stm/stm32_sai_sub.c | 25 ++++------ sound/soc/stm/stm32_spdifrx.c | 44 ++++++------------ sound/soc/sunxi/sun4i-codec.c | 3 +- sound/soc/ti/davinci-mcasp.c | 10 ++-- sound/soc/ti/j721e-evm.c | 10 ++-- 55 files changed, 271 insertions(+), 557 deletions(-) -- 2.25.1

2 23

[PATCH] ASoC: mediatek: mt8195: correct default value
by Trevor Wu 21 Dec '21

21 Dec '21

mt8195_cg_patch is used to reset the default value of audio cg, so the register value could be consistent with CCF reference count. Nevertheless, AUDIO_TOP_CON1[1:0] is used to control an internal mux, and it's expected to keep the default value 0. This patch corrects the default value in case an unexpected behavior happens in the future. Fixes: 6746cc8582599 ("ASoC: mediatek: mt8195: add platform driver") Signed-off-by: Trevor Wu <trevor.wu(a)mediatek.com> --- sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c index 8a6db24116e3..e425f868476a 100644 --- a/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c +++ b/sound/soc/mediatek/mt8195/mt8195-afe-pcm.c @@ -3029,7 +3029,7 @@ static const struct reg_sequence mt8195_afe_reg_defaults[] = { static const struct reg_sequence mt8195_cg_patch[] = { { AUDIO_TOP_CON0, 0xfffffffb }, - { AUDIO_TOP_CON1, 0xfffffffa }, + { AUDIO_TOP_CON1, 0xfffffff8 }, }; static int mt8195_afe_init_registers(struct mtk_base_afe *afe) -- 2.18.0

2 1

RE: [PATCH] sound: fsl: add missing put_device() call in imx_hdmi_probe()
by 王擎 20 Dec '21

20 Dec '21

>> From: Wang Qing <wangqing(a)vivo.com> >> >> of_find_device_by_node() takes a reference to the embedded struct device >> which needs to be dropped when error return. > >... > >> data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); >> if (!data) { >> + put_device(&cpu_pdev->dev); > >If it's of_find_device_by_node() you need an of_node_put() since you're >dropping a reference on the OF node. > Label fail will drop a reference on the OF node. Also, put_device() is called later except this branch, we just need to add put_device() here. Thanks, Qing >> ret = -ENOMEM; >> goto fail;

2 1

[PATCH 0/3] Fix Tegra194 HDA regression
by Sameer Pujar 20 Dec '21

20 Dec '21

HDA probe failure is observed on Tegra194 based platforms and this happens due to a reset failure. The series fixes this problem by avoiding explicit resets on BPMP based devices. Sameer Pujar (3): ALSA: hda/tegra: Skip reset on BPMP devices dt-bindings: sound: tegra: Update HDA resets arm64: tegra: Remove non existent Tegra194 reset .../bindings/sound/nvidia,tegra30-hda.yaml | 13 ++++++++---- arch/arm64/boot/dts/nvidia/tegra194.dtsi | 5 ++--- sound/pci/hda/hda_tegra.c | 24 +++++++++++++++++----- 3 files changed, 30 insertions(+), 12 deletions(-) -- 2.7.4

5 39