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

[alsa-devel] [PATCH] ASoC: amd: raven: Make the driver name consistent across files
by Akshu Agrawal 29 Jan '20

29 Jan '20

This fixes the issue of driver not getting auto loaded with MODULE_ALIAS. With this patch: find /sys/devices -name modalias -print0 | xargs -0 grep -i acp3x /sys/devices/pci0000:00/0000:00:08.1/0000:03:00.5/acp3x_i2s_playcap.2/modalias:platform:acp3x_i2s_playcap /sys/devices/pci0000:00/0000:00:08.1/0000:03:00.5/acp3x_i2s_playcap.0/modalias:platform:acp3x_i2s_playcap /sys/devices/pci0000:00/0000:00:08.1/0000:03:00.5/acp3x_rv_i2s_dma.0/modalias:platform:acp3x_rv_i2s_dma /sys/devices/pci0000:00/0000:00:08.1/0000:03:00.5/acp3x_i2s_playcap.1/modalias:platform:acp3x_i2s_playcap Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> --- sound/soc/amd/raven/acp3x-i2s.c | 6 +++--- sound/soc/amd/raven/acp3x-pcm-dma.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index bf51cadf8682..8619ed5f08ef 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -15,7 +15,7 @@ #include "acp3x.h" -#define DRV_NAME "acp3x-i2s" +#define DRV_NAME "acp3x_i2s_playcap" static int acp3x_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) @@ -276,7 +276,7 @@ static struct snd_soc_dai_ops acp3x_i2s_dai_ops = { }; static const struct snd_soc_component_driver acp3x_dai_component = { - .name = "acp3x-i2s", + .name = DRV_NAME, }; static struct snd_soc_dai_driver acp3x_i2s_dai = { @@ -355,4 +355,4 @@ module_platform_driver(acp3x_dai_driver); MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati(a)amd.com"); MODULE_DESCRIPTION("AMD ACP 3.x PCM Driver"); MODULE_LICENSE("GPL v2"); -MODULE_ALIAS("platform:" DRV_NAME); +MODULE_ALIAS("platform:"DRV_NAME); diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c index aecc3c061679..c865aeca6907 100644 --- a/sound/soc/amd/raven/acp3x-pcm-dma.c +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c @@ -15,7 +15,7 @@ #include "acp3x.h" -#define DRV_NAME "acp3x-i2s-audio" +#define DRV_NAME "acp3x_rv_i2s_dma" static const struct snd_pcm_hardware acp3x_pcm_hardware_playback = { .info = SNDRV_PCM_INFO_INTERLEAVED | @@ -534,4 +534,4 @@ MODULE_AUTHOR("Maruthi.Bayyavarapu(a)amd.com"); MODULE_AUTHOR("Vijendar.Mukunda(a)amd.com"); MODULE_DESCRIPTION("AMD ACP 3.x PCM Driver"); MODULE_LICENSE("GPL v2"); -MODULE_ALIAS("platform:" DRV_NAME); +MODULE_ALIAS("platform:"DRV_NAME); -- 2.17.1

1 0

[alsa-devel] [PATCH] ASoC: Intel: skl_hda_dsp_common: Fix global-out-of-bounds bug
by Cezary Rojewski 28 Jan '20

28 Jan '20

Definitions for idisp snd_soc_dai_links within skl_hda_dsp_common are missing platform component. Add it to address following bug reported by KASAN: [ 10.538502] BUG: KASAN: global-out-of-bounds in skl_hda_audio_probe+0x13a/0x2b0 [snd_soc_skl_hda_dsp] [ 10.538509] Write of size 8 at addr ffffffffc0606840 by task systemd-udevd/299 (...) [ 10.538519] Call Trace: [ 10.538524] dump_stack+0x62/0x95 [ 10.538528] print_address_description+0x2f5/0x3b0 [ 10.538532] ? skl_hda_audio_probe+0x13a/0x2b0 [snd_soc_skl_hda_dsp] [ 10.538535] __kasan_report+0x134/0x191 [ 10.538538] ? skl_hda_audio_probe+0x13a/0x2b0 [snd_soc_skl_hda_dsp] [ 10.538542] ? skl_hda_audio_probe+0x13a/0x2b0 [snd_soc_skl_hda_dsp] [ 10.538544] kasan_report+0x12/0x20 [ 10.538546] __asan_store8+0x57/0x90 [ 10.538550] skl_hda_audio_probe+0x13a/0x2b0 [snd_soc_skl_hda_dsp] [ 10.538553] platform_drv_probe+0x51/0xb0 [ 10.538556] really_probe+0x311/0x600 [ 10.538559] driver_probe_device+0x87/0x1b0 [ 10.538562] device_driver_attach+0x8f/0xa0 [ 10.538565] ? device_driver_attach+0xa0/0xa0 [ 10.538567] __driver_attach+0x102/0x1a0 [ 10.538569] ? device_driver_attach+0xa0/0xa0 [ 10.538572] bus_for_each_dev+0xe8/0x160 [ 10.538574] ? subsys_dev_iter_exit+0x10/0x10 [ 10.538577] ? preempt_count_sub+0x18/0xc0 [ 10.538580] ? _raw_write_unlock+0x1f/0x40 [ 10.538582] driver_attach+0x2b/0x30 [ 10.538585] bus_add_driver+0x251/0x340 [ 10.538588] driver_register+0xd3/0x1c0 [ 10.538590] __platform_driver_register+0x6c/0x80 [ 10.538592] ? 0xffffffffc03e8000 [ 10.538595] skl_hda_audio_init+0x1c/0x1000 [snd_soc_skl_hda_dsp] [ 10.538598] do_one_initcall+0xd0/0x36a [ 10.538600] ? trace_event_raw_event_initcall_finish+0x160/0x160 [ 10.538602] ? kasan_unpoison_shadow+0x36/0x50 [ 10.538605] ? __kasan_kmalloc+0xcc/0xe0 [ 10.538607] ? kasan_unpoison_shadow+0x36/0x50 [ 10.538609] ? kasan_poison_shadow+0x2f/0x40 [ 10.538612] ? __asan_register_globals+0x65/0x80 [ 10.538615] do_init_module+0xf9/0x36f [ 10.538619] load_module+0x398e/0x4590 [ 10.538625] ? module_frob_arch_sections+0x20/0x20 [ 10.538628] ? __kasan_check_write+0x14/0x20 [ 10.538630] ? kernel_read+0x9a/0xc0 [ 10.538632] ? __kasan_check_write+0x14/0x20 [ 10.538634] ? kernel_read_file+0x1d3/0x3c0 [ 10.538638] ? cap_capable+0xca/0x110 [ 10.538642] __do_sys_finit_module+0x190/0x1d0 [ 10.538644] ? __do_sys_finit_module+0x190/0x1d0 [ 10.538646] ? __x64_sys_init_module+0x50/0x50 [ 10.538649] ? expand_files+0x380/0x380 [ 10.538652] ? __kasan_check_write+0x14/0x20 [ 10.538654] ? fput_many+0x20/0xc0 [ 10.538658] __x64_sys_finit_module+0x43/0x50 [ 10.538660] do_syscall_64+0xce/0x700 [ 10.538662] ? syscall_return_slowpath+0x230/0x230 [ 10.538665] ? __do_page_fault+0x51e/0x640 [ 10.538668] ? __kasan_check_read+0x11/0x20 [ 10.538670] ? prepare_exit_to_usermode+0xc7/0x200 [ 10.538673] entry_SYSCALL_64_after_hwframe+0x44/0xa9 Fixes: a78959f407e6 ("ASoC: Intel: skl_hda_dsp_common: use modern dai_link style") Signed-off-by: Cezary Rojewski <cezary.rojewski(a)intel.com> --- sound/soc/intel/boards/skl_hda_dsp_common.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/sound/soc/intel/boards/skl_hda_dsp_common.c b/sound/soc/intel/boards/skl_hda_dsp_common.c index eb419e1ec42b..78ff5f24c40e 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_common.c +++ b/sound/soc/intel/boards/skl_hda_dsp_common.c @@ -41,16 +41,19 @@ int skl_hda_hdmi_add_pcm(struct snd_soc_card *card, int device) return 0; } -SND_SOC_DAILINK_DEFS(idisp1, - DAILINK_COMP_ARRAY(COMP_CPU("iDisp1 Pin")), +SND_SOC_DAILINK_DEF(idisp1_cpu, + DAILINK_COMP_ARRAY(COMP_CPU("iDisp1 Pin"))); +SND_SOC_DAILINK_DEF(idisp1_codec, DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi1"))); -SND_SOC_DAILINK_DEFS(idisp2, - DAILINK_COMP_ARRAY(COMP_CPU("iDisp2 Pin")), +SND_SOC_DAILINK_DEF(idisp2_cpu, + DAILINK_COMP_ARRAY(COMP_CPU("iDisp2 Pin"))); +SND_SOC_DAILINK_DEF(idisp2_codec, DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi2"))); -SND_SOC_DAILINK_DEFS(idisp3, - DAILINK_COMP_ARRAY(COMP_CPU("iDisp3 Pin")), +SND_SOC_DAILINK_DEF(idisp3_cpu, + DAILINK_COMP_ARRAY(COMP_CPU("iDisp3 Pin"))); +SND_SOC_DAILINK_DEF(idisp3_codec, DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi3"))); SND_SOC_DAILINK_DEF(analog_cpu, @@ -83,21 +86,21 @@ struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS] = { .id = 1, .dpcm_playback = 1, .no_pcm = 1, - SND_SOC_DAILINK_REG(idisp1), + SND_SOC_DAILINK_REG(idisp1_cpu, idisp1_codec, platform), }, { .name = "iDisp2", .id = 2, .dpcm_playback = 1, .no_pcm = 1, - SND_SOC_DAILINK_REG(idisp2), + SND_SOC_DAILINK_REG(idisp2_cpu, idisp2_codec, platform), }, { .name = "iDisp3", .id = 3, .dpcm_playback = 1, .no_pcm = 1, - SND_SOC_DAILINK_REG(idisp3), + SND_SOC_DAILINK_REG(idisp3_cpu, idisp3_codec, platform), }, { .name = "Analog Playback and Capture", -- 2.17.1

6 14

[alsa-devel] [PATCH 0/4] Add a better separation between i.MX8 families
by Daniel Baluta (OSS) 28 Jan '20

28 Jan '20

From: Daniel Baluta <daniel.baluta(a)nxp.com> So far the implementation was designed to support a generic platform named i.MX8. Anyhow, now working with specific i.MX8 instances we need to account for the differences. i.MX8 naming can be confusing at the first glance, so we need to have a clean separation between different platforms. Here is the split of i.MX8 per platforms. Notice that i.MX8 names the entire family, but also a sub-family. imx8 ├── imx8 │ └── imx8qm (*) ├── imx8m │ ├── imx8mm │ ├── imx8mn │ ├── imx8mp (*) │ └── imx8mq └── imx8x └── imx8qxp (*) Platforms marked with (*) contain a DSP. In the future there might be more platforms. This patchseries does the following: * renames imx8 to imx8x (because the only supported platform now is imx8qxp). * adds support for imx8 (which is imx8qm) A future patchset will add supprot for i.MX8MP. Paul Olaru (4): ASoC: SOF: Rename i.MX8 platform to i.MX8X ASoC: SOF: imx8: Add ops for i.MX8QM ASoC: SOF: Add i.MX8QM device descriptor dt-bindings: dsp: fsl: Add fsl,imx8qm-dsp entry .../devicetree/bindings/dsp/fsl,dsp.yaml | 1 + sound/soc/sof/imx/imx8.c | 57 ++++++++++++++++++- sound/soc/sof/sof-of-dev.c | 10 ++++ 3 files changed, 65 insertions(+), 3 deletions(-) -- 2.17.1

2 5

[alsa-devel] [PATCH v2 00/11] ASoC: SOF: Data probing
by Cezary Rojewski 28 Jan '20

28 Jan '20

This set of patches achieves few goals in order to enable data probing feature for audio DSP. First, provide new and alter existing interfaces (page allocation, runtime flow adjustments) to make them compress friendly. For HDA part, work has been done to account for compress streams when servicing IRQs, setting up BDLs and assigning DMAs. Finally, the end goal which are the probe APIs and usage itself. Probes can be treated as endpoints which allow for data extraction from or injection to target module - a great ally when debugging problematic audio issues such as distortions, glitches or gaps. Compress streams are a weapon of choice here to provide a lightweight implementation. While all available IPCs have been defined, current implementation covers extraction only, with injection scheduled for a later date. Initial review and development of probes can be found under: https://github.com/thesofproject/linux/pull/1276 with the hda-compress-enable set of patches being separated and reviewed on: https://github.com/thesofproject/linux/pull/1571 Tested on CML-U with rt5682 i2s board. Changes in v2: - No changes to ALSA core and hda patches - Removed "ASoC: Intel: sof_rt5682: Add compress probe DAI links" from the patchset list as requested by Pierre - updated copyright header for newly added files (dates) - probes over HDA no longer require SND_SOC_SOF_HDA_LINK enabled - renamed debugfs probe functions as requested by Pierre - probe IPC API has been updated to align with newest SOF FW & probe debug app (struct_size macro has been enlisted to make the size calculations transparent). This targets only "ASoC: SOF: Implement Probe IPC API" patch Cezary Rojewski (11): ALSA: hda: Allow for compress stream to hdac_ext_stream assignment ALSA: hda: Prepare for compress stream support ALSA: hda: Interrupt servicing and BDL setup for compress streams ALSA: core: Expand DMA buffer information ALSA: core: Implement compress page allocation and free routines ASoC: SOF: Intel: Account for compress streams when servicing IRQs ASoC: SOF: Implement Probe IPC API ASoC: SOF: Generic probe compress operations ASoC: SOF: Intel: Probe compress operations ASoC: SOF: Provide probe debugfs support ASoC: SOF: Intel: Add Probe compress CPU DAIs include/sound/compress_driver.h | 40 +++- include/sound/hdaudio.h | 2 + include/sound/hdaudio_ext.h | 2 + include/sound/sof/header.h | 11 ++ sound/core/compress_offload.c | 42 +++++ sound/hda/ext/hdac_ext_stream.c | 49 ++++- sound/hda/hdac_controller.c | 4 +- sound/hda/hdac_stream.c | 52 ++++-- sound/soc/sof/Kconfig | 9 + sound/soc/sof/Makefile | 3 +- sound/soc/sof/compress.c | 139 ++++++++++++++ sound/soc/sof/compress.h | 29 +++ sound/soc/sof/debug.c | 208 +++++++++++++++++++++ sound/soc/sof/intel/Kconfig | 9 + sound/soc/sof/intel/Makefile | 1 + sound/soc/sof/intel/apl.c | 9 + sound/soc/sof/intel/cnl.c | 9 + sound/soc/sof/intel/hda-compress.c | 132 +++++++++++++ sound/soc/sof/intel/hda-dai.c | 28 +++ sound/soc/sof/intel/hda-ipc.c | 4 +- sound/soc/sof/intel/hda-stream.c | 26 ++- sound/soc/sof/intel/hda.h | 30 +++ sound/soc/sof/ops.h | 43 +++++ sound/soc/sof/pcm.c | 11 +- sound/soc/sof/probe.c | 285 +++++++++++++++++++++++++++++ sound/soc/sof/probe.h | 85 +++++++++ sound/soc/sof/sof-priv.h | 24 +++ 27 files changed, 1245 insertions(+), 41 deletions(-) create mode 100644 sound/soc/sof/compress.c create mode 100644 sound/soc/sof/compress.h create mode 100644 sound/soc/sof/intel/hda-compress.c create mode 100644 sound/soc/sof/probe.c create mode 100644 sound/soc/sof/probe.h -- 2.17.1

2 21

[alsa-devel] [PATCH] ALSA: hda: Reset stream if DMA RUN bit not cleared
by Mohan Kumar 28 Jan '20

28 Jan '20

Tegra HDA has FIFO size which can hold upto 10 audio frames to support DVFS. When HDA DMA RUN bit is set to 0 to stop the stream, the DMA RUN bit will be cleared to 0 only after transferring all the remaining audio frames queued up in the fifo. This is not in sync with spec which states the controller will stop transmitting(output) in the beginning of the next frame for the relevant stream. The above behavior with Tegra HDA was resulting in machine check error during the system suspend flow with active audio playback with below kernel error logs. [ 33.524583] mc-err: [mcerr] (hda) csr_hdar: EMEM address decode error [ 33.531088] mc-err: [mcerr] status = 0x20000015; addr = 0x00000000 [ 33.537431] mc-err: [mcerr] secure: no, access-type: read, SMMU fault: none This was due to the fifo has more than one audio frame when the DMA RUN bit is set to 0 during system suspend flow and the timeout handling in snd_hdac_stream_sync() was not designed to handle this scenario. So the DMA will continue running even after timeout hit until all remaining audio frames in the fifo are transferred, but the suspend flow will try to reset the controller and turn off the hda clocks without the knowledge of the DMA is still running and could result in mc-err. The above issue can be resolved by doing stream reset with the help of snd_hdac_stream_reset() which would ensure the DMA RUN bit is cleared if the timeout was hit in snd_hdac_stream_sync(). Signed-off-by: Mohan Kumar <mkumard(a)nvidia.com> --- sound/hda/hdac_stream.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c index 682ed39f79b0..890ff1b7a878 100644 --- a/sound/hda/hdac_stream.c +++ b/sound/hda/hdac_stream.c @@ -629,20 +629,27 @@ void snd_hdac_stream_sync(struct hdac_stream *azx_dev, bool start, nwait = 0; i = 0; list_for_each_entry(s, &bus->stream_list, list) { - if (streams & (1 << i)) { - if (start) { - /* check FIFO gets ready */ - if (!(snd_hdac_stream_readb(s, SD_STS) & - SD_STS_FIFO_READY)) - nwait++; - } else { - /* check RUN bit is cleared */ - if (snd_hdac_stream_readb(s, SD_CTL) & - SD_CTL_DMA_START) - nwait++; + if (!(streams & (1 << i++))) + continue; + + if (start) { + /* check FIFO gets ready */ + if (!(snd_hdac_stream_readb(s, SD_STS) & + SD_STS_FIFO_READY)) + nwait++; + } else { + /* check RUN bit is cleared */ + if (snd_hdac_stream_readb(s, SD_CTL) & + SD_CTL_DMA_START) { + nwait++; + /* + * Perform stream reset if DMA RUN + * bit not cleared within given timeout + */ + if (timeout == 1) + snd_hdac_stream_reset(s); } } - i++; } if (!nwait) break; -- 2.17.1

2 1

[alsa-devel] UCM file lookup logic
by Tanu Kaskinen 28 Jan '20

28 Jan '20

Hi all, I was looking at the UCM files, and most paths have the following structure: <cardname>/<cardname>.conf I noticed that the "HDA Intel PCH" configuration uses some other scheme: HDA Intel PCH/HDAudio-DualCodecs.conf HDA Intel PCH/HDAudio-Gigabyte-ALC1220DualCodecs.conf HDA Intel PCH/HDAudio-Lenovo-DualCodecs.conf How are the directory and file names determined? If I write configuration for some random sound card that I don't have myself, where do I find the various identifiers in the alsa-info output? I don't even really know for sure what the <cardname> in the first example is, I've been assuming it's the name that appears in the square brackets in /proc/asound/cards. I think the lookup logic should be explained in the ucm2/README.md file. I can write a patch if someone expains the logic to me, but probably it's easier if you just write the patch yourself. -- Tanu https://www.patreon.com/tanuk https://liberapay.com/tanuk

2 2

[alsa-devel] Question: Can aux_dev suspend/resume ?
by Kuninori Morimoto 28 Jan '20

28 Jan '20

Hi ALSA ML I'm checking ALSA SoC framework. Now, many Components are connected to Card. When we want to do something to all Components, we have 2 type of loops 1) for_each_card_components(card, component) { ... } 2) for_each_card_rtds(card, rtd) { for_each_rtd_components(rtd, i, component) { ... } } But, I noticed that these 1) and 2) are not same. Please double check it. We have 3 ways to connect Component to Card. a) via Card pre-linked Aux (= card->aux_dev) b) via Card pre-linked link (= card->dai_link) c) via Topology dai_link static int snd_soc_bind_card(struct snd_soc_card *card) { ... a) ret = soc_bind_aux_dev(card); ... for_each_card_prelinks(card, i, dai_link) { b) ret = snd_soc_add_pcm_runtime(card, dai_link); ... } ... c) ret = snd_soc_card_probe(card); ... X) ret = soc_probe_link_components(card); ... Y) ret = soc_probe_aux_devices(card); ... Here, b) and c) has dai_link / rtd. And, connected Component are probed at X) (= b) + c)) Y) (= a)). Then, probed Component are connected to card->component_dev_list. Above 1) loop is based on it. In total, 1) and 2) loop difference are 1) loop is for a) + b) + c) 2) loop is for b) + c) Now, ALSA SoC suspend/resume checks below, but a) doesn't have it. rtd->dai_link->ignore_suspend. Thus, "suspend" is using 2) loop, but, "resume" is using 1) loop. My question here is that can AUX suspend/resume ? I think we need/want to use 1) loop for it. Thank you for your help !! Best regards --- Kuninori Morimoto

1 1

[alsa-devel] [PATCH v2 0/7] ASoC: soc-pcm cleanup step2
by Kuninori Morimoto 28 Jan '20

28 Jan '20

Hi Mark These are v2 of soc-pcm cleanup step2. Kuninori Morimoto (7): ASoC: soc-pcm: add snd_soc_runtime_action() ASoC: soc-pcm: adjustment for DAI member 0 reset ASoC: soc-pcm: add for_each_dapm_widgets() macro ASoC: soc-pcm: goto error after trying for_each_rtd_codec_dai ASoC: soc-pcm: goto error after trying all component open ASoC: soc-pcm: move soc_pcm_close() next to soc_pcm_open() ASoC: soc-pcm: tidyup soc_pcm_open() order include/sound/soc-dapm.h | 5 + sound/soc/soc-dapm.c | 8 +- sound/soc/soc-pcm.c | 265 +++++++++++++++++++++-------------------------- 3 files changed, 123 insertions(+), 155 deletions(-) -- 2.7.4

2 8

[alsa-devel] [PATCH 0/7] ASoC: SOF: fixes for 5.6
by Pierre-Louis Bossart 27 Jan '20

27 Jan '20

I know this is cutting it close to the merge window, but since Takashi suggested I provide the suspend bug he, Kai and I were working on, I decided to send a small batch of fixes. Bard Liao (1): ASoC: intel: soc-acpi-intel-icl-match: fix rt715 ADR Guennadi Liakhovetski (2): ASoC: SOF: fix an Oops, caused by invalid topology ASoC: Intel: consistent HDMI codec probing code Kai Vehmanen (1): ASoC: SOF: trace: fix unconditional free in trace release Pan Xiuli (1): ASoC: SOF: pci: add missing default_fw_name of JasperLake Pierre-Louis Bossart (2): ASoC: SOF: core: free trace on errors ASoC: SOF: core: release resources on errors in probe_continue sound/soc/intel/boards/bxt_da7219_max98357a.c | 14 +++---- sound/soc/intel/boards/bxt_rt298.c | 14 +++---- sound/soc/intel/boards/cml_rt1011_rt5682.c | 13 ++++--- sound/soc/intel/boards/glk_rt5682_max98357a.c | 16 ++++---- sound/soc/intel/boards/sof_rt5682.c | 15 ++++---- .../intel/common/soc-acpi-intel-icl-match.c | 2 +- sound/soc/sof/core.c | 38 ++++++++----------- sound/soc/sof/pcm.c | 10 +++++ sound/soc/sof/pm.c | 4 ++ sound/soc/sof/sof-pci-dev.c | 1 + sound/soc/sof/trace.c | 7 +++- 11 files changed, 74 insertions(+), 60 deletions(-) -- 2.20.1

3 16

[alsa-devel] [GIT PULL] ASoC updates for v5.6
by Mark Brown 27 Jan '20

27 Jan '20

The following changes since commit def9d2780727cec3313ed3522d0123158d87224d: Linux 5.5-rc7 (2020-01-19 16:02:49 -0800) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v5.6 for you to fetch changes up to a7196caf83ea9e9b56c5c8c95fbfe0d45acec46b: Merge branch 'asoc-5.6' into asoc-next (2020-01-23 12:36:45 +0000) ---------------------------------------------------------------- ASoC: Updates for v5.6 A pretty big release this time around, a lot of new drivers and both Morimoto-san and Takashi were doing subsystem wide updates as well: - Further big refactorings from Morimoto-san simplifying the core interfaces and moving things to the component level. - Transition of drivers to managed buffer allocation and removal of redundant PCM ioctls. - New driver support for Ingenic JZ4770, Mediatek MT6660, Qualcomm WCD934x and WSA881x, and Realtek RT700, RT711, RT715, RT1011, RT1015 and RT1308. ---------------------------------------------------------------- Angus Ainslie (Purism) (2): ASoC: gtm601: add Broadmobi bm818 sound profile dt-bindings: sound: gtm601: add the broadmobi interface Arnd Bergmann (1): ASoC: gtm601: fix build warning Bard Liao (4): ASoC: SOF: Intel: hda: solve MSI issues by merging ipc and stream irq handlers soundwire: intel: update headers for interrupts soundwire: intel: add link_list to handle interrupts with a single thread ASoC: Intel: common: add match tables for ICL w/ SoundWire Ben Zhang (1): ASoC: intel: Add Broadwell rt5650 machine driver Cezary Rojewski (3): ASoC: compress: Add pm_runtime support ASoC: SOF: Intel: hda: Fix SKL dai count ASoC: Intel: skl_hda_dsp_common: Fix global-out-of-bounds bug Charles Keepax (7): ASoC: madera: Enable clocks for input pins when used as a direct clock ASoC: madera: Enable clocks for input pins when used for the FLL ASoC: wm_adsp: Correct cache handling of new kernel control API ASoC: madera: Update handling of DAPM routes for mono muxed outputs ASoC: madera: Correct error path handling in madera_out1_demux_put ASoC: madera: Correct DMIC only input hook ups ASoC: madera: Correct some kernel doc Chen Zhou (1): ASoC: atmel: fix build error with CONFIG_SND_ATMEL_SOC_DMA=m Christophe JAILLET (1): ASoC: cs47l92: Simplify error handling code in 'cs47l92_probe()' Damian van Soelen (1): ASoC: Intel: cht_bsw_rt5645: Remove unnecessary string buffers and snprintf calls Daniel Baluta (2): ASoC: SOF: Make creation of machine device from SOF core optional ASoC: SOF: Remove unused drv_name in sof_pdata Dmitry Torokhov (1): ASoC: Intel: bytcr_rt5651: switch to using devm_fwnode_gpiod_get() Dragos Tarcatu (1): ASoC: topology: Prevent use-after-free in snd_soc_get_pcm_runtime() Eason Yen (2): ASoC: mediatek: common: add some helpers to control mtk_memif ASoC: mediatek: common: refine hw_params and hw_prepare Erik Bussing (1): ASoC: Intel: bytcr_rt5640: Remove code duplication in byt_rt5640_codec_fixup Geert Uytterhoeven (1): ASoC: rsnd: Calculate DALIGN inversion at run-time Guido Roncarolo (2): ASoC: SOF: imx: Describe SAI parameters to be sent to DSP ASoC: SOF: imx: Read SAI parameters and send them to DSP Jack Yu (2): ASoC: rt715: add RT715 codec driver ASoC: rt1015: add rt1015 amplifier driver Jaroslav Kysela (4): ASoC: intel/skl/hda - export number of digital microphones via control components ASoC: Intel - use control components to describe card config ASoC: Intel - do not describe I/O configuration in the long card name ASoC: topology: fix soc_tplg_fe_link_create() - link->dobj initialization order Jeff Chang (1): ASoC: Add MediaTek MT6660 Speaker Amp Driver Jerome Brunet (5): ASoC: hdmi-codec: re-introduce mutex locking again ASoC: meson: axg-fifo: add fifo depth to the bindings documentation ASoC: meson: axg-fifo: fix fifo threshold setup ASoC: meson: axg-fifo: improve depth handling ASoC: meson: axg-fifo: relax period size constraints Jordy Ubink (1): ASoC: Intel: bytcr_rt5651: Remove unnecessary string buffers and snprintf calls Julia Lawall (2): ASoC: qdsp6: q6asm-dai: constify copied structure ASoC: SOF: imx8: use resource_size Kai Vehmanen (7): ASoC: SOF: Intel: make common HDMI driver default ASoC: Intel: boards: make common HDMI driver the default for SOF ASoC: hdac_hdmi: Drop support for Icelake ASoC: SOF: Intel: add codec_mask module parameter ASoC: SOF: Intel: drop HDA codec upon probe failure ASoC: Intel: boards: fix incorrect HDMI Kconfig dependency ASoC: SOF: fix PCM playback through ALSA OSS emulation Karol Trzcinski (2): ASoC: SOF: define struct with compiler name and version ASoC: SOF: log compiler name and version information Kuninori Morimoto (66): ASoC: soc-core: remove dai_link_list ASoC: soc-core: remove snd_soc_disconnect_sync() ASoC: soc-core: remove snd_soc_get_dai_substream() ASoC: soc-core: move snd_soc_get_pcm_runtime() ASoC: soc-core: find rtd via dai_link pointer at snd_soc_get_pcm_runtime() ASoC: soc-core: move snd_soc_find_dai_link() ASoC: soc-core: rename snd_soc_add_dai_link() to snd_soc_add_pcm_runtime() ASoC: soc-core: rename snd_soc_remove_dai_link() to snd_soc_remove_pcm_runtime() ASoC: soc-core: move soc_link_dai_pcm_new() ASoC: soc-core: rename soc_link_dai_pcm_new() to soc_dai_pcm_new() ASoC: soc-core: move soc_link_init() ASoC: soc-core: add missing return value check for soc_link_init() ASoC: soc-core: rename soc_link_init() to soc_init_pcm_runtime() ASoC: soc-core: soc_set_name_prefix(): tidyup loop condition ASoC: soc-core: soc_set_name_prefix(): get component device_node at out of loop ASoC: soc-core: merge soc_set_name_prefix() and soc_set_of_name_prefix() ASoC: soc-core: tidyup for CONFIG_DMI ASoC: soc-core: tidyup for CONFIG_DEBUG_FS ASoC: soc-core: support snd_soc_dai_link_component for codec_conf ASoC: fsl: imx-audmix: use snd_soc_dai_link_component for codec_conf ASoC: intel: kbl_da7219_max98927: use snd_soc_dai_link_component for codec_conf ASoC: intel: kbl_rt5663_max98927: use snd_soc_dai_link_component for codec_conf ASoC: intel: kbl_rt5663_rt5514_max98927: use snd_soc_dai_link_component for codec_conf ASoC: intel: skl_nau88l25_ssm4567: use snd_soc_dai_link_component for codec_conf ASoC: mediatek: mt8173-rt5650-rt5514: use snd_soc_dai_link_component for codec_conf ASoC: mediatek: mt8173-rt5650-rt5676: use snd_soc_dai_link_component for codec_conf ASoC: mediatek: mt8183-da7219-max98357: use snd_soc_dai_link_component for codec_conf ASoC: samsung: bells: use snd_soc_dai_link_component for codec_conf ASoC: samsung: lowland: use snd_soc_dai_link_component for codec_conf ASoC: samsung: neo1973_wm8753: use snd_soc_dai_link_component for codec_conf ASoC: samsung: speyside: use snd_soc_dai_link_component for codec_conf ASoC: ti: rx51: use snd_soc_dai_link_component for codec_conf ASoC: soc-core: remove legacy style of codec_conf ASoC: soc-core: remove snd_soc_rtdcom_list ASoC: soc-core: rename snd_soc_rtdcom_add() to snd_soc_rtd_add_component() ASoC: soc-core: care .ignore_suspend for Component suspend ASoC: soc-core: remove duplicate pinctrl operation when suspend ASoC: soc-core: do pinctrl_pm_select_xxx() as component ASoC: soc-core: add snd_soc_close_delayed_work() ASoC: soc-dapm: add snd_soc_dapm_stream_stop() ASoC: soc-pcm/soc-compress: use snd_soc_dapm_stream_stop() for SND_SOC_DAPM_STREAM_STOP ASoC: rt715: use dev_to_sdw_dev() instead of to_sdw_slave_device() ASoC: bcm: cygnus-ssp: move .suspend/.resume to component ASoC: atmel: atmel_ssc_dai: move .suspend/.resume to component ASoC: cirrus: ep93xx-i2s: move .suspend/.resume to component ASoC: jz4740: jz4740-i2s: move .suspend/.resume to component ASoC: mediatek: move .suspend/.resume to component ASoC: samsung: s3c24xx-i2s: move .suspend/.resume to component ASoC: samsung: spdif: move .suspend/.resume to component ASoC: sti: sti_uniperif: move .suspend/.resume to component ASoC: ti: omap-mcpdm: move .suspend/.resume to component ASoC: uniphier: move .suspend/.resume to component ASoC: dwc: dwc-i2s: move .suspend/.resume to component ASoC: samsung: i2s: move .suspend/.resume to component ASoC: ux500: ux500_msp_dai: remove unused DAI .suspend/.resume ASoC: pxa: pxa-ssp: move .suspend/.resume to component ASoC: pxa: pxa2xx-i2s: move .suspend/.resume to component ASoC: soc-core: remove DAI suspend/resume ASoC: soc-core: remove bus_control ASoC: soc-pcm: add soc_rtd_startup() ASoC: soc-pcm: add soc_rtd_shutdown() ASoC: soc-pcm: add soc_rtd_prepare() ASoC: soc-pcm: add soc_rtd_hw_params() ASoC: soc-pcm: add soc_rtd_hw_free() ASoC: soc-pcm: add soc_rtd_trigger() ASoC: soc-core: remove null_snd_soc_ops Marek Szyprowski (3): ASoC: max98090: fix incorrect helper in max98090_dapm_put_enum_double() ASoC: max98090: fix incorrect helper in max98090_dapm_put_enum_double() ASoC: max98090: fix lockdep warning Marek Vasut (3): regulator: core: Add regulator_is_equal() helper ASoC: sgtl5000: Fix VDDA and VDDIO comparison ASoC: sgtl5000: add multi endpoint support Mark Brown (11): Merge branch 'for-5.5' of https://git.kernel.org/.../broonie/sound into asoc-5.6 ASoC: max98090: Remove empty suspend function Merge branch 'for-5.5' of https://git.kernel.org/.../broonie/sound into asoc-5.6 Merge tag 'sdw_interfaces_5.6' of git://git.kernel.org/.../vkoul/soundwire into asoc-5.6 Merge branch 'for-5.5' of https://git.kernel.org/.../broonie/sound into asoc-5.6 ASoC: max98090: Drop incorrectly applied duplicate commit Merge tag 'regulator-eq' of https://git.kernel.org/.../broonie/regulator into asoc-5.6 Merge branch 'topic/equal' of https://git.kernel.org/.../broonie/regulator into asoc-5.6 Merge tag 'asoc-fix-v5.5-rc6' into asoc-5.6 Merge branch 'asoc-5.5' into asoc-linus Merge branch 'asoc-5.6' into asoc-next Matthias Brugger (1): ASoC: dt-bindings: rt5645: add suppliers Michael Walle (1): ASoC: fsl_sai: add IRQF_SHARED Nariman Etemadi (1): ASoC: Intel: bytcr_rt5640: Remove unnecessary string buffers and snprintf calls Nikita Yushchenko (2): ASoC: tlv320aic31xx: Add HP output driver pop reduction controls ASoC: tlv320aic31xx: Add Volume Soft Stepping control Olivier Moysan (1): ASoC: cs42l51: add dac mux widget in codec routes Pan Xiuli (1): ASoC: Intel: broadwell: change cpu_dai and platform components for SOF Paul Burton (1): ASoC: txx9: Remove unused rtd variable Paul Cercueil (2): dt-bindings: sound: Convert jz47*-codec doc to YAML ASoC: codecs: Add jz4770-codec driver Peter Ujfalusi (1): ASoC: ti: davinci-mcasp: Improve the sysclk selection Pierre-Louis Bossart (48): ASoC: SOF: Intel: byt: fixup topology filename for BYT-CR soundwire: sdw_slave: add probe_complete structure and new fields soundwire: sdw_slave: add enumeration_complete structure soundwire: sdw_slave: add initialization_complete definition soundwire: sdw_slave: track unattach_request to handle all init sequences soundwire: intel: update interfaces between ASoC and SoundWire soundwire: intel: add mutex for shared SHIM register access soundwire: intel: add clock stop quirks ASoC: Intel: cml_rt1011_rt5682: fix codec_conf by removing legacy style ASoC: SOF: Intel: add module namespace for legacy IPC ASoC: SOF: Intel: add namespaces for BAYTRAIL and MERRIFIELD ASoC: SOF: Intel: add namespace for BROADWELL ASoC: SOF: remove references to Haswell ASoC: SOF: Intel: add namespace for HDA_COMMON ASoC: SOF: Intel: hda: add namespace for hda-codec functionality ASoC: SOF: move arch_ops under ops ASoC: SOF: Intel: add namespace for XTENSA ASoC: Intel: boards: hda_dsp_common: use NULL pointer assignment, not 0 ASoC: soc-topology: fix endianness issues ASoC: SOF: pci: change the default firmware path when the community key is used ASoC: SOF: loader: add dynamic debug trace ASoC: Intel: bdw-rt5677: fix Kconfig dependencies ASoC: Intel: bdw-rt5677: change cpu_dai and platform components for SOF ASoC: Intel: bdw-rt5650: change cpu_dai and platform components for SOF ASoC: soc-acpi: add _ADR-based link descriptors ASoC: Intel: common: soc-acpi: declare new tables for SoundWire ASoC: Intel: common: add match tables for TGL w/ SoundWire ASoC: SOF: Intel: reference SoundWire machine lists ASoC: rt715: remove warnings ASoC: SOF: Intel: hda-dai: fix compilation warning in pcm_prepare ASoC: Intel: bxt_da7219_max98357a: rename shadowed variable ASoC: Intel: bxt_rt298: rename shadowed variable ASoC: Intel: glk_rt5682_max98357a: rename shadowed variable ASoC: Intel: glk_rt5682_max98357a: removed unused variables ASoC: Intel: kbl_da7219_max98357a: rename shadowed variable ASoC: Intel: kbl_da7219_max98927: test return value on route add ASoC: Intel: kbl_da7219_max98927: rename shadowed variable ASoC: Intel: kbl_da7219_max98927: remove unnecessary initialization ASoC: Intel: kbl_rt5660: rename shadowed variable ASoC: Intel: kbl_rt5663_max98927: rename shadowed variable ASoC: Intel: kbl_rt5663_rt5514_max98927: rename shadowed variable ASOC: Intel: kbl_rt5663_rt5514_max98927: remove useless initialization ASoC: Intel: skl_nau88l25_max98357a: rename shadowed variable ASoC: Intel: skl_nau88l25_ssm4567: rename shadowed variable ASoC: Intel: skl_rt286: rename shadowed variable ASoC: Intel: bytcht_es8316: removed unused variable ASoC: Intel: bytcr_rt5640: remove unused variable ASoC: Intel: bytcr_rt5651: remove unused variable Rander Wang (3): soundwire: intel: update stream callbacks for hwparams/free stream operations soundwire: intel: add prototype for WAKEEN interrupt processing ASoC: Intel: common: add match tables for CNL/CFL/CML w/ SoundWire Randy Dunlap (1): ASoC: fix soc-core.c kernel-doc warning Ranjani Sridharan (9): ASoC: SOF: topology: remove snd_sof_init_topology() ASoC: SOF: core: modify the signature for snd_sof_create_page_table ASoC: SOF: core: move check for runtime callbacks to core ASoC: SOF: Introduce default_fw_filename member in sof_dev_desc ASoC: SOF: partition audio-related parts from SOF core ASoC: SOF: intel: hda: Modify signature for hda_codec_probe_bus() ASoC: SOF: remove nocodec_fw_filename ASoC: SOF: nocodec: Amend arguments for sof_nocodec_setup() ASoC: SOF: Introduce state machine for FW boot Ravulapati Vishnu vardhan rao (8): ASoC: amd: Create multiple I2S platform device endpoint ASoC: amd: Refactoring of DAI from DMA driver ASoC: amd: Enabling I2S instance in DMA and DAI ASoC: amd: add ACP3x TDM mode support ASoC: amd: Handle ACP3x I2S-SP Interrupts. ASoC: amd: Added ACP3x system resume and runtime pm ASoC: amd MMAP_INTERLEAVED Support ASoC: amd: Additional DAI for I2S SP instance. Sam McNally (1): ASoC: Intel: sof_rt5682: Ignore the speaker amp when there isn't one. Sameer Pujar (1): ASoC: soc-pcm: crash in snd_soc_dapm_new_dai Sathyanarayana Nujella (5): ASoC: intel: sof_rt5682: Add quirk for number of HDMI DAI's ASoC: intel: sof_rt5682: Add support for tgl-max98357a-rt5682 ASoC: Intel: common: Add mach table for tgl-max98357a-rt5682 ASoC: SOF: Intel: hda: Add iDisp4 DAI ASoC: hdac_hda: Update hdac hda dai table to include intel-hdmi-hifi4 Seppo Ingalsuo (1): ASoC: SOF: Add asynchronous sample rate converter topology support Shengjiu Wang (3): ASoC: dt-bindings: fsl_asrc: add compatible string for imx8qm & imx8qxp ASoC: fsl_asrc: Add support for imx8qm & imx8qxp ASoC: soc-generic-dmaengine-pcm: Fix error handling Shuming Fan (4): ASoC: rt711: add rt711 codec driver ASoC: rt700: add rt700 codec driver ASoC: rt1308-sdw: add rt1308 SdW amplifier driver ASoC: rt1011: set the different setting for QFN/WLCSP package Slawomir Blauciak (1): ASoC: SOF: ipc: channel map structures Srinivas Kandagatla (10): ASoC: dt-bindings: add dt bindings for WCD9340/WCD9341 audio codec ASoC: wcd934x: add support to wcd9340/wcd9341 codec ASoC: wcd934x: add basic controls ASoC: wcd934x: add playback dapm widgets ASoC: wcd934x: add capture dapm widgets ASoC: wcd934x: add audio routings ASoC: qcom: dt-bindings: Add compatible for DB845c and Lenovo Yoga ASoC: qcom: sdm845: add support to DB845c and Lenovo Yoga dt-bindings: ASoC: Add WSA881x bindings ASoC: codecs: add wsa881x amplifier support Stephan Gerhold (2): ASoC: msm8916-wcd-analog: Simplify MIC BIAS Internal ASoC: msm8916-wcd-analog: Add MIC BIAS Internal3 Stephen Rothwell (1): regulator fix for "regulator: core: Add regulator_is_equal() helper" Takashi Iwai (47): ASoC: amd: Use managed buffer allocation ASoC: amd: Drop superfluous ioctl PCM ops ASoC: atmel: Drop superfluous ioctl PCM ops ASoC: au1x: Drop superfluous ioctl PCM ops ASoC: bcm: Drop superfluous ioctl PCM ops ASoC: dwc: Drop superfluous ioctl PCM ops ASoC: fsl: Drop superfluous ioctl PCM ops ASoC: intel: Drop superfluous ioctl PCM ops ASoC: kirkwood: Drop superfluous ioctl PCM ops ASoC: mediatek: Drop superfluous ioctl PCM ops ASoC: meson: Drop superfluous ioctl PCM ops ASoC: pxa: Drop superfluous ioctl PCM ops ASoC: qcom: Drop superfluous ioctl PCM ops ASoC: samsung: Drop superfluous ioctl PCM ops ASoC: generic-dmaengine: Drop superfluous ioctl PCM ops ASoC: SOF: Drop superfluous ioctl PCM ops ASoC: sprd: Drop superfluous ioctl PCM ops ASoC: txx9: Drop superfluous ioctl PCM ops ASoC: xilinx: Drop superfluous ioctl PCM ops ASoC: xtensa: Drop superfluous ioctl PCM ops ASoC: utils: Drop superfluous ioctl PCM ops ASoC: au1x: Use managed buffer allocation ASoC: dwc: Use managed buffer allocation ASoC: meson: Use managed buffer allocation ASoC: dma-sh7760: Use managed buffer allocation ASoC: rcar: Use managed buffer allocation ASoC: generic-dmaengine-pcm: Use managed buffer allocation ASoC: stm32: Use managed buffer allocation ASoC: txx9: Use managed buffer allocation ASoC: xilinx: Use managed buffer allocation ASoC: xtensa: Use managed buffer allocation ASoC: cros_ec_codec: Use managed buffer allocation ASoC: rt5514-spi: Use managed buffer allocation ASoC: rt5677-spi: Use managed buffer allocation ASoC: intel: atom: Use managed buffer allocation ASoC: intel: baytrail: Use managed buffer allocation ASoC: intel: haswell: Use managed buffer allocation ASoC: intel: skylake: Use managed buffer allocation ASoC: fsi: Use managed buffer allocation ASoC: siu_pcm: Use managed buffer allocation ASoC: uniphier: Use managed buffer allocation ASoC: sh: Drop superfluous ioctl PCM ops ASoC: uniphier: Drop superfluous ioctl PCM ops ASoC: Drop snd_soc_pcm_lib_ioctl() ASoC: mediatek: Use managed buffer allocation ASoC: SOF: Use managed buffer allocation ASoC: intel: skylake: Remove superfluous bus ops Tzung-Bi Shih (4): ASoC: max98090: save and restore SHDN when changing sensitive registers ASoC: max98090: revert "ASoC: max98090: fix lockdep warning" ASoC: dapm: add snd_soc_dapm_put_enum_double_locked ASoC: max98090: fix deadlock in max98090_dapm_put_enum_double() Wei Yongjun (4): ASoC: amd: acp3x: Fix return value check in acp3x_dai_probe() ASoC: rt700: fix return value check in rt700_sdw_probe() ASoC: rt711: fix return value check in rt711_sdw_probe() ASoC: rt715: fix return value check in rt715_sdw_probe() Yong Zhi (1): ASoC: Intel: Add machine driver for da7219_max98373 YueHaibing (4): ASoC: Intel: kbl_da7219_max98357a: remove unused variable 'constraints_16000' and 'ch_mono' ASoC: rt711: remove unused including <linux/version.h> ASoC: rt700: remove unused including <linux/version.h> ASoC: rt715: remove unused including <linux/version.h> .../devicetree/bindings/sound/amlogic,axg-fifo.txt | 4 + .../devicetree/bindings/sound/fsl,asrc.txt | 12 +- Documentation/devicetree/bindings/sound/gtm601.txt | 10 +- .../devicetree/bindings/sound/ingenic,codec.yaml | 55 + .../bindings/sound/ingenic,jz4725b-codec.txt | 20 - .../bindings/sound/ingenic,jz4740-codec.txt | 20 - .../devicetree/bindings/sound/qcom,sdm845.txt | 5 +- .../devicetree/bindings/sound/qcom,wcd934x.yaml | 175 + .../devicetree/bindings/sound/qcom,wsa881x.yaml | 68 + Documentation/devicetree/bindings/sound/rt1015.txt | 17 + Documentation/devicetree/bindings/sound/rt5645.txt | 4 + drivers/regulator/helpers.c | 14 + drivers/soundwire/intel.c | 20 +- drivers/soundwire/intel.h | 13 +- drivers/soundwire/intel_init.c | 32 +- include/linux/regulator/consumer.h | 7 + include/linux/soundwire/sdw.h | 19 + include/linux/soundwire/sdw_intel.h | 156 +- include/sound/soc-acpi-intel-match.h | 6 + include/sound/soc-acpi.h | 21 + include/sound/soc-dai.h | 3 - include/sound/soc-dapm.h | 3 + include/sound/soc.h | 52 +- include/sound/sof.h | 9 +- include/sound/sof/channel_map.h | 61 + include/sound/sof/dai-imx.h | 20 + include/sound/sof/dai.h | 1 + include/sound/sof/info.h | 15 + include/sound/sof/topology.h | 27 + include/uapi/sound/sof/abi.h | 2 +- include/uapi/sound/sof/tokens.h | 9 +- sound/soc/amd/acp-pcm-dma.c | 59 +- sound/soc/amd/raven/Makefile | 2 + sound/soc/amd/raven/acp3x-i2s.c | 358 ++ sound/soc/amd/raven/acp3x-pcm-dma.c | 679 +-- sound/soc/amd/raven/acp3x.h | 115 +- sound/soc/amd/raven/pci-acp3x.c | 264 +- sound/soc/atmel/Kconfig | 2 + sound/soc/atmel/atmel-pcm-pdc.c | 1 - sound/soc/atmel/atmel_ssc_dai.c | 18 +- sound/soc/au1x/ac97c.c | 1 - sound/soc/au1x/dbdma2.c | 15 +- sound/soc/au1x/dma.c | 22 +- sound/soc/au1x/psc-ac97.c | 1 - sound/soc/bcm/cygnus-pcm.c | 1 - sound/soc/bcm/cygnus-ssp.c | 39 +- sound/soc/cirrus/ep93xx-ac97.c | 1 - sound/soc/cirrus/ep93xx-i2s.c | 16 +- sound/soc/codecs/Kconfig | 82 + sound/soc/codecs/Makefile | 18 + sound/soc/codecs/cros_ec_codec.c | 8 +- sound/soc/codecs/cs42l51.c | 16 +- sound/soc/codecs/cs47l15.c | 21 +- sound/soc/codecs/cs47l35.c | 18 +- sound/soc/codecs/cs47l85.c | 20 +- sound/soc/codecs/cs47l90.c | 20 +- sound/soc/codecs/cs47l92.c | 76 +- sound/soc/codecs/gtm601.c | 32 +- sound/soc/codecs/hdac_hda.c | 16 + sound/soc/codecs/hdac_hda.h | 3 +- sound/soc/codecs/hdac_hdmi.c | 63 +- sound/soc/codecs/hdmi-codec.c | 32 +- sound/soc/codecs/jz4770.c | 948 ++++ sound/soc/codecs/madera.c | 178 +- sound/soc/codecs/madera.h | 6 +- sound/soc/codecs/max98090.c | 440 +- sound/soc/codecs/max98090.h | 3 +- sound/soc/codecs/msm8916-wcd-analog.c | 116 +- sound/soc/codecs/mt6660.c | 509 ++ sound/soc/codecs/mt6660.h | 77 + sound/soc/codecs/rt1011.c | 17 +- sound/soc/codecs/rt1011.h | 1 + sound/soc/codecs/rt1015.c | 993 ++++ sound/soc/codecs/rt1015.h | 375 ++ sound/soc/codecs/rt1308-sdw.c | 736 +++ sound/soc/codecs/rt1308-sdw.h | 169 + sound/soc/codecs/rt5514-spi.c | 10 +- sound/soc/codecs/rt5677-spi.c | 10 +- sound/soc/codecs/rt700-sdw.c | 551 +++ sound/soc/codecs/rt700-sdw.h | 335 ++ sound/soc/codecs/rt700.c | 1237 +++++ sound/soc/codecs/rt700.h | 174 + sound/soc/codecs/rt711-sdw.c | 552 +++ sound/soc/codecs/rt711-sdw.h | 281 ++ sound/soc/codecs/rt711.c | 1292 +++++ sound/soc/codecs/rt711.h | 227 + sound/soc/codecs/rt715-sdw.c | 613 +++ sound/soc/codecs/rt715-sdw.h | 337 ++ sound/soc/codecs/rt715.c | 872 ++++ sound/soc/codecs/rt715.h | 221 + sound/soc/codecs/sgtl5000.c | 11 +- sound/soc/codecs/tlv320aic31xx.c | 40 +- sound/soc/codecs/tlv320aic31xx.h | 3 - sound/soc/codecs/wcd934x.c | 5084 ++++++++++++++++++++ sound/soc/codecs/wm_adsp.c | 98 +- sound/soc/codecs/wsa881x.c | 1185 +++++ sound/soc/dwc/dwc-i2s.c | 32 +- sound/soc/dwc/dwc-pcm.c | 25 +- sound/soc/fsl/fsl-asoc-card.c | 2 +- sound/soc/fsl/fsl_asrc.c | 125 +- sound/soc/fsl/fsl_asrc.h | 64 +- sound/soc/fsl/fsl_asrc_dma.c | 42 +- sound/soc/fsl/fsl_dma.c | 1 - sound/soc/fsl/fsl_sai.c | 3 +- sound/soc/fsl/fsl_ssi.c | 1 - sound/soc/fsl/imx-audmix.c | 2 +- sound/soc/fsl/imx-pcm-fiq.c | 1 - sound/soc/fsl/imx-ssi.c | 1 - sound/soc/fsl/mpc5200_dma.c | 1 - sound/soc/fsl/mpc5200_psc_ac97.c | 2 - sound/soc/intel/atom/sst-mfld-platform-pcm.c | 26 +- sound/soc/intel/baytrail/sst-baytrail-pcm.c | 20 +- sound/soc/intel/boards/Kconfig | 51 + sound/soc/intel/boards/Makefile | 5 + sound/soc/intel/boards/bdw-rt5650.c | 327 ++ sound/soc/intel/boards/bdw-rt5677.c | 10 +- sound/soc/intel/boards/broadwell.c | 10 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 10 +- sound/soc/intel/boards/bxt_rt298.c | 8 +- sound/soc/intel/boards/bytcht_es8316.c | 21 +- sound/soc/intel/boards/bytcr_rt5640.c | 112 +- sound/soc/intel/boards/bytcr_rt5651.c | 72 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 26 +- sound/soc/intel/boards/cml_rt1011_rt5682.c | 8 +- sound/soc/intel/boards/glk_rt5682_max98357a.c | 18 +- sound/soc/intel/boards/hda_dsp_common.c | 2 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 23 +- sound/soc/intel/boards/kbl_da7219_max98927.c | 27 +- sound/soc/intel/boards/kbl_rt5660.c | 4 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 14 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 14 +- sound/soc/intel/boards/skl_hda_dsp_common.c | 21 +- sound/soc/intel/boards/skl_hda_dsp_generic.c | 8 + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 10 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 14 +- sound/soc/intel/boards/skl_rt286.c | 10 +- sound/soc/intel/boards/sof_da7219_max98373.c | 371 ++ sound/soc/intel/boards/sof_rt5682.c | 43 +- sound/soc/intel/common/soc-acpi-intel-cfl-match.c | 5 + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 89 + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 5 + .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 7 + sound/soc/intel/common/soc-acpi-intel-icl-match.c | 98 + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 7 + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 64 +- sound/soc/intel/haswell/sst-haswell-pcm.c | 18 +- sound/soc/intel/skylake/skl-pcm.c | 27 +- sound/soc/intel/skylake/skl.c | 7 +- sound/soc/jz4740/jz4740-i2s.c | 18 +- sound/soc/kirkwood/kirkwood-dma.c | 1 - sound/soc/mediatek/common/mtk-afe-fe-dai.c | 377 +- sound/soc/mediatek/common/mtk-afe-fe-dai.h | 20 +- .../soc/mediatek/common/mtk-afe-platform-driver.c | 13 +- .../soc/mediatek/common/mtk-afe-platform-driver.h | 2 - sound/soc/mediatek/common/mtk-base-afe.h | 28 +- sound/soc/mediatek/common/mtk-btcvsd.c | 1 - sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 14 +- sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 2 - sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 10 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 +- sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 2 - sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 2 +- sound/soc/meson/axg-fifo.c | 61 +- sound/soc/meson/axg-fifo.h | 9 +- sound/soc/meson/axg-frddr.c | 36 +- sound/soc/meson/axg-toddr.c | 24 +- sound/soc/pxa/mioa701_wm9713.c | 2 +- sound/soc/pxa/mmp-pcm.c | 1 - sound/soc/pxa/pxa-ssp.c | 17 +- sound/soc/pxa/pxa2xx-ac97.c | 4 - sound/soc/pxa/pxa2xx-i2s.c | 13 +- sound/soc/pxa/pxa2xx-pcm.c | 1 - sound/soc/qcom/lpass-platform.c | 1 - sound/soc/qcom/qdsp6/q6asm-dai.c | 3 +- sound/soc/qcom/sdm845.c | 86 +- sound/soc/samsung/bells.c | 14 +- sound/soc/samsung/i2s.c | 13 +- sound/soc/samsung/idma.c | 1 - sound/soc/samsung/littlemill.c | 10 +- sound/soc/samsung/lowland.c | 2 +- sound/soc/samsung/neo1973_wm8753.c | 2 +- sound/soc/samsung/s3c24xx-i2s.c | 8 +- sound/soc/samsung/snow.c | 2 +- sound/soc/samsung/spdif.c | 18 +- sound/soc/samsung/speyside.c | 6 +- sound/soc/samsung/tm2_wm5110.c | 6 +- sound/soc/samsung/tobermory.c | 6 +- sound/soc/sh/dma-sh7760.c | 15 +- sound/soc/sh/fsi.c | 19 +- sound/soc/sh/hac.c | 1 - sound/soc/sh/rcar/core.c | 57 +- sound/soc/sh/siu_pcm.c | 40 +- sound/soc/soc-component.c | 33 +- sound/soc/soc-compress.c | 143 +- sound/soc/soc-core.c | 641 +-- sound/soc/soc-dai.c | 12 - sound/soc/soc-dapm.c | 77 +- sound/soc/soc-generic-dmaengine-pcm.c | 30 +- sound/soc/soc-pcm.c | 237 +- sound/soc/soc-topology.c | 95 +- sound/soc/soc-utils.c | 1 - sound/soc/sof/Kconfig | 2 +- sound/soc/sof/Makefile | 2 +- sound/soc/sof/control.c | 55 +- sound/soc/sof/core.c | 288 +- sound/soc/sof/imx/imx8.c | 3 +- sound/soc/sof/intel/Kconfig | 1 + sound/soc/sof/intel/apl.c | 14 +- sound/soc/sof/intel/bdw.c | 41 +- sound/soc/sof/intel/byt.c | 110 +- sound/soc/sof/intel/cnl.c | 26 +- sound/soc/sof/intel/hda-codec.c | 38 +- sound/soc/sof/intel/hda-ctrl.c | 13 + sound/soc/sof/intel/hda-dai.c | 8 +- sound/soc/sof/intel/hda-ipc.c | 23 +- sound/soc/sof/intel/hda-loader.c | 1 - sound/soc/sof/intel/hda-pcm.c | 4 +- sound/soc/sof/intel/hda-stream.c | 21 +- sound/soc/sof/intel/hda.c | 304 +- sound/soc/sof/intel/hda.h | 21 +- sound/soc/sof/intel/intel-ipc.c | 8 +- sound/soc/sof/intel/shim.h | 6 +- sound/soc/sof/ipc.c | 33 +- sound/soc/sof/loader.c | 61 +- sound/soc/sof/nocodec.c | 12 - sound/soc/sof/ops.h | 34 + sound/soc/sof/pcm.c | 225 +- sound/soc/sof/pm.c | 240 +- sound/soc/sof/sof-acpi-dev.c | 63 +- sound/soc/sof/sof-audio.c | 445 ++ sound/soc/sof/sof-audio.h | 211 + sound/soc/sof/sof-of-dev.c | 24 +- sound/soc/sof/sof-pci-dev.c | 108 +- sound/soc/sof/sof-priv.h | 214 +- sound/soc/sof/topology.c | 521 +- sound/soc/sof/trace.c | 4 +- sound/soc/sof/utils.c | 60 + sound/soc/sof/xtensa/core.c | 2 +- sound/soc/sprd/sprd-pcm-dma.c | 1 - sound/soc/sti/sti_uniperif.c | 12 +- sound/soc/stm/stm32_adfsdm.c | 29 +- sound/soc/tegra/tegra20_ac97.c | 1 - sound/soc/tegra/tegra_wm8903.c | 2 +- sound/soc/ti/davinci-mcasp.c | 35 +- sound/soc/ti/davinci-mcasp.h | 4 + sound/soc/ti/omap-mcpdm.c | 16 +- sound/soc/ti/rx51.c | 12 +- sound/soc/txx9/txx9aclc-ac97.c | 1 - sound/soc/txx9/txx9aclc.c | 16 +- sound/soc/uniphier/aio-cpu.c | 31 +- sound/soc/uniphier/aio-dma.c | 31 +- sound/soc/uniphier/aio-ld11.c | 18 - sound/soc/uniphier/aio-pxs2.c | 14 - sound/soc/uniphier/aio.h | 2 - sound/soc/ux500/ux500_msp_dai.c | 2 - sound/soc/xilinx/xlnx_formatter_pcm.c | 14 +- sound/soc/xtensa/xtfpga-i2s.c | 10 +- 258 files changed, 24107 insertions(+), 4145 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/ingenic,codec.yaml delete mode 100644 Documentation/devicetree/bindings/sound/ingenic,jz4725b-codec.txt delete mode 100644 Documentation/devicetree/bindings/sound/ingenic,jz4740-codec.txt create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd934x.yaml create mode 100644 Documentation/devicetree/bindings/sound/qcom,wsa881x.yaml create mode 100644 Documentation/devicetree/bindings/sound/rt1015.txt create mode 100644 include/sound/sof/channel_map.h create mode 100644 sound/soc/amd/raven/acp3x-i2s.c create mode 100644 sound/soc/codecs/jz4770.c create mode 100644 sound/soc/codecs/mt6660.c create mode 100644 sound/soc/codecs/mt6660.h create mode 100644 sound/soc/codecs/rt1015.c create mode 100644 sound/soc/codecs/rt1015.h create mode 100644 sound/soc/codecs/rt1308-sdw.c create mode 100644 sound/soc/codecs/rt1308-sdw.h create mode 100644 sound/soc/codecs/rt700-sdw.c create mode 100644 sound/soc/codecs/rt700-sdw.h create mode 100644 sound/soc/codecs/rt700.c create mode 100644 sound/soc/codecs/rt700.h create mode 100644 sound/soc/codecs/rt711-sdw.c create mode 100644 sound/soc/codecs/rt711-sdw.h create mode 100644 sound/soc/codecs/rt711.c create mode 100644 sound/soc/codecs/rt711.h create mode 100644 sound/soc/codecs/rt715-sdw.c create mode 100644 sound/soc/codecs/rt715-sdw.h create mode 100644 sound/soc/codecs/rt715.c create mode 100644 sound/soc/codecs/rt715.h create mode 100644 sound/soc/codecs/wcd934x.c create mode 100644 sound/soc/codecs/wsa881x.c create mode 100644 sound/soc/intel/boards/bdw-rt5650.c create mode 100644 sound/soc/intel/boards/sof_da7219_max98373.c create mode 100644 sound/soc/sof/sof-audio.c create mode 100644 sound/soc/sof/sof-audio.h

2 1