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

[PATCH v2 0/2] powerpc: Remove support for ppc405/440 Xilinx platforms
by Michal Simek 03 Jun '20

03 Jun '20

Hi, recently we wanted to update xilinx intc driver and we found that function which we wanted to remove is still wired by ancient Xilinx PowerPC platforms. Here is the thread about it. https://lore.kernel.org/linux-next/48d3232d-0f1d-42ea-3109-f44bbabfa2e8@xil… I have been talking about it internally and there is no interest in these platforms and it is also orphan for quite a long time. None is really running/testing these platforms regularly that's why I think it makes sense to remove them also with drivers which are specific to this platform. U-Boot support was removed in 2017 without anybody complain about it https://github.com/Xilinx/u-boot-xlnx/commit/98f705c9cefdfdba62c069821bbba1… Based on current ppc/next. If anyone has any objection about it, please let me know. Thanks, Michal Changes in v2: - Remove also sound/drivers/pcm-indirect2.[ch] files Reported-by: Takashi Iwai <tiwai(a)suse.de> - Based on my chat with Arnd I removed arch/powerpc/xmon/ changes done in v1 to keep them the same as before. (kbuild reported some issues with it too) Michal Simek (2): sound: ac97: Remove sound driver for ancient platform powerpc: Remove Xilinx PPC405/PPC440 support Documentation/devicetree/bindings/xilinx.txt | 143 -- Documentation/powerpc/bootwrapper.rst | 28 +- MAINTAINERS | 6 - arch/powerpc/Kconfig.debug | 2 +- arch/powerpc/boot/Makefile | 7 +- arch/powerpc/boot/dts/Makefile | 1 - arch/powerpc/boot/dts/virtex440-ml507.dts | 406 ------ arch/powerpc/boot/dts/virtex440-ml510.dts | 466 ------- arch/powerpc/boot/ops.h | 1 - arch/powerpc/boot/serial.c | 5 - arch/powerpc/boot/uartlite.c | 79 -- arch/powerpc/boot/virtex.c | 97 -- arch/powerpc/boot/virtex405-head.S | 31 - arch/powerpc/boot/wrapper | 8 - arch/powerpc/configs/40x/virtex_defconfig | 75 - arch/powerpc/configs/44x/virtex5_defconfig | 74 - arch/powerpc/configs/ppc40x_defconfig | 8 - arch/powerpc/configs/ppc44x_defconfig | 8 - arch/powerpc/include/asm/xilinx_intc.h | 16 - arch/powerpc/include/asm/xilinx_pci.h | 21 - arch/powerpc/kernel/cputable.c | 39 - arch/powerpc/platforms/40x/Kconfig | 31 - arch/powerpc/platforms/40x/Makefile | 1 - arch/powerpc/platforms/40x/virtex.c | 54 - arch/powerpc/platforms/44x/Kconfig | 37 - arch/powerpc/platforms/44x/Makefile | 2 - arch/powerpc/platforms/44x/virtex.c | 60 - arch/powerpc/platforms/44x/virtex_ml510.c | 30 - arch/powerpc/platforms/Kconfig | 4 - arch/powerpc/sysdev/Makefile | 2 - arch/powerpc/sysdev/xilinx_intc.c | 88 -- arch/powerpc/sysdev/xilinx_pci.c | 132 -- drivers/char/Kconfig | 2 +- drivers/video/fbdev/Kconfig | 2 +- sound/drivers/Kconfig | 12 - sound/drivers/Makefile | 2 - sound/drivers/ml403-ac97cr.c | 1298 ------------------ sound/drivers/pcm-indirect2.c | 560 -------- sound/drivers/pcm-indirect2.h | 127 -- 39 files changed, 7 insertions(+), 3958 deletions(-) delete mode 100644 arch/powerpc/boot/dts/virtex440-ml507.dts delete mode 100644 arch/powerpc/boot/dts/virtex440-ml510.dts delete mode 100644 arch/powerpc/boot/uartlite.c delete mode 100644 arch/powerpc/boot/virtex.c delete mode 100644 arch/powerpc/boot/virtex405-head.S delete mode 100644 arch/powerpc/configs/40x/virtex_defconfig delete mode 100644 arch/powerpc/configs/44x/virtex5_defconfig delete mode 100644 arch/powerpc/include/asm/xilinx_intc.h delete mode 100644 arch/powerpc/include/asm/xilinx_pci.h delete mode 100644 arch/powerpc/platforms/40x/virtex.c delete mode 100644 arch/powerpc/platforms/44x/virtex.c delete mode 100644 arch/powerpc/platforms/44x/virtex_ml510.c delete mode 100644 arch/powerpc/sysdev/xilinx_intc.c delete mode 100644 arch/powerpc/sysdev/xilinx_pci.c delete mode 100644 sound/drivers/ml403-ac97cr.c delete mode 100644 sound/drivers/pcm-indirect2.c delete mode 100644 sound/drivers/pcm-indirect2.h -- 2.26.0

5 12

[PATCH] ALSA: es1688: Add the missed snd_card_free()
by Chuhong Yuan 03 Jun '20

03 Jun '20

snd_es968_pnp_detect() misses a snd_card_free() in a failed path. Add the missed function call to fix it. Fixes: a20971b201ac ("ALSA: Merge es1688 and es968 drivers") Signed-off-by: Chuhong Yuan <hslester96(a)gmail.com> --- sound/isa/es1688/es1688.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c index ff3a05ad99c0..64610571a5e1 100644 --- a/sound/isa/es1688/es1688.c +++ b/sound/isa/es1688/es1688.c @@ -267,8 +267,10 @@ static int snd_es968_pnp_detect(struct pnp_card_link *pcard, return error; } error = snd_es1688_probe(card, dev); - if (error < 0) + if (error < 0) { + snd_card_free(card); return error; + } pnp_set_card_drvdata(pcard, card); snd_es968_pnp_is_probed = 1; return 0; -- 2.26.2

2 1

[GIT PULL] ASoC updates for v5.8
by Mark Brown 03 Jun '20

03 Jun '20

The following changes since commit 9cb1fd0efd195590b828b9b865421ad345a4a145: Linux 5.7-rc7 (2020-05-24 15:32:54 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v5.8 for you to fetch changes up to 358c7c61fd04d324f83d7968daf8dd9a6ff86a9a: Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus (2020-06-01 13:01:15 +0100) ---------------------------------------------------------------- ASoC: Updates for v5.8 This has been another very active release with a bunch of new drivers, lots of fixes everywhere and continued core improvements from Morimoto-san: - Lots of core cleanups and refactorings from Morimoto-san, factoring out common operations and making the card abstraction more solid. - Continued work on cleaning up and improving the Intel drivers, along with some new platform support for them. - Fixes to make the Marvell SSPA driver work upstream. - Support for AMD Renoir ACP, Dialog DA7212, Freescale EASRC and i.MX8M, Intel Elkhard Lake, Maxim MAX98390, Nuvoton NAU8812 and NAU8814 and Realtek RT1016. ---------------------------------------------------------------- Akshu Agrawal (2): ASoC: amd :High hw_level while simultaneous capture ASoC: amd: raven: Make the driver name consistent across files Amadeusz Sławiński (3): ASoC: topology: Remove unneeded semicolon ASoC: Intel: baytrail: Fix register access ASoC: Intel: Use readq to read 64 bit registers Andy Shevchenko (1): ASoC: Intel: Skylake: Replace guid_copy() with import_guid() Ard Biesheuvel (1): ASoC: cros_ec_codec: switch to library API for SHA-256 Arnd Bergmann (7): ASoC: component: suppress uninitialized-variable warning ASoC: codecs: wm97xx: fix ac97 dependency ASoC: fsl_easrc: mark PM functions __maybe_unused ASoC: rt5682: fix I2C/Soundwire dependencies ASoC: SOF: sort out Kconfig, again ASoC: cros_ec_codec: allocate shash_desc dynamically ASoC: rt5682: split i2c driver into separate module Artur Kloniecki (1): ASoC: SOF: Add XRUN flags field to struct sof_ipc_buffer. Bard Liao (9): ASoC: intel: sof_sdw: init all aggregated codecs ASoC: SOF: topology: fix: handle DAI widget connections properly with multiple CPU DAI's ASoC: SOF: align sof_ipc_dai_alh_params with FW ASoC: SOF: topology: Get ALH rate amd channels from topology ASoC: SOF: topology: fix: parse hda_tokens to &config->hda ASoC: SOF: topology: Get HDA rate and channels from topology ASoC: SOF: topology: send ipc for all found DAIs in sof_set_dai_config ASoC: topology: set component dai_index to ipc dai config dai_index ASoC: SOF: topology: replace sof_link_hda_process by sof_set_dai_config Brent Lu (3): ASoC: bdw-rt5677: add channel constraint ASoC: bdw-rt5650: add channel constraint ASoC: broadwell: add channel constraint Cezary Rojewski (2): ASoC: Intel: haswell: Power transition refactor ASoC: Intel: Skylake: Update description for HDaudio kconfig Charles Keepax (1): ASoC: dapm: Move dai_link widgets to runtime to fix use after free ChenTao (1): soc: fsl_asrc: Make some functions static Chris Garren (1): ASoC: adau7118: Mark the ADAU7118 reset register as volatile Christophe JAILLET (2): ASoC: ux500: mop500: Fix some refcounted resources issues ASoC: ti: omap-mcbsp: Fix an error handling path in 'asoc_mcbsp_probe()' Chuhong Yuan (1): ASoC: sta32x: add missed function calls in error paths Colin Ian King (1): ASoC: fsl_easrc: fix spelling mistake "prefitler" -> "prefilter" Dan Murphy (9): ASoC: tlv320adcx140: Fix mic gain registers ASoC: tlv320adcx140: Fix bias config values ASoC: tlv320adcx140: Add controls for PDM clk ASoC: tlv320adcx140: Add device tree property for PDM edges ASoC: tlv320adcx140: Configure PDM sampling edge dt-bindings: sound: tlv320adcx140: Add GPI config property ASoC: tlv320adcx140: Add support for configuring GPI pins ASoC: tlv320adcx140: Fix warnings when using W=1 ASoC: tlv320adcx140: Fix dt-binding-check issue Daniel Baluta (5): ASoC: SOF: imx: Add i.MX8M HW support ASoC: SOF: Add i.MX8MP device descriptor dt-bindings: dsp: fsl: Add fsl,imx8mp-dsp entry ASoC: SOF: Do nothing when DSP PM callbacks are not set ASoC: SOF: define INFO_ flags in dsp_ops Dinghao Liu (6): ASoC: ti: Fix runtime PM imbalance in omap2_mcbsp_set_clks_src ASoC: tas2552: Fix runtime PM imbalance in tas2552_component_probe ASoC: img-spdif-out: Fix runtime PM imbalance on error ASoC: img-spdif-in: Fix runtime PM imbalance on error ASoC: wm8962: Fix runtime PM imbalance on error ASoC: img-i2s-out: Fix runtime PM imbalance on error Dmitry Osipenko (2): ASoC: tegra: tegra_wm8903: Support nvidia, headset property ASoC: tegra-wm8903: Document new nvidia, headset property Fabio Estevam (2): ASoC: fsl_micfil: Remove unneeded ifdef's ASoC: fsl_micfil: Do not pass irq numbers in comments Geert Uytterhoeven (1): ASoC: Fix misspellings of "Analog Devices" Gustavo A. R. Silva (2): ASoC: soc-core: Replace zero-length array with flexible-array ASoC: Intel: Skylake: Replace zero-length array with flexible-array Hans de Goede (1): ASoC: Intel: bytcr_rt5640: Add quirk for Toshiba Encore WT8-A tablet Hui Wang (1): ASoC: intel/skl/hda - set autosuspend timeout for hda codecs Jack Yu (1): ASoC: rt1015: Add condition to prevent SoC providing bclk in ratio of 50 times of sample rate. Jaroslav Kysela (1): ASoC: snd-sof-intel-hda-common - add hda_model parameter and pass it to HDA codec driver Jaska Uimonen (2): ASoC: SOF: topology: stop parsing when all tokens have been found ASoC: SOF: topology: handle multiple sets of tuple arrays Jason Yan (9): ASoC: wm8994: remove wm1811_snd_controls and mixin_boost_tlv ASoC: wm8991: remove defined but not used 'wm8991_dapm_rxvoice_controls' ASoC: wm8990: remove some defined but unused symbols ASoC: wm8900: remove some defined but not used symbols ASoC: wcd934x: remove unnecessary comparisons to bool ASoC: wcd9335: remove unneeded semicolon ASoC: wcd934x: remove unneeded semicolon ASoC: soc-core: return true, false in snd_soc_volsw_is_stereo() ASoC: ti: remove comparison to bool in omap_mcbsp_dai_set_dai_fmt() Johan Jonker (1): ASoC: rockchip-i2s: add description for rk3308 John Stultz (1): ASoC: qcom: q6asm-dai: kCFI fix Kai Vehmanen (2): ASoC: intel/skl/hda - fix oops on systems without i915 audio codec ASoC: SOF: Intel: hda: fix generic hda codec support Kai-Heng Feng (1): ASoC: SOF: Update correct LED status at the first time usage of update_mute_led() Karol Trzcinski (11): ASoC: SOF: Mark get_ext* function ext_hdr arguments as const ASoC: SOF: Introduce offset in firmware data ASoC: SOF: Introduce extended manifest ASoC: SOF: ext_manifest: parse firmware version ASoC: SOF: ext_manifest: parse windows ASoC: SOF: ext_manifest: parse compiler version ASoC: SOF: loader: Adjust validation condition for fw_offset ASoC: SOF: Introduce extended manifest ASoC: SOF: ext_manifest: parse firmware version ASoC: SOF: ext_manifest: parse windows ASoC: SOF: ext_manifest: parse compiler version Keyon Jie (5): ASoC: Intel: sof-da7219-max98373: add DMIC widget and route ASoC: SOF: topology: add support to smart amplifier ASoC: SOF: Intel: BYT: harden IPC initialization and handling ASoC: topology: refine and log the header in the correct pass ASoC: topology: remove the redundant pass checks Krzysztof Kozlowski (1): dt-bindings: sound: wm8994: Correct required supplies based on actual implementaion Kuninori Morimoto (78): ASoC: soc: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: soc-core: set rtd->num_cpu/codec at soc_new_pcm_runtime() ASoC: soc-core: tidyup soc_new_pcm_runtime() rtd setups ASoC: soc-core: remove cpu_dai/codec_dai/cpu_dais/codec_dais soundwire: intel: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: soc-compress: add snd_compress_ops ASoC: codec: wm_adsp: use snd_compress_ops ASoC: uniphier: use snd_compress_ops ASoC: qcom: q6sp6: use snd_compress_ops ASoC: intel: atom: use snd_compress_ops ASoC: sof: use snd_compress_ops ASoC: sprd: use snd_compress_ops ASoC: soc-compress: remove snd_compr_ops ASoC: soc-dai: add soc_dai_err() ASoC: soc-dai: don't overwide dai->driver->ops ASoC: soc-dai: add snd_soc_pcm_dai_new() ASoC: soc-dai: add snd_soc_pcm_dai_prepare() ASoC: soc-dai: add snd_soc_pcm_dai_trigger() ASoC: soc-dai: add snd_soc_pcm_dai_bespoke_trigger() ASoC: soc-dai: add snd_soc_pcm_dai_probe() ASoC: soc-dai: add snd_soc_pcm_dai_remove() ASoC: soc-dai: add snd_soc_dai_compr_start() ASoC: soc-dai: add snd_soc_dai_compr_shutdown() ASoC: soc-dai: add snd_soc_dai_compr_trigger() ASoC: soc-dai: add snd_soc_dai_compr_set_params() ASoC: soc-dai: add snd_soc_dai_compr_get_params() ASoC: soc-dai: add snd_soc_dai_compr_ack() ASoC: soc-dai: add snd_soc_dai_compr_pointer() ASoC: soc-dai: add snd_soc_dai_compr_set_metadata() ASoC: soc-dai: add snd_soc_dai_compr_get_metadata() ASoC: dt-bindings: simple-card: switch to yaml base Documentation ASoC: soc-pcm: replace snd_soc_runtime_activate()/deactivate() to macro ASoC: soc-dai: add snd_soc_dai_action() ASoC: soc-dapm: use snd_soc_dai_activate()/deactivate() ASoC: soc-dai: add snd_soc_dai_active() ASoC: soc-component: add snd_soc_component_active() ASoC: soc-dai: add snd_soc_dai_stream_active() ASoC: use snd_soc_xxx_active() ASoC: atomel: use snd_soc_xxx_active() ASoC: bcm: use snd_soc_xxx_active() ASoC: cirrus: use snd_soc_xxx_active() ASoC: codecs: use snd_soc_xxx_active() ASoC: fsl: use snd_soc_xxx_active() ASoC: intel: use snd_soc_xxx_active() ASoC: jz4740: use snd_soc_xxx_active() ASoC: mediatek: use snd_soc_xxx_active() ASoC: meson: use snd_soc_xxx_active() ASoC: pxa: use snd_soc_xxx_active() ASoC: ti: use snd_soc_xxx_active() ASoC: uniphier: use snd_soc_xxx_active() ASoC: dwc: use snd_soc_xxx_active() ASoC: cleanup dai / component active code ASoC: add soc-link.c ASoC: soc-link: move soc_rtd_xxx() ASoC: soc-link: remove unneeded parameter from snd_soc_link_xxx() ASoC: soc-link: add snd_soc_link_be_hw_params_fixup() ASoC: soc-link: add snd_soc_link_compr_startup() ASoC: soc-link: add snd_soc_link_compr_shutdown() ASoC: soc-link: add snd_soc_link_compr_set_params() ASoC: soc.h: convert bool to bit field for snd_soc_card ASoC: add soc-card.c ASoC: soc-card: move snd_soc_card_get_kcontrol() to soc-card ASoC: soc-card: move snd_soc_card_jack_new() to soc-card ASoC: soc-card: move snd_soc_card_set/get_drvdata() to soc-card ASoC: soc-card: move snd_soc_card_get_codec_dai() to soc-card ASoC: soc-card: move snd_soc_card_subclass to soc-card ASoC: soc-card: add snd_soc_card_suspend_pre() ASoC: soc-card: add snd_soc_card_suspend_post() ASoC: soc-card: add snd_soc_card_resume_pre() ASoC: soc-card: add snd_soc_card_resume_post() ASoC: soc-card: add probed bit field to snd_soc_card ASoC: soc-card: add snd_soc_card_probe() ASoC: soc-card: add snd_soc_card_late_probe() ASoC: soc-card: add snd_soc_card_remove() ASoC: soc-card: add snd_soc_card_set_bias_level() ASoC: soc-card: add snd_soc_card_set_bias_level_post() ASoC: soc-card: add snd_soc_card_add_dai_link() ASoC: soc-card: add snd_soc_card_remove_dai_link() Lad Prabhakar (1): dt-bindings: ASoC: renesas,rsnd: Add r8a7742 support Libin Yang (6): ALSA: hda: Add ElkhartLake HDMI codec vid ASoC: SOF: Intel: add PCI ID for ElkhartLake ASoC: Intel: boards: support Elkhart Lake with rt5660 ASoC: intel: add depends on SND_SOC_SOF_HDA_AUDIO_CODEC for common hdmi ASoC: sof-sdw: remove CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC condition ASoC: sof_pcm512x: remove CONFIG_SND_HDA_CODEC_HDMI condition Lubomir Rintel (12): ASoC: mmp-sspa: Flip SNDRV_PCM_FMTBIT_S24_3LE on ASoC: mmp-sspa: Drop S20_3LE case ASoC: mmp-sspa: A trivial typo fix ASoC: mmp-sspa: Get rid of dma_params and phys_base ASoC: mmp-sspa: Add support for soc-generic-dmaengine-pcm ASoC: mmp-sspa: Remove the embedded struct ssp_device ASoC: mmp-sspa: Prepare/unprepare the clocks ASoC: mmp-sspa: Add support for the runtime power management ASoC: mmp-sspa: Set appropriate bus format for given bit width ASoC: mmp-sspa: Add Device Tree support ASoC: Add Marvell MMP SSPA binding ASoC: mmp-sspa: Fix the error handling in probe() Mac Chiang (1): ASoC: Intel: boards: split woofer and tweeter support Marcin Rajwa (2): ASoC: SOF: add a power_down_notify method ASoC: SOF: inform DSP that driver is going to be removed Mark Brown (37): Merge series "ASoC: remove rtd->cpu/codec_dai{s} v2" from Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com>: Merge series "ASoC: Intel: machine drivers update for 5.8" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge series "Support headset on Tegra boards that use WM8903" from Dmitry Osipenko <digetx(a)gmail.com>: Merge series "ASoC: SOF: trivial code cleanups" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge series "ASoC: SOF: adjust dmesg verbosity" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge branch 'asoc-5.7' into asoc-5.8 Merge series "Add support for SOF on i.MX8M" from Daniel Baluta <daniel.baluta(a)oss.nxp.com> Daniel Baluta <daniel.baluta(a)nxp.com>: Merge series "ASoC: SOF: topology and firmware IPC updates for 5.8" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge series "ASoC: Fix dependency issues of SND_SOC" from Wei Li <liwei391(a)huawei.com>: Merge series "ASoC: add snd_compress_ops and replace" from Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com>: Merge series "ASoC: Add new module driver for new ASRC" from Shengjiu Wang <shengjiu.wang(a)nxp.com>: Merge tag 'tegra-for-5.7-asoc' of git://git.kernel.org/.../tegra/linux into asoc-5.7 ASoC: SOF: Fix build ASoC: dmic: Allow GPIO operations to sleep ASoC: SOF: Add missing dependency on IMX_SCU Merge branch 'for-5.7' of https://git.kernel.org/.../broonie/sound into asoc-5.8 Merge series "add channel constraint for BDW machine drivers" from Brent Lu <brent.lu(a)intel.com>: Merge series "Kconfig updates for DMIC and SOF HDMI support" from Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com>: Merge series "ASoC: soc-dai: add snd_soc_dai_xxx()" from Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com>: Merge series "SOF topology parsing updates" from Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com>: Merge series "ASoC: rt5682: apply some refactors" from Tzung-Bi Shih <tzungbi(a)google.com>: Merge branch 'for-5.7' of https://git.kernel.org/.../broonie/sound into asoc-5.8 Merge branch 'for-5.7' of https://git.kernel.org/.../broonie/sound into asoc-5.8 Merge series "ASoC: fsl_esai: Add support for imx8qm" from Shengjiu Wang <shengjiu.wang(a)nxp.com>: Merge series "ASoC: da7213: support for usage with simple-card" from Sebastian Reichel <sebastian.reichel(a)collabora.com>: Merge series "ASoC: Intel: minor fixes to machine drivers" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge series "ASoC: codecs: rt*-sdw: memory leaks and simplifications" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge series "ASoC: cleanup DAI/Component activity" from Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com>: Merge series "ASoC: SOF: Intel and IMX updates for 5.8" from Kai Vehmanen <kai.vehmanen(a)linux.intel.com>: Merge series "Add Renoir ACP driver" from Vijendar Mukunda <Vijendar.Mukunda(a)amd.com>: Merge series "ASoC: SOF: extended manifest support for 5.8" from Kai Vehmanen <kai.vehmanen(a)linux.intel.com>: Merge series "ASoC: add soc-link" from Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com>: Merge series "ASoC: SOF: finalize Baytrail/CherryTrail support" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge series "ASoC topology header parsing refinement" from Keyon Jie <yang.jie(a)linux.intel.com>: Merge series "Kconfig updates for DMIC and SOF HDMI support" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge remote-tracking branch 'asoc/for-5.7' into asoc-linus Merge remote-tracking branch 'asoc/for-5.8' into asoc-linus Mateusz Gorski (3): ASoC: Intel: Skylake: Add alternative topology binary name ASoC: Intel: Multiple I/O PCM format support for pipe ASoC: Intel: Skylake: Automatic DMIC format configuration according to information from NHLT Oder Chiou (4): ASoC: rt1308: Revise the devicetree file mode ASoC: rl6231: Add the K bypass for the PLL parameters ASoC: rt1016: Add the rt1016 support ASoC: rt1016: Add the devicetree file for the rt1016 Pan Xiuli (6): ASoC: SOF: add probe support extend data ASoC: SOF: add debug ABI version ASoC: SOF: change type char to uint8_t in info.h ASoC: SOF: change type char to uint8_t in trace.h ASoC: SOF: change type char to uint8_t in topology.h ASoC: SOF: make sof_ipc_cc_version to fixed length Paul Cercueil (1): ASoC: ingenic: Unconditionally depend on devicetree Pavel Dobias (7): ASoC: max9867: fix volume controls ASoC: max9867: fix ADC level control ASoC: max9867: don't use regmap defaults ASoC: max9867: add filter controls ASoC: max9867: add mono playback switch ASoC: max9867: add digital microphone controls ASoC: max9867: keep ADCs and DACs always on Payal Kshirsagar (2): ASoC: SOF: remove unneeded variables ASoC: SOF: Intel: hda: remove unnecessary parentheses Pierre-Louis Bossart (29): ASoC: codecs: rt1308-sdw: reduce verbosity ASoC: SOF: Intel: hda: reduce verbosity on SoundWire detection ASoC: SOF: Intel: hda: log number of microphones detected in NHLT tables ASoC: Intel: sof_sdw_hdmi: fix compilation issue in fallback mode ASoC: Intel: sof_sdw_hdmi: remove codec_dai use ASoC: Intel: sof_sdw_rt1308: remove codec dai use ASoC: Intel: sof_sdw_rt5682: remove codec_dai use ASoC: Intel: sof_sdw_rt700: remove codec_dai use ASoC: Intel: sof_sdw_rt711: remove codec_dai use ASoC: Intel: skl_hda_generic: remove rtd->codec_dai ASoC: SOF: imx: fix undefined reference issue ASoC: Intel: boards: add explicit dependency on GPIOLIB when DMIC is used ASoC: Intel: boards: sof-wm8804: support for Hifiberry Digiplus boards ASoC: SOF/Intel: clarify SPDX license with GPL-2.0-only ASoC: codecs: rt*-sdw: don't assign slave_ops ASoC: codecs: rt*-sdw: fix memory leak in set_sdw_stream() ASoC: codecs: rt1308-sdw: remove duplicate allocation ASoC: SOF: imx: make dsp_ops static ASoC: SOF: imx: make imx8m_dsp_ops static ASoC: Intel: soc-acpi: change machine driver name for WM8804 platforms ASoC: Intel: sof_sdw: fix typo in components string ASoC: Intel: sof_sdw_rt711: remap buttons ASoC: Intel: sof_sdw_rt700: remap buttons ASoC: Intel: cht_bsw_nau8824: remap BTN_0 as KEY_PLAYPAUSE ASoC: Intel: bytcr_rt5640/51: remove .ignore_suspend ASoC: Intel: byt/cht: add .pm_ops ASoC: SOF: Intel: BYT: mask BUSY or DONE interrupts in handler ASoC: reduce verbosity of error messages for sof-dai and sof-link ASoC: SOF: Intel: Baytrail: fix 'defined but not used' warnings Qiushi Wu (1): ASoC: fix incomplete error-handling in img_i2s_in_probe. Ranjani Sridharan (6): ASoC: soc-core: Add dynamic debug logs in soc_dai_link_sanity_check() ASoC: Intel: broadwell: Fix oops during module removal ASoC: SOF: Intel: byt: Add PM callbacks ASoC: SOF: pm: handle resume on legacy Intel platforms ASoC: SOF: ipc: ignore DSP replies received when they are not expected ASoC: SOF: Intel: BYT: add .remove op Ravulapati Vishnu vardhan rao (1): ASoC: amd: Removing unnecessary instance initialization Robert Jarzmik (1): ASoC: pxa: remove Compulab pxa2xx boards Rong Chen (1): ASoC: soc-compress: avoid false-positive Wuninitialized warning Sebastian Reichel (4): ASoC: da7213: Add da7212 DT compatible ASoC: da7213: Add regulator support ASoC: da7213: move set_sysclk to codec level ASoC: da7213: move set_pll to codec level Sebastiano Carlucci (1): ASoC: SOF: topology: Add support for DC Blocker Seppo Ingalsuo (3): ASoC: SOF: Intel: Fix typo in header file comment text ASoC: SOF: Intel: Change DMIC load IPC to fixed length ASoC: SOF: Intel: Rename deprecated DMIC IPC struct field Seven Lee (2): ASoc: nau8810: add AUX related dapm widgets and routes ASoC: nau8810: add I2C device and compatible ID Shengjiu Wang (16): ASoC: fsl_asrc: rename asrc_priv to asrc ASoC: dt-bindings: fsl_asrc: Add new property fsl, asrc-format ASoC: fsl-asoc-card: Support new property fsl, asrc-format ASoC: fsl_asrc: Support new property fsl,asrc-format ASoC: fsl_asrc: Move common definition to fsl_asrc_common ASoC: dt-bindings: fsl_easrc: Add document for EASRC ASoC: fsl_easrc: Add EASRC ASoC CPU DAI drivers ASoC: wm8962: set CLOCKING2 as non-volatile register ASoC: fsl_esai: Disable exception interrupt before scheduling tasklet ASoC: fsl_easrc: Check for null pointer before dereferencing "ctx" in fsl_easrc_hw_free() ASoC: wm8524: Add support S32_LE ASoC: wm8962: Use force clear for WM8962_SYSCLK_ENA after reset ASoC: fsl_esai: introduce SoC specific data ASoC: fsl_esai: Add new compatible string for imx8qm ASoC: fsl_asrc: Set ASR76K and ASR56K based on processing clock ASoC: fsl_asrc: Merge suspend/resume function to runtime_suspend/resume Sowjanya Komatineni (4): ASoC: tegra: Use device managed resource APIs to get the clock ASoC: nau8825: Change Tegra clk_out_2 provider to PMC ASoC: tegra: Add audio mclk parent configuration ASoC: tegra: Enable audio mclk during tegra_asoc_utils_init() Stephan Gerhold (3): ASoC: qdsp6: Suggest more generic node names dt-bindings: sound: lpass-cpu: Document DAI subnodes ASoC: qcom: lpass-cpu: Make I2S SD lines configurable Steve Lee (1): ASoC: max98390: Added Amplifier Driver Sven Van Asbroeck (2): dt-bindings: sound: add Microsemi ZL38060 binding ASoC: Add initial ZL38060 driver Tang Bin (10): ASoC: fsl_micfil: Omit superfluous error message in fsl_micfil_probe() ASoC: hisilicon: Use IS_ERR() instead of IS_ERR_OR_NULL() ASoC: mxs-saif: Avoid unnecessary check ASoC: hisilicon: Use the defined variable to clean code ASoC: mxs-saif: Fix unused assignment ASoC: qcom: Use the defined variable to simplify code ASoC: mediatek: Fix error handling ASoC: fsl_micfil: Fix indentation to put on one line affected code ASoC: fsl_micfil: Fix unused assignment in fsl_set_clock_params() ASoC: fsl: imx-audmix: Fix unused assignment to variable 'ret' Tzung-Bi Shih (8): ASoC: rt5682: simplify assertions ASoC: rt5682: fix space issues ASoC: rt5682: remove empty default case ASoC: rt5682: replace message printing from pr_() to dev_() ASoC: rt5682: remove duplicate rt5682_reset() calls ASoC: rt5682: remove unwanted btn_type assignment ASoC: mediatek: mt8183: fix error handling of platform_get_irq() ASoC: mediatek: mt8183-da7219: set headset button maps Vijendar Mukunda (17): ASoC: amd: add Renoir ACP3x IP register header ASoC: amd: add Renoir ACP PCI driver ASoC: amd: add acp init/de-init functions ASoC: amd: create acp3x pdm platform device ASoC: amd: add ACP3x PDM platform driver ASoC: amd: irq handler changes for ACP3x PDM dma driver ASoC: amd: add acp3x pdm driver dma ops ASoC: amd: add ACP PDM DMA driver dai ops ASoC: amd: add Renoir ACP PCI driver PM ops ASoC: amd: add ACP PDM DMA driver pm ops ASoC: amd: enable Renoir acp3x drivers build ASoC: amd: create platform devices for Renoir ASoC: amd: RN machine driver using dmic ASoC: amd: enable build for RN machine driver ASoC: amd: fix kernel warning ASoC: amd: refactoring dai_hw_params() callback ASoC: amd: return error when acp de-init fails Wei Li (2): ASoC: wm89xx: Fix build errors caused by I2C dependency ASoC: Fix wrong dependency of da7210 and wm8983 Wei Yongjun (4): ASoC: tegra: tegra_wm8903: Use devm_snd_soc_register_card() ASoC: rt5677: Use devm_snd_soc_register_component() ASoC: SOF: core: fix error return code in sof_probe_continue() ASoC: mmp-sspa: Fix return value check in asoc_mmp_sspa_probe() Wolfram Sang (1): ASoC: codecs: max9768: update contact email Xiyu Yang (2): ASoC: davinci-mcasp: Fix dma_chan refcnt leak when getting dma type ASoC: fsl_asrc_dma: Fix dma_chan leak when config DMA channel failed Yong Zhi (2): ASoC: Intel: sof_da7219_max98373: Add BE dailink for dmic16k ASoC: max98373: reorder max98373_reset() in resume Yongbo Zhang (1): SoC: rsnd: add interrupt support for SSI BUSIF buffer YueHaibing (2): ASoC: SOF: imx8: Fix randbuild error ASoC: SOF: Intel: Fix unused variable warning derek.fang (1): ASoC: rt1015: Enable class-D silence and clock detections kbuild test robot (1): ASoC: fix semicolon.cocci warnings randerwang (3): ASoC: Intel: sof_sdw: add amp number in components string for ucm ASoC: SOF: Intel: change trigger sequence to fix pop noise when stopping playback on sdw platforms ASoC: SOF: Intel: sdw: relax sdw machine select constraints shengjiu wang (1): ASoC: fsl_asrc: Fix -Wmissing-prototypes warning 朱灿灿 (1): Subject: [PATCH v2] ASoC: soc-pcm: fix BE dai not hw_free and shutdown during mixer update Documentation/devicetree/bindings/dsp/fsl,dsp.yaml | 2 + Documentation/devicetree/bindings/sound/da7213.txt | 8 +- .../devicetree/bindings/sound/fsl,asrc.txt | 4 + .../devicetree/bindings/sound/fsl,easrc.yaml | 101 + .../devicetree/bindings/sound/fsl,esai.txt | 1 + .../bindings/sound/marvell,mmp-sspa.yaml | 122 ++ .../devicetree/bindings/sound/nau8810.txt | 5 +- .../devicetree/bindings/sound/nau8825.txt | 2 +- .../bindings/sound/nvidia,tegra-audio-wm8903.txt | 1 + .../devicetree/bindings/sound/qcom,lpass-cpu.txt | 25 + .../devicetree/bindings/sound/qcom,q6adm.txt | 2 +- .../devicetree/bindings/sound/qcom,q6afe.txt | 46 +- .../devicetree/bindings/sound/qcom,q6asm.txt | 7 +- .../devicetree/bindings/sound/qcom,q6core.txt | 2 +- .../devicetree/bindings/sound/renesas,rsnd.txt | 1 + .../devicetree/bindings/sound/rockchip-i2s.yaml | 12 +- Documentation/devicetree/bindings/sound/rt1016.txt | 17 + Documentation/devicetree/bindings/sound/rt1308.txt | 0 .../devicetree/bindings/sound/simple-card.txt | 351 ---- .../devicetree/bindings/sound/simple-card.yaml | 484 +++++ .../devicetree/bindings/sound/tlv320adcx140.yaml | 51 + Documentation/devicetree/bindings/sound/wm8994.txt | 18 +- .../devicetree/bindings/sound/zl38060.yaml | 69 + drivers/soundwire/intel.c | 4 +- include/sound/soc-acpi.h | 2 +- include/sound/soc-card.h | 69 + include/sound/soc-component.h | 46 +- include/sound/soc-dai.h | 62 +- include/sound/soc-dapm.h | 2 +- include/sound/soc-link.h | 27 + include/sound/soc.h | 104 +- include/sound/sof.h | 5 +- include/sound/sof/channel_map.h | 2 +- include/sound/sof/control.h | 2 +- include/sound/sof/dai-imx.h | 2 +- include/sound/sof/dai-intel.h | 22 +- include/sound/sof/dai.h | 2 +- include/sound/sof/ext_manifest.h | 95 + include/sound/sof/header.h | 2 +- include/sound/sof/info.h | 28 +- include/sound/sof/pm.h | 2 +- include/sound/sof/stream.h | 2 +- include/sound/sof/topology.h | 20 +- include/sound/sof/trace.h | 4 +- include/sound/sof/xtensa.h | 2 +- include/uapi/sound/skl-tplg-interface.h | 2 + include/uapi/sound/sof/abi.h | 2 +- include/uapi/sound/sof/tokens.h | 8 + sound/hda/intel-nhlt.c | 2 +- sound/pci/hda/patch_hdmi.c | 1 + sound/soc/Makefile | 2 +- sound/soc/amd/Kconfig | 15 +- sound/soc/amd/Makefile | 1 + sound/soc/amd/raven/acp3x-i2s.c | 6 +- sound/soc/amd/raven/acp3x-pcm-dma.c | 49 +- sound/soc/amd/renoir/Makefile | 7 + sound/soc/amd/renoir/acp3x-pdm-dma.c | 524 +++++ sound/soc/amd/renoir/acp3x-rn.c | 77 + sound/soc/amd/renoir/rn-pci-acp3x.c | 344 ++++ sound/soc/amd/renoir/rn_acp3x.h | 88 + sound/soc/amd/renoir/rn_chip_offset_byte.h | 349 ++++ sound/soc/atmel/atmel_ssc_dai.c | 4 +- sound/soc/bcm/bcm2835-i2s.c | 6 +- sound/soc/bcm/cygnus-ssp.c | 4 +- sound/soc/cirrus/ep93xx-i2s.c | 4 +- sound/soc/codecs/Kconfig | 40 +- sound/soc/codecs/Makefile | 6 + sound/soc/codecs/ad1980.c | 2 +- sound/soc/codecs/ad73311.c | 2 +- sound/soc/codecs/adau7118-i2c.c | 7 + sound/soc/codecs/adav80x.c | 4 +- sound/soc/codecs/arizona.c | 2 +- sound/soc/codecs/cros_ec_codec.c | 22 +- sound/soc/codecs/cs4271.c | 4 +- sound/soc/codecs/cs47l15.c | 9 +- sound/soc/codecs/cs47l24.c | 8 +- sound/soc/codecs/cs47l35.c | 9 +- sound/soc/codecs/cs47l85.c | 9 +- sound/soc/codecs/cs47l90.c | 9 +- sound/soc/codecs/cs47l92.c | 9 +- sound/soc/codecs/da7213.c | 102 +- sound/soc/codecs/da7213.h | 9 + sound/soc/codecs/dmic.c | 4 +- sound/soc/codecs/jz4725b.c | 4 +- sound/soc/codecs/jz4740.c | 4 +- sound/soc/codecs/jz4770.c | 2 +- sound/soc/codecs/madera.c | 2 +- sound/soc/codecs/max9768.c | 2 +- sound/soc/codecs/max98090.c | 6 +- sound/soc/codecs/max98373.c | 2 +- sound/soc/codecs/max98390.c | 1040 ++++++++++ sound/soc/codecs/max98390.h | 663 ++++++ sound/soc/codecs/max9867.c | 95 +- sound/soc/codecs/max9867.h | 1 - sound/soc/codecs/nau8810.c | 39 +- sound/soc/codecs/nau8810.h | 8 + sound/soc/codecs/rl6231.c | 29 +- sound/soc/codecs/rl6231.h | 1 + sound/soc/codecs/rt1015.c | 29 +- sound/soc/codecs/rt1015.h | 1 + sound/soc/codecs/rt1016.c | 695 +++++++ sound/soc/codecs/rt1016.h | 232 +++ sound/soc/codecs/rt1308-sdw.c | 15 +- sound/soc/codecs/rt5677-spi.c | 12 +- sound/soc/codecs/rt5682-i2c.c | 306 +++ sound/soc/codecs/rt5682-sdw.c | 462 ++++- sound/soc/codecs/rt5682-sdw.h | 20 - sound/soc/codecs/rt5682.c | 888 +------- sound/soc/codecs/rt5682.h | 32 +- sound/soc/codecs/rt700-sdw.c | 3 - sound/soc/codecs/rt700.c | 3 + sound/soc/codecs/rt711-sdw.c | 3 - sound/soc/codecs/rt711.c | 3 + sound/soc/codecs/rt715-sdw.c | 3 - sound/soc/codecs/rt715.c | 3 + sound/soc/codecs/sta32x.c | 11 +- sound/soc/codecs/tas2552.c | 1 + sound/soc/codecs/tlv320adcx140.c | 96 +- sound/soc/codecs/tlv320adcx140.h | 11 + sound/soc/codecs/tlv320aic23.c | 2 +- sound/soc/codecs/tlv320dac33.c | 2 +- sound/soc/codecs/uda1380.c | 2 +- sound/soc/codecs/wcd9335.c | 44 +- sound/soc/codecs/wcd934x.c | 30 +- sound/soc/codecs/wl1273.c | 2 +- sound/soc/codecs/wm5102.c | 9 +- sound/soc/codecs/wm5110.c | 8 +- sound/soc/codecs/wm8524.c | 4 +- sound/soc/codecs/wm8711.c | 2 +- sound/soc/codecs/wm8753.c | 4 +- sound/soc/codecs/wm8782.c | 2 +- sound/soc/codecs/wm8900.c | 6 - sound/soc/codecs/wm8962.c | 9 +- sound/soc/codecs/wm8990.c | 98 - sound/soc/codecs/wm8991.c | 8 - sound/soc/codecs/wm8994.c | 8 - sound/soc/codecs/wm_adsp.c | 18 +- sound/soc/codecs/wm_adsp.h | 18 +- sound/soc/codecs/zl38060.c | 638 ++++++ sound/soc/dwc/dwc-i2s.c | 2 +- sound/soc/fsl/Kconfig | 11 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/fsl-asoc-card.c | 24 +- sound/soc/fsl/fsl_asrc.c | 368 ++-- sound/soc/fsl/fsl_asrc.h | 74 +- sound/soc/fsl/fsl_asrc_common.h | 106 + sound/soc/fsl/fsl_asrc_dma.c | 55 +- sound/soc/fsl/fsl_audmix.c | 4 +- sound/soc/fsl/fsl_easrc.c | 2117 ++++++++++++++++++++ sound/soc/fsl/fsl_easrc.h | 651 ++++++ sound/soc/fsl/fsl_esai.c | 52 +- sound/soc/fsl/fsl_micfil.c | 17 +- sound/soc/fsl/fsl_spdif.c | 4 +- sound/soc/hisilicon/hi6210-i2s.c | 16 +- sound/soc/img/img-i2s-in.c | 1 + sound/soc/img/img-i2s-out.c | 8 +- sound/soc/img/img-spdif-in.c | 4 +- sound/soc/img/img-spdif-out.c | 4 +- sound/soc/intel/Kconfig | 8 +- sound/soc/intel/Makefile | 2 +- sound/soc/intel/atom/Makefile | 2 +- sound/soc/intel/atom/sst-atom-controls.h | 2 +- sound/soc/intel/atom/sst-mfld-platform-compress.c | 43 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 16 +- sound/soc/intel/atom/sst-mfld-platform.h | 2 +- sound/soc/intel/atom/sst/Makefile | 2 +- sound/soc/intel/baytrail/sst-baytrail-ipc.c | 4 +- sound/soc/intel/boards/Kconfig | 83 +- sound/soc/intel/boards/Makefile | 6 +- sound/soc/intel/boards/bdw-rt5650.c | 29 + sound/soc/intel/boards/bdw-rt5677.c | 26 + sound/soc/intel/boards/broadwell.c | 43 +- sound/soc/intel/boards/bytcht_cx2072x.c | 5 +- sound/soc/intel/boards/bytcht_da7213.c | 3 + sound/soc/intel/boards/bytcht_es8316.c | 3 + sound/soc/intel/boards/bytcr_rt5640.c | 19 +- sound/soc/intel/boards/bytcr_rt5651.c | 6 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 3 + sound/soc/intel/boards/cht_bsw_nau8824.c | 7 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 3 + sound/soc/intel/boards/cht_bsw_rt5672.c | 3 + sound/soc/intel/boards/cml_rt1011_rt5682.c | 224 ++- sound/soc/intel/boards/ehl_rt5660.c | 323 +++ sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +- sound/soc/intel/boards/hda_dsp_common.c | 2 +- sound/soc/intel/boards/hda_dsp_common.h | 2 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 2 +- sound/soc/intel/boards/kbl_da7219_max98927.c | 2 +- sound/soc/intel/boards/kbl_rt5660.c | 2 +- sound/soc/intel/boards/skl_hda_dsp_common.c | 2 +- sound/soc/intel/boards/skl_hda_dsp_common.h | 2 +- sound/soc/intel/boards/skl_hda_dsp_generic.c | 33 +- sound/soc/intel/boards/sof_da7219_max98373.c | 23 +- sound/soc/intel/boards/sof_maxim_common.c | 2 +- sound/soc/intel/boards/sof_maxim_common.h | 2 +- sound/soc/intel/boards/sof_pcm512x.c | 11 +- sound/soc/intel/boards/sof_rt5682.c | 2 +- sound/soc/intel/boards/sof_sdw.c | 65 +- sound/soc/intel/boards/sof_sdw_common.h | 2 +- sound/soc/intel/boards/sof_sdw_dmic.c | 2 +- sound/soc/intel/boards/sof_sdw_hdmi.c | 11 +- sound/soc/intel/boards/sof_sdw_rt1308.c | 4 +- sound/soc/intel/boards/sof_sdw_rt5682.c | 5 +- sound/soc/intel/boards/sof_sdw_rt700.c | 13 +- sound/soc/intel/boards/sof_sdw_rt711.c | 13 +- sound/soc/intel/boards/sof_sdw_rt715.c | 2 +- sound/soc/intel/boards/sof_wm8804.c | 298 +++ sound/soc/intel/common/Makefile | 2 +- sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 4 +- sound/soc/intel/common/soc-acpi-intel-cfl-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-cml-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-ehl-match.c | 9 +- sound/soc/intel/common/soc-acpi-intel-glk-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-hda-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-icl-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-skl-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 2 +- sound/soc/intel/common/soc-intel-quirks.h | 2 +- sound/soc/intel/common/sst-dsp.c | 9 +- sound/soc/intel/haswell/sst-haswell-dsp.c | 185 +- sound/soc/intel/skylake/Makefile | 2 +- sound/soc/intel/skylake/skl-i2s.h | 2 +- sound/soc/intel/skylake/skl-ssp-clk.c | 2 +- sound/soc/intel/skylake/skl-sst-utils.c | 2 +- sound/soc/intel/skylake/skl-topology.c | 184 +- sound/soc/intel/skylake/skl-topology.h | 5 +- sound/soc/intel/skylake/skl.h | 2 +- sound/soc/jz4740/Kconfig | 2 +- sound/soc/jz4740/jz4740-i2s.c | 12 +- sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 7 +- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 8 +- sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 7 +- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 16 +- sound/soc/meson/axg-tdm-interface.c | 2 +- sound/soc/mxs/mxs-saif.c | 5 +- sound/soc/pxa/Kconfig | 25 +- sound/soc/pxa/mmp-sspa.c | 445 ++-- sound/soc/pxa/mmp-sspa.h | 32 +- sound/soc/pxa/pxa-ssp.c | 8 +- sound/soc/pxa/pxa2xx-i2s.c | 2 +- sound/soc/qcom/lpass-apq8016.c | 9 +- sound/soc/qcom/lpass-cpu.c | 235 ++- sound/soc/qcom/lpass-lpaif-reg.h | 30 +- sound/soc/qcom/lpass.h | 4 + sound/soc/qcom/qdsp6/q6asm-dai.c | 55 +- sound/soc/sh/rcar/gen.c | 8 + sound/soc/sh/rcar/rsnd.h | 9 + sound/soc/sh/rcar/ssi.c | 145 ++ sound/soc/soc-card.c | 225 +++ sound/soc/soc-compress.c | 281 ++- sound/soc/soc-core.c | 245 +-- sound/soc/soc-dai.c | 485 +++-- sound/soc/soc-dapm.c | 30 +- sound/soc/soc-generic-dmaengine-pcm.c | 6 +- sound/soc/soc-jack.c | 38 - sound/soc/soc-link.c | 155 ++ sound/soc/soc-pcm.c | 251 +-- sound/soc/soc-topology.c | 96 +- sound/soc/sof/Makefile | 2 +- sound/soc/sof/compress.c | 9 +- sound/soc/sof/compress.h | 9 +- sound/soc/sof/control.c | 6 +- sound/soc/sof/core.c | 9 +- sound/soc/sof/debug.c | 2 +- sound/soc/sof/imx/Kconfig | 34 +- sound/soc/sof/imx/Makefile | 4 +- sound/soc/sof/imx/imx8.c | 4 +- sound/soc/sof/imx/imx8m.c | 285 +++ sound/soc/sof/intel/Makefile | 2 +- sound/soc/sof/intel/apl.c | 2 +- sound/soc/sof/intel/bdw.c | 2 +- sound/soc/sof/intel/byt.c | 172 +- sound/soc/sof/intel/cnl.c | 2 +- sound/soc/sof/intel/hda-bus.c | 2 +- sound/soc/sof/intel/hda-codec.c | 58 +- sound/soc/sof/intel/hda-compress.c | 2 +- sound/soc/sof/intel/hda-ctrl.c | 2 +- sound/soc/sof/intel/hda-dai.c | 2 +- sound/soc/sof/intel/hda-dsp.c | 10 +- sound/soc/sof/intel/hda-ipc.c | 2 +- sound/soc/sof/intel/hda-ipc.h | 2 +- sound/soc/sof/intel/hda-loader.c | 11 +- sound/soc/sof/intel/hda-pcm.c | 2 +- sound/soc/sof/intel/hda-stream.c | 2 +- sound/soc/sof/intel/hda-trace.c | 2 +- sound/soc/sof/intel/hda.c | 28 +- sound/soc/sof/intel/hda.h | 2 +- sound/soc/sof/intel/intel-ipc.c | 2 +- sound/soc/sof/intel/shim.h | 2 +- sound/soc/sof/ipc.c | 11 +- sound/soc/sof/loader.c | 213 +- sound/soc/sof/nocodec.c | 8 +- sound/soc/sof/ops.c | 2 +- sound/soc/sof/ops.h | 2 +- sound/soc/sof/pcm.c | 18 +- sound/soc/sof/pm.c | 29 +- sound/soc/sof/probe.c | 2 +- sound/soc/sof/probe.h | 2 +- sound/soc/sof/sof-acpi-dev.c | 2 +- sound/soc/sof/sof-audio.c | 2 +- sound/soc/sof/sof-audio.h | 4 +- sound/soc/sof/sof-of-dev.c | 16 +- sound/soc/sof/sof-pci-dev.c | 4 +- sound/soc/sof/sof-priv.h | 7 +- sound/soc/sof/topology.c | 485 +++-- sound/soc/sof/trace.c | 2 +- sound/soc/sof/utils.c | 2 +- sound/soc/sof/xtensa/Makefile | 2 +- sound/soc/sof/xtensa/core.c | 2 +- sound/soc/sprd/sprd-pcm-compress.c | 49 +- sound/soc/sprd/sprd-pcm-dma.c | 2 +- sound/soc/sprd/sprd-pcm-dma.h | 2 +- sound/soc/tegra/tegra_alc5632.c | 7 +- sound/soc/tegra/tegra_asoc_utils.c | 113 +- sound/soc/tegra/tegra_asoc_utils.h | 1 - sound/soc/tegra/tegra_max98090.c | 22 +- sound/soc/tegra/tegra_rt5640.c | 22 +- sound/soc/tegra/tegra_rt5677.c | 7 +- sound/soc/tegra/tegra_sgtl5000.c | 7 +- sound/soc/tegra/tegra_wm8753.c | 22 +- sound/soc/tegra/tegra_wm8903.c | 42 +- sound/soc/tegra/tegra_wm9712.c | 8 +- sound/soc/tegra/trimslice.c | 18 +- sound/soc/ti/davinci-mcasp.c | 6 +- sound/soc/ti/omap-dmic.c | 4 +- sound/soc/ti/omap-mcbsp.c | 21 +- sound/soc/ti/omap-mcpdm.c | 8 +- sound/soc/uniphier/aio-compress.c | 45 +- sound/soc/uniphier/aio-cpu.c | 4 +- sound/soc/uniphier/aio-dma.c | 2 +- sound/soc/uniphier/aio.h | 2 +- sound/soc/ux500/mop500.c | 11 +- 335 files changed, 15208 insertions(+), 4136 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/fsl,easrc.yaml create mode 100644 Documentation/devicetree/bindings/sound/marvell,mmp-sspa.yaml create mode 100644 Documentation/devicetree/bindings/sound/rt1016.txt mode change 100755 => 100644 Documentation/devicetree/bindings/sound/rt1308.txt delete mode 100644 Documentation/devicetree/bindings/sound/simple-card.txt create mode 100644 Documentation/devicetree/bindings/sound/simple-card.yaml create mode 100644 Documentation/devicetree/bindings/sound/zl38060.yaml create mode 100644 include/sound/soc-card.h create mode 100644 include/sound/soc-link.h create mode 100644 include/sound/sof/ext_manifest.h create mode 100644 sound/soc/amd/renoir/Makefile create mode 100644 sound/soc/amd/renoir/acp3x-pdm-dma.c create mode 100644 sound/soc/amd/renoir/acp3x-rn.c create mode 100644 sound/soc/amd/renoir/rn-pci-acp3x.c create mode 100644 sound/soc/amd/renoir/rn_acp3x.h create mode 100644 sound/soc/amd/renoir/rn_chip_offset_byte.h create mode 100644 sound/soc/codecs/max98390.c create mode 100644 sound/soc/codecs/max98390.h create mode 100644 sound/soc/codecs/rt1016.c create mode 100644 sound/soc/codecs/rt1016.h create mode 100644 sound/soc/codecs/rt5682-i2c.c delete mode 100644 sound/soc/codecs/rt5682-sdw.h create mode 100644 sound/soc/codecs/zl38060.c create mode 100644 sound/soc/fsl/fsl_asrc_common.h create mode 100644 sound/soc/fsl/fsl_easrc.c create mode 100644 sound/soc/fsl/fsl_easrc.h create mode 100644 sound/soc/intel/boards/ehl_rt5660.c create mode 100644 sound/soc/intel/boards/sof_wm8804.c create mode 100644 sound/soc/soc-card.c create mode 100644 sound/soc/soc-link.c create mode 100644 sound/soc/sof/imx/imx8m.c

3 6

Cmi8888 iommu fix
by Tony Dijksterhuis 02 Jun '20

02 Jun '20

Hi everyone. I am using a pink faun i2s (CMI8888) card with a x470 board and amd ryzen cpu. >From the first day using this card i was not able to get or working. Al i got was stuttering sound. After many hours searching i found the thread below https://www.alsa-project.org/pipermail/alsa-devel/2013-December/069753.html Enabling iommu in my bios fixed indeed this issue. However i'm wondering was there ever being a kernel patch fixing this?. Regards Tony Dijksterhuis. Outlook voor Android downloaden<https://aka.ms/ghei36>

1 0

Subject: [PATCH v2] ASoC: soc-pcm: fix BE dai not hw_free and shutdown during mixer update
by 朱灿灿 02 Jun '20

02 Jun '20

FE state is SND_SOC_DPCM_STATE_PREPARE now, BE1 is used by FE. Later when new BE2 is added to FE by mixer update, it will call dpcm_run_update_startup() to update BE2's state, but unfortunately BE2 .prepare() meets error, it will disconnect all non started BE. This make BE1 dai skip .hw_free() and .shutdown(), and the BE1 users will never decrease to zero. Signed-off-by: zhucancan <zhucancan(a)vivo.com> --- re-format patch content v2 --- sound/soc/soc-pcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 1f302de44052..df34422bd0dd 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -2730,12 +2730,12 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream) close: dpcm_be_dai_shutdown(fe, stream); disconnect: - /* disconnect any non started BEs */ + /* disconnect any closed BEs */ spin_lock_irqsave(&fe->card->dpcm_lock, flags); for_each_dpcm_be(fe, stream, dpcm) { struct snd_soc_pcm_runtime *be = dpcm->be; - if (be->dpcm[stream].state != SND_SOC_DPCM_STATE_START) - dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE; + if (be->dpcm[stream].state == SND_SOC_DPCM_STATE_CLOSE) + dpcm->state = SND_SOC_DPCM_LINK_STATE_FREE; } spin_unlock_irqrestore(&fe->card->dpcm_lock, flags); -- 2.21.0

3 2

[PATCH] Add duplex sound support for USB devices using implicit feedback
by Erwin Burema 02 Jun '20

02 Jun '20

For USB sound devices using implicit feedback the endpoint used for this feedback should be able to be opened twice, once for required feedback and second time for audio data. This way these devices can be put in duplex audio mode. Since this only works if the settings of the endpoint don't change a check is included for this. This fixes bug 207023 ("MOTU M2 regression on duplex audio") and should also fix bug 103751 ("M-Audio Fast Track Ultra usb audio device will not operate full-duplex") Signed-off-by: Erwin Burema <e.burema(a)gmail.com> --- sound/usb/card.h | 1 + sound/usb/endpoint.c | 195 ++++++++++++++++++++++++++++++++++++++++++- sound/usb/pcm.c | 5 ++ 3 files changed, 197 insertions(+), 4 deletions(-) diff --git a/sound/usb/card.h b/sound/usb/card.h index 820e564656ed..d6219fba9699 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -108,6 +108,7 @@ struct snd_usb_endpoint { int iface, altsetting; int skip_packets; /* quirks for devices to ignore the first n packets in a stream */ + bool is_implicit_feedback; /* This endpoint is used as implicit feedback */ spinlock_t lock; struct list_head list; diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index 50104f658ed4..9bea7d3f99f8 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -522,6 +522,8 @@ struct snd_usb_endpoint *snd_usb_add_endpoint(struct snd_usb_audio *chip, list_add_tail(&ep->list, &chip->ep_list); + ep->is_implicit_feedback = 0; + __exit_unlock: mutex_unlock(&chip->mutex); @@ -621,6 +623,178 @@ static void release_urbs(struct snd_usb_endpoint *ep, int force) ep->nurbs = 0; } +/* + * Check data endpoint for format differences + */ +static bool check_ep_params(struct snd_usb_endpoint *ep, + snd_pcm_format_t pcm_format, + unsigned int channels, + unsigned int period_bytes, + unsigned int frames_per_period, + unsigned int periods_per_buffer, + struct audioformat *fmt, + struct snd_usb_endpoint *sync_ep) +{ + unsigned int maxsize, minsize, packs_per_ms, max_packs_per_urb; + unsigned int max_packs_per_period, urbs_per_period, urb_packs; + unsigned int max_urbs; + int frame_bits = snd_pcm_format_physical_width(pcm_format) * channels; + int tx_length_quirk = (ep->chip->tx_length_quirk && + usb_pipeout(ep->pipe)); + bool ret = 1; + + if (pcm_format == SNDRV_PCM_FORMAT_DSD_U16_LE && fmt->dsd_dop) { + /* + * When operating in DSD DOP mode, the size of a sample frame + * in hardware differs from the actual physical format width + * because we need to make room for the DOP markers. + */ + frame_bits += channels << 3; + } + + ret = ret && (ep->datainterval == fmt->datainterval); + ret = ret && (ep->stride == frame_bits >> 3); + + switch (pcm_format) { + case SNDRV_PCM_FORMAT_U8: + ret = ret && (ep->silence_value == 0x80); + break; + case SNDRV_PCM_FORMAT_DSD_U8: + case SNDRV_PCM_FORMAT_DSD_U16_LE: + case SNDRV_PCM_FORMAT_DSD_U32_LE: + case SNDRV_PCM_FORMAT_DSD_U16_BE: + case SNDRV_PCM_FORMAT_DSD_U32_BE: + ret = ret && (ep->silence_value == 0x69); + break; + default: + ret = ret && (ep->silence_value == 0); + } + + /* assume max. frequency is 50% higher than nominal */ + ret = ret && (ep->freqmax == ep->freqn + (ep->freqn >> 1)); + /* Round up freqmax to nearest integer in order to calculate maximum + * packet size, which must represent a whole number of frames. + * This is accomplished by adding 0x0.ffff before converting the + * Q16.16 format into integer. + * In order to accurately calculate the maximum packet size when + * the data interval is more than 1 (i.e. ep->datainterval > 0), + * multiply by the data interval prior to rounding. For instance, + * a freqmax of 41 kHz will result in a max packet size of 6 (5.125) + * frames with a data interval of 1, but 11 (10.25) frames with a + * data interval of 2. + * (ep->freqmax << ep->datainterval overflows at 8.192 MHz for the + * maximum datainterval value of 3, at USB full speed, higher for + * USB high speed, noting that ep->freqmax is in units of + * frames per packet in Q16.16 format.) + */ + maxsize = (((ep->freqmax << ep->datainterval) + 0xffff) >> 16) * + (frame_bits >> 3); + if (tx_length_quirk) + maxsize += sizeof(__le32); /* Space for length descriptor */ + /* but wMaxPacketSize might reduce this */ + if (ep->maxpacksize && ep->maxpacksize < maxsize) { + /* whatever fits into a max. size packet */ + unsigned int data_maxsize = maxsize = ep->maxpacksize; + + if (tx_length_quirk) + /* Need to remove the length descriptor to calc freq */ + data_maxsize -= sizeof(__le32); + ret = ret && (ep->freqmax == (data_maxsize / (frame_bits >> 3)) + << (16 - ep->datainterval)); + } + + if (ep->fill_max) + ret = ret && (ep->curpacksize == ep->maxpacksize); + else + ret = ret && (ep->curpacksize == maxsize); + + if (snd_usb_get_speed(ep->chip->dev) != USB_SPEED_FULL) { + packs_per_ms = 8 >> ep->datainterval; + max_packs_per_urb = MAX_PACKS_HS; + } else { + packs_per_ms = 1; + max_packs_per_urb = MAX_PACKS; + } + if (sync_ep && !snd_usb_endpoint_implicit_feedback_sink(ep)) + max_packs_per_urb = min(max_packs_per_urb, + 1U << sync_ep->syncinterval); + max_packs_per_urb = max(1u, max_packs_per_urb >> ep->datainterval); + + /* + * Capture endpoints need to use small URBs because there's no way + * to tell in advance where the next period will end, and we don't + * want the next URB to complete much after the period ends. + * + * Playback endpoints with implicit sync much use the same parameters + * as their corresponding capture endpoint. + */ + if (usb_pipein(ep->pipe) || + snd_usb_endpoint_implicit_feedback_sink(ep)) { + + urb_packs = packs_per_ms; + /* + * Wireless devices can poll at a max rate of once per 4ms. + * For dataintervals less than 5, increase the packet count to + * allow the host controller to use bursting to fill in the + * gaps. + */ + if (snd_usb_get_speed(ep->chip->dev) == USB_SPEED_WIRELESS) { + int interval = ep->datainterval; + + while (interval < 5) { + urb_packs <<= 1; + ++interval; + } + } + /* make capture URBs <= 1 ms and smaller than a period */ + urb_packs = min(max_packs_per_urb, urb_packs); + while (urb_packs > 1 && urb_packs * maxsize >= period_bytes) + urb_packs >>= 1; + ret = ret && (ep->nurbs == MAX_URBS); + + /* + * Playback endpoints without implicit sync are adjusted so that + * a period fits as evenly as possible in the smallest number of + * URBs. The total number of URBs is adjusted to the size of the + * ALSA buffer, subject to the MAX_URBS and MAX_QUEUE limits. + */ + } else { + /* determine how small a packet can be */ + minsize = (ep->freqn >> (16 - ep->datainterval)) * + (frame_bits >> 3); + /* with sync from device, assume it can be 12% lower */ + if (sync_ep) + minsize -= minsize >> 3; + minsize = max(minsize, 1u); + + /* how many packets will contain an entire ALSA period? */ + max_packs_per_period = DIV_ROUND_UP(period_bytes, minsize); + + /* how many URBs will contain a period? */ + urbs_per_period = DIV_ROUND_UP(max_packs_per_period, + max_packs_per_urb); + /* how many packets are needed in each URB? */ + urb_packs = DIV_ROUND_UP(max_packs_per_period, urbs_per_period); + + /* limit the number of frames in a single URB */ + ret = ret && (ep->max_urb_frames == + DIV_ROUND_UP(frames_per_period, urbs_per_period)); + + /* try to use enough URBs to contain an entire ALSA buffer */ + max_urbs = min((unsigned) MAX_URBS, + MAX_QUEUE * packs_per_ms / urb_packs); + ret = ret && (ep->nurbs == min(max_urbs, + urbs_per_period * periods_per_buffer)); + } + + ret = ret && (ep->datainterval == fmt->datainterval); + ret = ret && (ep->maxpacksize == fmt->maxpacksize); + ret = ret && + (ep->fill_max == !!(fmt->attributes & UAC_EP_CS_ATTR_FILL_MAX)); + + return ret; +} + /* * configure a data endpoint */ @@ -886,10 +1060,23 @@ int snd_usb_endpoint_set_params(struct snd_usb_endpoint *ep, int err; if (ep->use_count != 0) { - usb_audio_warn(ep->chip, - "Unable to change format on ep #%x: already in use\n", - ep->ep_num); - return -EBUSY; + bool check = ep->is_implicit_feedback && + check_ep_params(ep, pcm_format, + channels, period_bytes, + period_frames, buffer_periods, + fmt, sync_ep); + + if (!check) { + usb_audio_warn(ep->chip, + "Unable to change format on ep #%x: already in use\n", + ep->ep_num); + return -EBUSY; + } + + usb_audio_dbg(ep->chip, + "Ep #%x already in use as implicit feedback but format not changed\n", + ep->ep_num); + return 0; } /* release old buffers, if any */ diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index b50965ab3b3a..d61c2f1095b5 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -404,6 +404,8 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, if (!subs->sync_endpoint) return -EINVAL; + subs->sync_endpoint->is_implicit_feedback = 1; + subs->data_endpoint->sync_master = subs->sync_endpoint; return 1; @@ -502,12 +504,15 @@ static int set_sync_endpoint(struct snd_usb_substream *subs, implicit_fb ? SND_USB_ENDPOINT_TYPE_DATA : SND_USB_ENDPOINT_TYPE_SYNC); + if (!subs->sync_endpoint) { if (is_playback && attr == USB_ENDPOINT_SYNC_NONE) return 0; return -EINVAL; } + subs->sync_endpoint->is_implicit_feedback = implicit_fb; + subs->data_endpoint->sync_master = subs->sync_endpoint; return 0; -- 2.26.2

3 9

[PATCH] ALSA: core: Fix control device release issue
by 朱灿灿 02 Jun '20

02 Jun '20

From: zhucancan <zhucancan(a)vivo.com> Date: Tue, 2 Jun 2020 16:22:57 +0800 Subject: [PATCH] ALSA: core: Fix control device release issue We use snd_pcm_add_usr_ctls() in component's .pcm_new(), unfortunately snd_soc_dapm_add_routes() meets error during adding card->dapm_routes/of_dapm_routes, it will goto probe_end to call soc_cleanup_card_resources(). The commit dc82e52492f6 ("ALSA: core: Assure control device to be registered at last") will make pcm device release is prior to control device release, but the control device needs to use pcm pointor, which is already freed by pcm device release. [ 70.056000] Unable to handle kernel paging request at virtual address ffffff80f2d2c480 [ 70.066139] init: processing action (init.svc.media=*) from (/system/etc/init/mediaserver.rc:1) [ 70.076311] Mem abort info: [ 70.126679] ESR = 0x96000047 [ 70.126685] EC = 0x25: DABT (current EL), IL = 32 bits [ 70.126689] SET = 0, FnV = 0 [ 70.126693] EA = 0, S1PTW = 0 [ 70.126696] Data abort info: [ 70.126700] ISV = 0, ISS = 0x00000047 [ 70.126704] CM = 0, WnR = 1 [ 70.126710] swapper pgtable: 4k pages, 39-bit VAs, pgdp=00000000a216b000 [ 70.126715] [ffffff80f2d2c480] pgd=00000001ffb7f003, pud=00000001ffb7f003, pmd=00000001ff9e8003, pte=0068000172d2cf12 [ 70.126731] Internal error: Oops: 96000047 [#1] PREEMPT SMP [ 70.126821] CPU: 0 PID: 5 Comm: kworker/0:0 Tainted: G W O 5.4.12-qgki-debug-g4c7ca9f20 #10 [ 70.126840] Workqueue: events deferred_probe_work_func$2b500e852cead69fde05a2b98ceb2fa6.cfi_jt [ 70.126845] pstate: 80c00005 (Nzcv daif +PAN +UAO) [ 70.126854] pc : pcm_usr_ctl_private_free$165f4400ee6732c7c8c8157be0f72518+0x20/0x34 [ 70.126861] lr : snd_ctl_remove+0xf4/0x154 [ 70.126862] sp : ffffffc01007b750 [ 70.126865] x29: ffffffc01007b750 x28: ffffffd973c2bb2c [ 70.126868] x27: ffffff8107b741a0 x26: dead000000000100 [ 70.126874] x25: 0000000000000002 x24: ffffffd973c2bb8c [ 70.126877] x23: ffffffd975027c80 x22: ffffffd97415437f [ 70.126880] x21: 0000000000000001 x20: ffffffd973c37e10 [ 70.126883] x19: ffffff80f2d55d00 x18: ffffff80451de4d0 [ 70.126886] x17: ffffff80f2d58000 x16: 0000000000000400 [ 70.126889] x15: a6fe4e9bdc5a6b05 x14: 0000000000000000 [ 70.126892] x13: ffffffff03ab5408 x12: 0000000000000001 [ 70.126896] x11: 7079542070704120 x10: 0000000000000398 [ 70.126899] x9 : 0000000000000001 x8 : ffffff80f2d2c398 [ 70.126902] x7 : 0000000000000000 x6 : ffffff80f6b4d178 [ 70.126905] x5 : ffffffd97335fe8c x4 : 0000000000000000 [ 70.126908] x3 : ffffffc01007b650 x2 : ffffffc01007b768 [ 70.126911] x1 : 00000000ffffffff x0 : ffffff811ff41480 [ 70.126916] Call trace: [ 70.126920] pcm_usr_ctl_private_free$165f4400ee6732c7c8c8157be0f72518+0x20/0x34 [ 70.126923] snd_ctl_remove+0xf4/0x154 [ 70.126927] snd_ctl_dev_free$1b8efea49186b79e6e4a39cac5748f1c+0x3c/0x70 [ 70.126930] snd_device_free_all+0x234/0x2c8 [ 70.126934] release_card_device$fb7328386cac0bdf1b3f2f88da79521f+0x24/0xcc [ 70.126941] device_release$d2fdd8912beb71f9ccc7ca72fceb0522+0x48/0x118 [ 70.126949] kobject_cleanup+0x138/0x25c [ 70.126952] kobject_put+0x50/0x60 [ 70.126955] put_device+0x14/0x20 [ 70.126957] snd_card_free+0x60/0x98 [ 70.126963] soc_cleanup_card_resources+0x2c/0x420 [ 70.126966] snd_soc_bind_card+0xcc0/0xfa8 [ 70.126968] snd_soc_register_card+0x110/0x128 [ 70.126974] devm_snd_soc_register_card+0x4c/0x90 Fixes: dc82e52492f6 ("ALSA: core: Assure control device to be registered at last") Signed-off-by: zhucancan <zhucancan(a)vivo.com> --- sound/core/device.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sound/core/device.c b/sound/core/device.c index bf0b04a7ee79..1aee0f5623a2 100644 --- a/sound/core/device.c +++ b/sound/core/device.c @@ -225,14 +225,6 @@ void snd_device_free_all(struct snd_card *card) if (snd_BUG_ON(!card)) return; - list_for_each_entry_safe_reverse(dev, next, &card->devices, list) { - /* exception: free ctl and lowlevel stuff later */ - if (dev->type == SNDRV_DEV_CONTROL || - dev->type == SNDRV_DEV_LOWLEVEL) - continue; - __snd_device_free(dev); - } - /* free all */ list_for_each_entry_safe_reverse(dev, next, &card->devices, list) __snd_device_free(dev); -- 2.21.0

2 1

Re: [PATCH] ALSA: core: Fix control device release issue
by Markus Elfring 02 Jun '20

02 Jun '20

> We use snd_pcm_add_usr_ctls() in component's .pcm_new(), > unfortunately snd_soc_dapm_add_routes() meets error during > adding card->dapm_routes/of_dapm_routes, it will goto probe_end > to call soc_cleanup_card_resources(). > > The commit dc82e52492f6 ("ALSA: core: Assure control device > to be registered at last") will make pcm device release is > prior to control device release, but the control device needs > to use pcm pointor, which is already freed by pcm device release. I suggest to improve this change description. Regards, Markus

1 0

Db845c
by GitHub pull_request - opened 02 Jun '20

02 Jun '20

alsa-project/alsa-ucm-conf pull request #29 was opened from Srinivas-Kandagatla: Hi Jaroslav Kysela, I removed Lenovo ucm2 configs for now, are you okay to pull DragonBoard DB845c ucm2 for now till we resolve in general naming issues with DT. All the drivers and DT are already in mainline since 5.6. Thanks, srini Changes sinc v2: - remove Lenovo ucm2 - remove cdev references. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/29 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/29.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH] soundwire: clarify SPDX use of GPL-2.0
by Bard Liao 02 Jun '20

02 Jun '20

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Change SPDX from GPL-2.0 to GPL-2.0-only for Intel-contributed code. This was explicit before the transition to SPDX and lost in translation. No change to the dual-license parts, the only clarification is to the GPL-2.0 term. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- drivers/soundwire/bus.c | 2 +- drivers/soundwire/bus.h | 2 +- drivers/soundwire/bus_type.c | 2 +- drivers/soundwire/cadence_master.c | 2 +- drivers/soundwire/cadence_master.h | 2 +- drivers/soundwire/intel.c | 2 +- drivers/soundwire/intel.h | 2 +- drivers/soundwire/intel_init.c | 2 +- drivers/soundwire/mipi_disco.c | 2 +- drivers/soundwire/slave.c | 2 +- drivers/soundwire/stream.c | 2 +- include/linux/soundwire/sdw.h | 2 +- include/linux/soundwire/sdw_intel.h | 2 +- include/linux/soundwire/sdw_registers.h | 2 +- include/linux/soundwire/sdw_type.h | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 24ba77226376..2289c2ac8c5a 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) // Copyright(c) 2015-17 Intel Corporation. #include <linux/acpi.h> diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h index 82484f741168..697a5b371568 100644 --- a/drivers/soundwire/bus.h +++ b/drivers/soundwire/bus.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */ /* Copyright(c) 2015-17 Intel Corporation. */ #ifndef __SDW_BUS_H diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c index de9a671802b8..95a87d4e26c2 100644 --- a/drivers/soundwire/bus_type.c +++ b/drivers/soundwire/bus_type.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only // Copyright(c) 2015-17 Intel Corporation. #include <linux/module.h> diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index 9ea87538b9ef..fe238645ed2c 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) // Copyright(c) 2015-17 Intel Corporation. /* diff --git a/drivers/soundwire/cadence_master.h b/drivers/soundwire/cadence_master.h index b410656f8194..ea606b4fba76 100644 --- a/drivers/soundwire/cadence_master.h +++ b/drivers/soundwire/cadence_master.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */ /* Copyright(c) 2015-17 Intel Corporation. */ #include <sound/soc.h> diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 4cfdd074e310..1eda63f488f5 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) // Copyright(c) 2015-17 Intel Corporation. /* diff --git a/drivers/soundwire/intel.h b/drivers/soundwire/intel.h index 38b7c125fb10..7b4af8018e1a 100644 --- a/drivers/soundwire/intel.h +++ b/drivers/soundwire/intel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */ /* Copyright(c) 2015-17 Intel Corporation. */ #ifndef __SDW_INTEL_LOCAL_H diff --git a/drivers/soundwire/intel_init.c b/drivers/soundwire/intel_init.c index d5d42795a48f..947345d5c960 100644 --- a/drivers/soundwire/intel_init.c +++ b/drivers/soundwire/intel_init.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) // Copyright(c) 2015-17 Intel Corporation. /* diff --git a/drivers/soundwire/mipi_disco.c b/drivers/soundwire/mipi_disco.c index 4ae62b452b8c..dbd8fc6f4dad 100644 --- a/drivers/soundwire/mipi_disco.c +++ b/drivers/soundwire/mipi_disco.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) // Copyright(c) 2015-17 Intel Corporation. /* diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c index 0839445ee07b..8e8b62dff51c 100644 --- a/drivers/soundwire/slave.c +++ b/drivers/soundwire/slave.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) // Copyright(c) 2015-17 Intel Corporation. #include <linux/acpi.h> diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index a9a72574b34a..296cea48bdcc 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) // Copyright(c) 2015-18 Intel Corporation. /* diff --git a/include/linux/soundwire/sdw.h b/include/linux/soundwire/sdw.h index 9c27a32df9bb..1fde044f5f3e 100644 --- a/include/linux/soundwire/sdw.h +++ b/include/linux/soundwire/sdw.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */ /* Copyright(c) 2015-17 Intel Corporation. */ #ifndef __SOUNDWIRE_H diff --git a/include/linux/soundwire/sdw_intel.h b/include/linux/soundwire/sdw_intel.h index 979b41b5dcb4..96a8633339a1 100644 --- a/include/linux/soundwire/sdw_intel.h +++ b/include/linux/soundwire/sdw_intel.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */ /* Copyright(c) 2015-17 Intel Corporation. */ #ifndef __SDW_INTEL_H diff --git a/include/linux/soundwire/sdw_registers.h b/include/linux/soundwire/sdw_registers.h index a686f7988156..06d895168b32 100644 --- a/include/linux/soundwire/sdw_registers.h +++ b/include/linux/soundwire/sdw_registers.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR BSD-3-Clause) */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */ /* Copyright(c) 2015-17 Intel Corporation. */ #ifndef __SDW_REGISTERS_H diff --git a/include/linux/soundwire/sdw_type.h b/include/linux/soundwire/sdw_type.h index 52eb66cd11bc..25ab91f5c6be 100644 --- a/include/linux/soundwire/sdw_type.h +++ b/include/linux/soundwire/sdw_type.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ /* Copyright(c) 2015-17 Intel Corporation. */ #ifndef __SOUNDWIRE_TYPES_H -- 2.17.1

3 3