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

[PATCH 0/3] Properly fix headphone noise on the XPS 13 and other ALC256 devices
by Thomas Hebb 31 Mar '20

31 Mar '20

The root cause of various pervasive audio problems on the XPS 13 9350/9360, mostly relating to the headphone jack, turns out to be an undocumented feature of the ALC256 and similar codecs that routes audio along paths not exposed in the HDA node graph. The best we've had so far to configure this feature is magic numbers provided by Realtek, none of which have fully fixed all issues. This series documents the "PC Beep Hidden Register", which controls the feature and which I've reverse engineered using black box techniques, and uses my findings to hopefully fix the headphone issues on my XPS 13 once and for all. Thomas Hebb (3): ALSA: doc: Document PC Beep Hidden Register on Realtek ALC256 ALSA: hda/realtek - Set principled PC Beep configuration for ALC256 ALSA: hda/realtek - Remove now-unnecessary XPS 13 headphone noise fixups Documentation/sound/hd-audio/index.rst | 1 + Documentation/sound/hd-audio/models.rst | 2 - .../sound/hd-audio/realtek-pc-beep.rst | 129 ++++++++++++++++++ sound/pci/hda/patch_realtek.c | 49 ++----- 4 files changed, 139 insertions(+), 42 deletions(-) create mode 100644 Documentation/sound/hd-audio/realtek-pc-beep.rst -- 2.25.2

3 6

[PATCH v2 0/3] Properly fix headphone noise on the XPS 13 and other ALC256 devices
by Thomas Hebb 31 Mar '20

31 Mar '20

The root cause of various pervasive audio problems on the XPS 13 9350/9360, mostly relating to the headphone jack, turns out to be an undocumented feature of the ALC256 and similar codecs that routes audio along paths not exposed in the HDA node graph. The best we've had so far to configure this feature is magic numbers provided by Realtek, none of which have fully fixed all issues. This series documents the "PC Beep Hidden Register", which controls the feature and which I've reverse engineered using black box techniques, and uses my findings to hopefully fix the headphone issues on my XPS 13 once and for all. Changes in v2: - Change fixed value from 0x4727 to 0x5757, which should behave identically, on advice from Kailang. Thomas Hebb (3): ALSA: doc: Document PC Beep Hidden Register on Realtek ALC256 ALSA: hda/realtek - Set principled PC Beep configuration for ALC256 ALSA: hda/realtek - Remove now-unnecessary XPS 13 headphone noise fixups Documentation/sound/hd-audio/index.rst | 1 + Documentation/sound/hd-audio/models.rst | 2 - .../sound/hd-audio/realtek-pc-beep.rst | 129 ++++++++++++++++++ sound/pci/hda/patch_realtek.c | 49 ++----- 4 files changed, 139 insertions(+), 42 deletions(-) create mode 100644 Documentation/sound/hd-audio/realtek-pc-beep.rst -- 2.25.2

3 6

[PATCH 0/5] Add support for SOF on i.MX8M
by Daniel Baluta 31 Mar '20

31 Mar '20

From: Daniel Baluta <daniel.baluta(a)nxp.com> This patch series adds support for SOF on i.MX8M family. First board from this family that has a DSP is i.MX8MP. First 2 patches are trying to fix some compilation issues, the next two are adding the imx8m support and the last one adds the devicetree binding. Daniel Baluta (4): ASoC: SOF: imx: fix undefined reference issue ASoC: SOF: imx: Add i.MX8M HW support ASoC: SOF: Add i.MX8MP device descriptor dt-bindings: dsp: fsl: Add fsl,imx8mp-dsp entry YueHaibing (1): ASoC: SOF: imx8: Fix randbuild error .../devicetree/bindings/dsp/fsl,dsp.yaml | 2 + sound/soc/sof/imx/Kconfig | 32 +- sound/soc/sof/imx/Makefile | 2 + sound/soc/sof/imx/imx8m.c | 279 ++++++++++++++++++ sound/soc/sof/sof-of-dev.c | 14 + 5 files changed, 325 insertions(+), 4 deletions(-) create mode 100644 sound/soc/sof/imx/imx8m.c -- 2.17.1

4 9

PATCH: ALSA USB MIDI: Fix case when USB MIDI interface has more than one extra endpoint descriptor
by Andreas Steinmetz 31 Mar '20

31 Mar '20

The Miditech MIDIFACE 16x16 (USB ID 1290:1749) has more than one extra endpoint descriptor. The first extra descriptor is: 0x06 0x30 0x00 0x00 0x00 0x00 As the code in snd_usbmidi_get_ms_info() looks only at the first extra descriptor to find USB_DT_CS_ENDPOINT the device as such is recognized but there is neither input nor output configured. The patch iterates through the extra descriptors to find the proper one. With this patch the device is correctly configured. Signed-off-by: Andreas Steinmetz <ast(a)domdv.de> --- a/sourd/usb/midi.c 2020-03-26 17:34:40.073929497 +0100 +++ b/sound/usb/midi.c 2020-03-26 17:43:39.123252612 +0100 @@ -1839,7 +1839,8 @@ struct usb_host_endpoint *hostep; struct usb_endpoint_descriptor *ep; struct usb_ms_endpoint_descriptor *ms_ep; - int i, epidx; + int i, epidx, extralen; + unsigned char *extra; intf = umidi->iface; if (!intf) @@ -1863,12 +1864,21 @@ ep = get_ep_desc(hostep); if (!usb_endpoint_xfer_bulk(ep) && !usb_endpoint_xfer_int(ep)) continue; - ms_ep = (struct usb_ms_endpoint_descriptor *)hostep->extra; - if (hostep->extralen < 4 || + extralen = hostep->extralen; + extra = hostep->extra; +repeat: ms_ep = (struct usb_ms_endpoint_descriptor *)extra; + if (extralen < 1) + continue; + if (extralen < 4 || ms_ep->bLength < 4 || ms_ep->bDescriptorType != USB_DT_CS_ENDPOINT || - ms_ep->bDescriptorSubtype != UAC_MS_GENERAL) - continue; + ms_ep->bDescriptorSubtype != UAC_MS_GENERAL) { + if (!extra[0]) + continue; + extralen -= extra[0]; + extra += extra[0]; + goto repeat; + } if (usb_endpoint_dir_out(ep)) { if (endpoints[epidx].out_ep) { if (++epidx >= MIDI_MAX_ENDPOINTS) {

2 3

[PATCH] ASoC: snd_soc_dai_set_fmt add substream independence.
by Matt Flax 31 Mar '20

31 Mar '20

This patch is aims to start a stronger discussion on allowing both CPU and Codec dais to set formats independently based on direction. Currently it is very difficult to change stream formats because there is no way to specify it independently. A previous discussion w.r.t. a codec's stream dependent format setting required a codec's dai to be split. See here : https://mailman.alsa-project.org/pipermail/alsa-devel/2020-March/164492.html A previous discussion w.r.t. changing format based on the stream direction w.r.t. a CPU's dai showed the difficulty in setting fmt based on direection in thw hw_params function. See here : https://mailman.alsa-project.org/pipermail/alsa-devel/2020-March/165101.html It seems that it may be necessary to allow the stream direction as an input argument to snd_soc_dai_set_fmt. This patch is not complete, as there are many codecs and cpus which would require this change. However this patch is aimed as a discussion point. One example of a sound card which requires independent stream formats is an isolated sound card, such as the Audio Injector Isolated sound card. The magnetic isolation chips on the sound card require stream fomats to be different because of digital latency variations on the I2S lines. Signed-off-by: Matt Flax <flatmax(a)flatmax.org> --- include/sound/soc-dai.h | 4 ++-- sound/soc/soc-core.c | 5 +++-- sound/soc/soc-dai.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index eaaeb00e9e84..5071e006389b 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -123,7 +123,7 @@ int snd_soc_dai_set_pll(struct snd_soc_dai *dai, int snd_soc_dai_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio); /* Digital Audio interface formatting */ -int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt); +int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt, int stream); int snd_soc_dai_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width); @@ -186,7 +186,7 @@ struct snd_soc_dai_ops { * DAI format configuration * Called by soc_card drivers, normally in their hw_params. */ - int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt); + int (*set_fmt)(struct snd_soc_dai *dai, unsigned int fmt, int stream); int (*xlate_tdm_slot_mask)(unsigned int slots, unsigned int *tx_mask, unsigned int *rx_mask); int (*set_tdm_slot)(struct snd_soc_dai *dai, diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 068d809c349a..27a6f01dc2d3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1474,10 +1474,11 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct snd_soc_dai *codec_dai; unsigned int i; - int ret; + int ret, stream; for_each_rtd_codec_dai(rtd, i, codec_dai) { - ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt); + int stream = 0; + ret = snd_soc_dai_set_fmt(codec_dai, dai_fmt, stream); if (ret != 0 && ret != -ENOTSUPP) { dev_warn(codec_dai->dev, "ASoC: Failed to set DAI format: %d\n", ret); diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 51031e330179..1f8ee7875656 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -94,11 +94,11 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_bclk_ratio); * * Configures the DAI hardware format and clocking. */ -int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) +int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt, int stream) { if (dai->driver->ops->set_fmt == NULL) return -ENOTSUPP; - return dai->driver->ops->set_fmt(dai, fmt); + return dai->driver->ops->set_fmt(dai, fmt, stream); } EXPORT_SYMBOL_GPL(snd_soc_dai_set_fmt); -- 2.20.1

2 6

[PATCH 3/3] ASoC: fix regwmask
by 이경택 31 Mar '20

31 Mar '20

If regwshift is 32 and the selected architecture compiles '<<' operator for signed int literal into rotating shift, '1<<regwshift' became 1 and it makes regwmask to 0x0. The literal is set to unsigned long to get intended regwmask. Signed-off-by: Gyeongtaek Lee <gt82.lee(a)samsung.com> --- sound/soc/soc-ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 652657dc6809..55ffb34be95e 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -825,7 +825,7 @@ int snd_soc_get_xr_sx(struct snd_kcontrol *kcontrol, unsigned int regbase = mc->regbase; unsigned int regcount = mc->regcount; unsigned int regwshift = component->val_bytes * BITS_PER_BYTE; - unsigned int regwmask = (1<<regwshift)-1; + unsigned int regwmask = (1UL<<regwshift)-1; unsigned int invert = mc->invert; unsigned long mask = (1UL<<mc->nbits)-1; long min = mc->min; @@ -874,7 +874,7 @@ int snd_soc_put_xr_sx(struct snd_kcontrol *kcontrol, unsigned int regbase = mc->regbase; unsigned int regcount = mc->regcount; unsigned int regwshift = component->val_bytes * BITS_PER_BYTE; - unsigned int regwmask = (1<<regwshift)-1; + unsigned int regwmask = (1UL<<regwshift)-1; unsigned int invert = mc->invert; unsigned long mask = (1UL<<mc->nbits)-1; long max = mc->max; -- 2.21.0

2 5

[PATCH v5 0/7] ASoC: Add new module driver for new ASRC
by Shengjiu Wang 31 Mar '20

31 Mar '20

Add new module driver for new ASRC in i.MX8MN, several commits are added for new property fsl,asrc-format Shengjiu Wang (7): 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: rename asrc_priv to asrc 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 changes in v5 - Add new property fsl,asrc-format, rather than change fsl,asrc-width to fsl,asrc-formt. - code change for above change. changes in v4 - Add several commit for changing DT binding asrc-width to asrc-format - rename asrc_priv to asrc changes in v3 - add new commit "ASoC: fsl_asrc: Change asrc_width to asrc_format" - modify binding doc to yaml format - remove fsl_easrc_dma.c, make fsl_asrc_dma.c useable for easrc. changes in v2 - change i.MX815 to i.MX8MN - Add changes in Kconfig and Makefile .../devicetree/bindings/sound/fsl,asrc.txt | 5 + .../devicetree/bindings/sound/fsl,easrc.yaml | 101 + sound/soc/fsl/Kconfig | 11 + sound/soc/fsl/Makefile | 2 + sound/soc/fsl/fsl-asoc-card.c | 20 +- sound/soc/fsl/fsl_asrc.c | 303 +-- sound/soc/fsl/fsl_asrc.h | 74 +- sound/soc/fsl/fsl_asrc_common.h | 105 + sound/soc/fsl/fsl_asrc_dma.c | 54 +- sound/soc/fsl/fsl_easrc.c | 2111 +++++++++++++++++ sound/soc/fsl/fsl_easrc.h | 651 +++++ 11 files changed, 3203 insertions(+), 234 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/fsl,easrc.yaml 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 -- 2.21.0

5 20

[PATCH] Revert "ALSA: uapi: Drop asound.h inclusion from asoc.h"
by Takashi Iwai 31 Mar '20

31 Mar '20

This reverts commit 645c08f17f477915f6d900b767e789852f150054 which was reported to break the build a program using this header. The original issue was addressed in the alsa-lib side recently, so we can make the header more self-contained again. Reported-by: Dmitry V. Levin <ldv(a)altlinux.org> Fixes: 645c08f17f47 ("ALSA: uapi: Drop asound.h inclusion from asoc.h") Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/uapi/sound/asoc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h index 6048553c119d..a74ca232f1fc 100644 --- a/include/uapi/sound/asoc.h +++ b/include/uapi/sound/asoc.h @@ -17,6 +17,7 @@ #define __LINUX_UAPI_SND_ASOC_H #include <linux/types.h> +#include <sound/asound.h> /* * Maximum number of channels topology kcontrol can represent. -- 2.16.4

1 0

[PATCH 1/3] ASoC: dapm: connect virtual mux with default value
by 이경택 31 Mar '20

31 Mar '20

Since a virtual mixer has no backing registers to decide which path to connect, it will try to match with initial value 0. This is to ensure that the default mixer choice will be correctly powered up during initialization. Signed-off-by: Gyeongtaek Lee <gt82.lee(a)samsung.com> --- sound/soc/soc-dapm.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 9fb54e6fe254..fc55a0534252 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -802,7 +802,16 @@ static void dapm_set_mixer_path_status(struct snd_soc_dapm_path *p, int i, val = max - val; p->connect = !!val; } else { - p->connect = 0; + /* since a virtual mixer has no backing registers to + * decide which path to connect, it will try to match + * with initial value 0. This is to ensure + * that the default mixer choice will be + * correctly powered up during initialization. + */ + val = 0; + if (invert) + val = max - val; + p->connect = !!val; } } -- 2.21.0

3 7

[PATCH 2/3] ASoC: topology: use name_prefix for new kcontrol
by 이경택 31 Mar '20

31 Mar '20

Current topology doesn't add prefix of the component to newly created kcontrol. Signed-off-by: Gyeongtaek Lee <gt82.lee(a)samsung.com> --- sound/soc/soc-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 575da6aba807..a152409e8746 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -362,7 +362,7 @@ static int soc_tplg_add_kcontrol(struct soc_tplg *tplg, struct snd_soc_component *comp = tplg->comp; return soc_tplg_add_dcontrol(comp->card->snd_card, - comp->dev, k, NULL, comp, kcontrol); + comp->dev, k, comp->name_prefix, comp, kcontrol); } /* remove a mixer kcontrol */ -- 2.21.0

1 0

[PATCH 0/3] fixes for topology
by 이경택 31 Mar '20

31 Mar '20

Hi, I'd like to submit couple of patches which will fix few problems in corner case scenarios using topology. Any feedback will be greatly appreciated. Lee Gyeongtaek Lee (3): ASoC: dapm: connect virtual mux with default value ASoC: topology: use name_prefix for new kcontrol ASoC: fix regwmask sound/soc/soc-dapm.c | 11 ++++++++++- sound/soc/soc-ops.c | 4 ++-- sound/soc/soc-topology.c | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) base-commit: 76ccd234269bd05debdbc12c96eafe62dd9a6180 -- 2.21.0

1 2

[PATCH 2/3] ASoC: topology: use name_prefix for new kcontrol
by 이경택 31 Mar '20

31 Mar '20

Current topology doesn't add prefix of the component to newly created kcontrol. Signed-off-by: Gyeongtaek Lee <gt82.lee(a)samsung.com> --- sound/soc/soc-topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 575da6aba807..a152409e8746 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -362,7 +362,7 @@ static int soc_tplg_add_kcontrol(struct soc_tplg *tplg, struct snd_soc_component *comp = tplg->comp; return soc_tplg_add_dcontrol(comp->card->snd_card, - comp->dev, k, NULL, comp, kcontrol); + comp->dev, k, comp->name_prefix, comp, kcontrol); } /* remove a mixer kcontrol */ -- 2.21.0

1 0

[PATCH v3] ASoC: dt-bindings: simple-card: switch to yaml base Documentation
by Kuninori Morimoto 31 Mar '20

31 Mar '20

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> This patch switches from .txt base to .yaml base Document. This patch is assuming that "sound-dai" is already defined. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- v2 -> v3 - uses maxItems for many place which were already defined. - assuming that "sound-dai" is already defined - (@.*) -> (@[0-9a-f]+) .../devicetree/bindings/sound/simple-card.txt | 351 ------------- .../bindings/sound/simple-card.yaml | 487 ++++++++++++++++++ 2 files changed, 487 insertions(+), 351 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/simple-card.txt create mode 100644 Documentation/devicetree/bindings/sound/simple-card.yaml diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt deleted file mode 100644 index 79954cd6e37b..000000000000 --- a/Documentation/devicetree/bindings/sound/simple-card.txt +++ /dev/null @@ -1,351 +0,0 @@ -Simple-Card: - -Simple-Card specifies audio DAI connections of SoC <-> codec. - -Required properties: - -- compatible : "simple-audio-card" - -Optional properties: - -- simple-audio-card,name : User specified audio sound card name, one string - property. -- simple-audio-card,widgets : Please refer to widgets.txt. -- simple-audio-card,routing : A list of the connections between audio components. - Each entry is a pair of strings, the first being the - connection's sink, the second being the connection's - source. -- simple-audio-card,mclk-fs : Multiplication factor between stream rate and codec - mclk. When defined, mclk-fs property defined in - dai-link sub nodes are ignored. -- simple-audio-card,hp-det-gpio : Reference to GPIO that signals when - headphones are attached. -- simple-audio-card,mic-det-gpio : Reference to GPIO that signals when - a microphone is attached. -- simple-audio-card,aux-devs : List of phandles pointing to auxiliary devices, such - as amplifiers, to be added to the sound card. -- simple-audio-card,pin-switches : List of strings containing the widget names for - which pin switches must be created. - -Optional subnodes: - -- simple-audio-card,dai-link : Container for dai-link level - properties and the CPU and CODEC - sub-nodes. This container may be - omitted when the card has only one - DAI link. See the examples and the - section below. - -Dai-link subnode properties and subnodes: - -If dai-link subnode is omitted and the subnode properties are directly -under "sound"-node the subnode property and subnode names have to be -prefixed with "simple-audio-card,"-prefix. - -Required dai-link subnodes: - -- cpu : CPU sub-node -- codec : CODEC sub-node - -Optional dai-link subnode properties: - -- format : CPU/CODEC common audio format. - "i2s", "right_j", "left_j" , "dsp_a" - "dsp_b", "ac97", "pdm", "msb", "lsb" -- frame-master : Indicates dai-link frame master. - phandle to a cpu or codec subnode. -- bitclock-master : Indicates dai-link bit clock master. - phandle to a cpu or codec subnode. -- bitclock-inversion : bool property. Add this if the - dai-link uses bit clock inversion. -- frame-inversion : bool property. Add this if the - dai-link uses frame clock inversion. -- mclk-fs : Multiplication factor between stream - rate and codec mclk, applied only for - the dai-link. - -For backward compatibility the frame-master and bitclock-master -properties can be used as booleans in codec subnode to indicate if the -codec is the dai-link frame or bit clock master. In this case there -should be no dai-link node, the same properties should not be present -at sound-node level, and the bitclock-inversion and frame-inversion -properties should also be placed in the codec node if needed. - -Required CPU/CODEC subnodes properties: - -- sound-dai : phandle and port of CPU/CODEC - -Optional CPU/CODEC subnodes properties: - -- dai-tdm-slot-num : Please refer to tdm-slot.txt. -- dai-tdm-slot-width : Please refer to tdm-slot.txt. -- clocks / system-clock-frequency : specify subnode's clock if needed. - it can be specified via "clocks" if system has - clock node (= common clock), or "system-clock-frequency" - (if system doens't support common clock) - If a clock is specified, it is - enabled with clk_prepare_enable() - in dai startup() and disabled with - clk_disable_unprepare() in dai - shutdown(). - If a clock is specified and a - multiplication factor is given with - mclk-fs, the clock will be set to the - calculated mclk frequency when the - stream starts. -- system-clock-direction-out : specifies clock direction as 'out' on - initialization. It is useful for some aCPUs with - fixed clocks. - -------------------------------------------- -Example 1 - single DAI link: -------------------------------------------- - -sound { - compatible = "simple-audio-card"; - simple-audio-card,name = "VF610-Tower-Sound-Card"; - simple-audio-card,format = "left_j"; - simple-audio-card,bitclock-master = <&dailink0_master>; - simple-audio-card,frame-master = <&dailink0_master>; - simple-audio-card,widgets = - "Microphone", "Microphone Jack", - "Headphone", "Headphone Jack", - "Speaker", "External Speaker"; - simple-audio-card,routing = - "MIC_IN", "Microphone Jack", - "Headphone Jack", "HP_OUT", - "External Speaker", "LINE_OUT"; - - simple-audio-card,cpu { - sound-dai = <&sh_fsi2 0>; - }; - - dailink0_master: simple-audio-card,codec { - sound-dai = <&ak4648>; - clocks = <&osc>; - }; -}; - -&i2c0 { - ak4648: ak4648@12 { - #sound-dai-cells = <0>; - compatible = "asahi-kasei,ak4648"; - reg = <0x12>; - }; -}; - -sh_fsi2: sh_fsi2@ec230000 { - #sound-dai-cells = <1>; - compatible = "renesas,sh_fsi2"; - reg = <0xec230000 0x400>; - interrupt-parent = <&gic>; - interrupts = <0 146 0x4>; -}; - -------------------------------------------- -Example 2 - many DAI links: -------------------------------------------- - -sound { - compatible = "simple-audio-card"; - simple-audio-card,name = "Cubox Audio"; - - simple-audio-card,dai-link@0 { /* I2S - HDMI */ - reg = <0>; - format = "i2s"; - cpu { - sound-dai = <&audio1 0>; - }; - codec { - sound-dai = <&tda998x 0>; - }; - }; - - simple-audio-card,dai-link@1 { /* S/PDIF - HDMI */ - reg = <1>; - cpu { - sound-dai = <&audio1 1>; - }; - codec { - sound-dai = <&tda998x 1>; - }; - }; - - simple-audio-card,dai-link@2 { /* S/PDIF - S/PDIF */ - reg = <2>; - cpu { - sound-dai = <&audio1 1>; - }; - codec { - sound-dai = <&spdif_codec>; - }; - }; -}; - -------------------------------------------- -Example 3 - route audio from IMX6 SSI2 through TLV320DAC3100 codec -through TPA6130A2 amplifier to headphones: -------------------------------------------- - -&i2c0 { - codec: tlv320dac3100@18 { - compatible = "ti,tlv320dac3100"; - ... - } - - amp: tpa6130a2@60 { - compatible = "ti,tpa6130a2"; - ... - } -} - -sound { - compatible = "simple-audio-card"; - ... - simple-audio-card,widgets = - "Headphone", "Headphone Jack"; - simple-audio-card,routing = - "Headphone Jack", "HPLEFT", - "Headphone Jack", "HPRIGHT", - "LEFTIN", "HPL", - "RIGHTIN", "HPR"; - simple-audio-card,aux-devs = <&amp>; - simple-audio-card,cpu { - sound-dai = <&ssi2>; - }; - simple-audio-card,codec { - sound-dai = <&codec>; - clocks = ... - }; -}; - -------------------------------------------- -Example 4. Sampling Rate Conversion -------------------------------------------- - -sound { - compatible = "simple-audio-card"; - - simple-audio-card,name = "rsnd-ak4643"; - simple-audio-card,format = "left_j"; - simple-audio-card,bitclock-master = <&sndcodec>; - simple-audio-card,frame-master = <&sndcodec>; - - simple-audio-card,convert-rate = <48000>; - - simple-audio-card,prefix = "ak4642"; - simple-audio-card,routing = "ak4642 Playback", "DAI0 Playback", - "DAI0 Capture", "ak4642 Capture"; - - sndcpu: simple-audio-card,cpu { - sound-dai = <&rcar_sound>; - }; - - sndcodec: simple-audio-card,codec { - sound-dai = <&ak4643>; - system-clock-frequency = <11289600>; - }; -}; - -------------------------------------------- -Example 5. 2 CPU 1 Codec (Mixing) -------------------------------------------- -sound { - compatible = "simple-audio-card"; - - simple-audio-card,name = "rsnd-ak4643"; - simple-audio-card,format = "left_j"; - simple-audio-card,bitclock-master = <&dpcmcpu>; - simple-audio-card,frame-master = <&dpcmcpu>; - - simple-audio-card,routing = "ak4642 Playback", "DAI0 Playback", - "ak4642 Playback", "DAI1 Playback"; - - dpcmcpu: cpu@0 { - sound-dai = <&rcar_sound 0>; - }; - - cpu@1 { - sound-dai = <&rcar_sound 1>; - }; - - codec { - prefix = "ak4642"; - sound-dai = <&ak4643>; - clocks = <&audio_clock>; - }; -}; - -------------------------------------------- -Example 6 - many DAI links with DPCM: -------------------------------------------- - -CPU0 ------ ak4613 -CPU1 ------ PCM3168A-p /* DPCM 1ch/2ch */ -CPU2 --/ /* DPCM 3ch/4ch */ -CPU3 --/ /* DPCM 5ch/6ch */ -CPU4 --/ /* DPCM 7ch/8ch */ -CPU5 ------ PCM3168A-c - -sound { - compatible = "simple-audio-card"; - - simple-audio-card,routing = - "pcm3168a Playback", "DAI1 Playback", - "pcm3168a Playback", "DAI2 Playback", - "pcm3168a Playback", "DAI3 Playback", - "pcm3168a Playback", "DAI4 Playback"; - - simple-audio-card,dai-link@0 { - format = "left_j"; - bitclock-master = <&sndcpu0>; - frame-master = <&sndcpu0>; - - sndcpu0: cpu { - sound-dai = <&rcar_sound 0>; - }; - codec { - sound-dai = <&ak4613>; - }; - }; - simple-audio-card,dai-link@1 { - format = "i2s"; - bitclock-master = <&sndcpu1>; - frame-master = <&sndcpu1>; - - convert-channels = <8>; /* TDM Split */ - - sndcpu1: cpu@0 { - sound-dai = <&rcar_sound 1>; - }; - cpu@1 { - sound-dai = <&rcar_sound 2>; - }; - cpu@2 { - sound-dai = <&rcar_sound 3>; - }; - cpu@3 { - sound-dai = <&rcar_sound 4>; - }; - codec { - mclk-fs = <512>; - prefix = "pcm3168a"; - dai-tdm-slot-num = <8>; - sound-dai = <&pcm3168a 0>; - }; - }; - simple-audio-card,dai-link@2 { - format = "i2s"; - bitclock-master = <&sndcpu2>; - frame-master = <&sndcpu2>; - - sndcpu2: cpu { - sound-dai = <&rcar_sound 5>; - }; - codec { - mclk-fs = <512>; - prefix = "pcm3168a"; - sound-dai = <&pcm3168a 1>; - }; - }; -}; diff --git a/Documentation/devicetree/bindings/sound/simple-card.yaml b/Documentation/devicetree/bindings/sound/simple-card.yaml new file mode 100644 index 000000000000..cd5ea50daa22 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/simple-card.yaml @@ -0,0 +1,487 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/simple-card.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Simple Audio Card Driver Device Tree Bindings + +maintainers: + - Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> + +definitions: + + frame-master: + description: Indicates dai-link frame master. + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle-array + - maxItems: 1 + + bitclock-master: + description: Indicates dai-link bit clock master + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle-array + - maxItems: 1 + + frame-inversion: + description: dai-link uses frame clock inversion + $ref: /schemas/types.yaml#/definitions/flag + + bitclock-inversion: + description: dai-link uses bit clock inversion + $ref: /schemas/types.yaml#/definitions/flag + + dai-tdm-slot-num: + description: see tdm-slot.txt. + $ref: /schemas/types.yaml#/definitions/uint32 + + dai-tdm-slot-width: + description: see tdm-slot.txt. + $ref: /schemas/types.yaml#/definitions/uint32 + + clocks: + maxItems: 1 + + system-clock-frequency: + description: | + If a clock is specified and a multiplication factor is given with + mclk-fs, the clock will be set to the calculated mclk frequency + when the stream starts. + $ref: /schemas/types.yaml#/definitions/uint32 + + system-clock-direction-out: + description: | + specifies clock direction as 'out' on initialization. + It is useful for some aCPUs with fixed clocks. + $ref: /schemas/types.yaml#/definitions/flag + + mclk-fs: + description: | + Multiplication factor between stream rate and codec mclk. + When defined, mclk-fs property defined in dai-link sub nodes are ignored. + $ref: /schemas/types.yaml#/definitions/uint32 + + aux-devs: + description: | + List of phandles pointing to auxiliary devices, such + as amplifiers, to be added to the sound card. + $ref: /schemas/types.yaml#/definitions/phandle-array + + convert-rate: + description: CPU to Codec rate convert. + $ref: /schemas/types.yaml#/definitions/uint32 + + convert-channels: + description: CPU to Codec rate channels. + $ref: /schemas/types.yaml#/definitions/uint32 + + prefix: + description: "device name prefix" + $ref: /schemas/types.yaml#/definitions/string + + label: + maxItems: 1 + + routing: + description: | + A list of the connections between audio components. + Each entry is a pair of strings, the first being the + connection's sink, the second being the connection's source. + $ref: /schemas/types.yaml#/definitions/non-unique-string-array + + widgets: + description: User specified audio sound widgets. + $ref: /schemas/types.yaml#/definitions/non-unique-string-array + + pin-switches: + description: the widget names for which pin switches must be created. + $ref: /schemas/types.yaml#/definitions/string-array + + format: + description: audio format. + items: + enum: + - i2s + - right_j + - left_j + - dsp_a + - dsp_b + - ac97 + - pdm + - msb + - lsb + + dai: + type: object + properties: + sound-dai: + maxItems: 1 + + # common properties + mclk-fs: + $ref: "#/definitions/mclk-fs" + prefix: + $ref: "#/definitions/prefix" + frame-inversion: + $ref: "#/definitions/frame-inversion" + bitclock-inversion: + $ref: "#/definitions/bitclock-inversion" + frame-master: + $ref: /schemas/types.yaml#/definitions/flag + bitclock-master: + $ref: /schemas/types.yaml#/definitions/flag + + dai-tdm-slot-num: + $ref: "#/definitions/dai-tdm-slot-num" + dai-tdm-slot-width: + $ref: "#/definitions/dai-tdm-slot-width" + clocks: + $ref: "#/definitions/clocks" + system-clock-frequency: + $ref: "#/definitions/system-clock-frequency" + system-clock-direction-out: + $ref: "#/definitions/system-clock-direction-out" + required: + - sound-dai + +properties: + compatible: + contains: + enum: + - simple-audio-card + - simple-scu-audio-card + + "#address-cells": + const: 1 + "#size-cells": + const: 0 + + label: + $ref: "#/definitions/label" + + simple-audio-card,name: + description: User specified audio sound card name. + $ref: /schemas/types.yaml#/definitions/string + +# use patternProperties to use "#definitions/xxx" +patternProperties: + "^simple-audio-card,widgets$": + $ref: "#/definitions/widgets" + "^simple-audio-card,routing$": + $ref: "#/definitions/routing" + "^simple-audio-card,cpu(@[0-9a-f]+)?": + $ref: "#/definitions/dai" + "^simple-audio-card,codec(@[0-9a-f]+)?": + $ref: "#/definitions/dai" + + # common properties + "^simple-audio-card,frame-master$": + $ref: "#/definitions/frame-master" + "^simple-audio-card,bitclock-master$": + $ref: "#/definitions/bitclock-master" + "^simple-audio-card,frame-inversion$": + $ref: "#/definitions/frame-inversion" + "^simple-audio-card,bitclock-inversion$": + $ref: "#/definitions/bitclock-inversion" + "^simple-audio-card,format$": + $ref: "#/definitions/format" + "^simple-audio-card,mclk-fs$": + $ref: "#/definitions/mclk-fs" + "^simple-audio-card,aux-devs$": + $ref: "#/definitions/aux-devs" + "^simple-audio-card,convert-rate$": + $ref: "#/definitions/convert-rate" + "^simple-audio-card,convert-channels$": + $ref: "#/definitions/convert-channels" + "^simple-audio-card,prefix$": + $ref: "#/definitions/prefix" + "^simple-audio-card,pin-switches$": + $ref: "#/definitions/pin-switches" + "^simple-audio-card,hp-det-gpio$": + maxItems: 1 + "^simple-audio-card,mic-det-gpio$": + maxItems: 1 + + "^simple-audio-card,dai-link(@[0-9a-f]+)?$": + description: | + Container for dai-link level properties and the CPU and CODEC sub-nodes. + This container may be omitted when the card has only one DAI link. + type: object + properties: + reg: + maxItems: 1 + + # common properties + frame-master: + $ref: "#/definitions/frame-master" + bitclock-master: + $ref: "#/definitions/bitclock-master" + frame-inversion: + $ref: "#/definitions/frame-inversion" + bitclock-inversion: + $ref: "#/definitions/bitclock-inversion" + format: + $ref: "#/definitions/format" + mclk-fs: + $ref: "#/definitions/mclk-fs" + aux-devs: + $ref: "#/definitions/aux-devs" + convert-rate: + $ref: "#/definitions/convert-rate" + convert-channels: + $ref: "#/definitions/convert-channels" + prefix: + $ref: "#/definitions/prefix" + pin-switches: + $ref: "#/definitions/pin-switches" + hp-det-gpio: + maxItems: 1 + mic-det-gpio: + maxItems: 1 + + patternProperties: + "^cpu(@[0-9a-f]+)?": + $ref: "#/definitions/dai" + "^codec(@[0-9a-f]+)?": + $ref: "#/definitions/dai" + additionalProperties: false + +required: + - compatible + +additionalProperties: false + +examples: +#-------------------- +# single DAI link +#-------------------- + - | + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "VF610-Tower-Sound-Card"; + simple-audio-card,format = "left_j"; + simple-audio-card,bitclock-master = <&dailink0_master>; + simple-audio-card,frame-master = <&dailink0_master>; + simple-audio-card,widgets = + "Microphone", "Microphone Jack", + "Headphone", "Headphone Jack", + "Speaker", "External Speaker"; + simple-audio-card,routing = + "MIC_IN", "Microphone Jack", + "Headphone Jack", "HP_OUT", + "External Speaker", "LINE_OUT"; + + simple-audio-card,cpu { + sound-dai = <&sh_fsi2 0>; + }; + + dailink0_master: simple-audio-card,codec { + sound-dai = <&ak4648>; + clocks = <&osc>; + }; + }; + +#-------------------- +# Multi DAI links +#-------------------- + - | + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "Cubox Audio"; + + #address-cells = <1>; + #size-cells = <0>; + + simple-audio-card,dai-link@0 { /* I2S - HDMI */ + reg = <0>; + format = "i2s"; + cpu { + sound-dai = <&audio0>; + }; + codec { + sound-dai = <&tda998x0>; + }; + }; + + simple-audio-card,dai-link@1 { /* S/PDIF - HDMI */ + reg = <1>; + cpu { + sound-dai = <&audio1>; + }; + codec { + sound-dai = <&tda998x1>; + }; + }; + + simple-audio-card,dai-link@2 { /* S/PDIF - S/PDIF */ + reg = <2>; + cpu { + sound-dai = <&audio2>; + }; + codec { + sound-dai = <&spdif_codec>; + }; + }; + }; + +#-------------------- +# route audio from IMX6 SSI2 through TLV320DAC3100 codec +# through TPA6130A2 amplifier to headphones: +#-------------------- + - | + sound { + compatible = "simple-audio-card"; + + simple-audio-card,widgets = + "Headphone", "Headphone Jack"; + simple-audio-card,routing = + "Headphone Jack", "HPLEFT", + "Headphone Jack", "HPRIGHT", + "LEFTIN", "HPL", + "RIGHTIN", "HPR"; + simple-audio-card,aux-devs = <&amp>; + simple-audio-card,cpu { + sound-dai = <&ssi2>; + }; + simple-audio-card,codec { + sound-dai = <&codec>; + clocks = <&clocks>; + }; + }; + +#-------------------- +# Sampling Rate Conversion +#-------------------- + - | + sound { + compatible = "simple-audio-card"; + + simple-audio-card,name = "rsnd-ak4643"; + simple-audio-card,format = "left_j"; + simple-audio-card,bitclock-master = <&sndcodec>; + simple-audio-card,frame-master = <&sndcodec>; + + simple-audio-card,convert-rate = <48000>; + + simple-audio-card,prefix = "ak4642"; + simple-audio-card,routing = "ak4642 Playback", "DAI0 Playback", + "DAI0 Capture", "ak4642 Capture"; + + sndcpu: simple-audio-card,cpu { + sound-dai = <&rcar_sound>; + }; + + sndcodec: simple-audio-card,codec { + sound-dai = <&ak4643>; + system-clock-frequency = <11289600>; + }; + }; + +#-------------------- +# 2 CPU 1 Codec (Mixing) +#-------------------- + - | + sound { + compatible = "simple-audio-card"; + + simple-audio-card,name = "rsnd-ak4643"; + simple-audio-card,format = "left_j"; + simple-audio-card,bitclock-master = <&dpcmcpu>; + simple-audio-card,frame-master = <&dpcmcpu>; + + simple-audio-card,convert-rate = <48000>; + simple-audio-card,convert-channels = <2>; + + simple-audio-card,routing = "ak4642 Playback", "DAI0 Playback", + "ak4642 Playback", "DAI1 Playback"; + + dpcmcpu: simple-audio-card,cpu@0 { + sound-dai = <&rcar_sound 0>; + }; + + simple-audio-card,cpu@1 { + sound-dai = <&rcar_sound 1>; + }; + + simple-audio-card,codec { + prefix = "ak4642"; + sound-dai = <&ak4643>; + clocks = <&audio_clock>; + }; + }; + +#-------------------- +# Multi DAI links with DPCM: +# +# CPU0 ------ ak4613 +# CPU1 ------ PCM3168A-p /* DPCM 1ch/2ch */ +# CPU2 --/ /* DPCM 3ch/4ch */ +# CPU3 --/ /* DPCM 5ch/6ch */ +# CPU4 --/ /* DPCM 7ch/8ch */ +# CPU5 ------ PCM3168A-c +#-------------------- + - | + sound { + compatible = "simple-audio-card"; + + simple-audio-card,routing = + "pcm3168a Playback", "DAI1 Playback", + "pcm3168a Playback", "DAI2 Playback", + "pcm3168a Playback", "DAI3 Playback", + "pcm3168a Playback", "DAI4 Playback"; + + simple-audio-card,dai-link@0 { + format = "left_j"; + bitclock-master = <&sndcpu0>; + frame-master = <&sndcpu0>; + + sndcpu0: cpu { + sound-dai = <&rcar_sound 0>; + }; + codec { + sound-dai = <&ak4613>; + }; + }; + + simple-audio-card,dai-link@1 { + format = "i2s"; + bitclock-master = <&sndcpu1>; + frame-master = <&sndcpu1>; + + convert-channels = <8>; /* TDM Split */ + + sndcpu1: cpu@0 { + sound-dai = <&rcar_sound 1>; + }; + cpu@1 { + sound-dai = <&rcar_sound 2>; + }; + cpu@2 { + sound-dai = <&rcar_sound 3>; + }; + cpu@3 { + sound-dai = <&rcar_sound 4>; + }; + codec { + mclk-fs = <512>; + prefix = "pcm3168a"; + dai-tdm-slot-num = <8>; + sound-dai = <&pcm3168a 0>; + }; + }; + + simple-audio-card,dai-link@2 { + format = "i2s"; + bitclock-master = <&sndcpu2>; + frame-master = <&sndcpu2>; + + sndcpu2: cpu { + sound-dai = <&rcar_sound 5>; + }; + codec { + mclk-fs = <512>; + prefix = "pcm3168a"; + sound-dai = <&pcm3168a 1>; + }; + }; + }; -- 2.17.1

2 2

[alsa-devel] [PATCH v3 0/7] ASoC: soc-pcm cleanup step2
by Kuninori Morimoto 31 Mar '20

31 Mar '20

Hi Mark These are v3 of soc-pcm cleanup. Original [5/7] [6/7] patch call open / start function for all DAI / component. And, it calls close / stop function for all if some of them got error. But in such case, error occured DAI / component don't need to call close / stop. This issue can be solved if it had flag, and my local tree has such patch. But it was planed to post to ML a little later. This time, I merged original patch and this new flag patch on [5/7] [6/7]. These mention that "it is prepare for soc-pcm-open() cleanup". But it will be happen later. These are based on v5.6-rc1 Kuninori Morimoto (8): 1) ASoC: soc-pcm: add snd_soc_runtime_action() 2) ASoC: soc-pcm: adjustment for DAI member 0 reset 3) ASoC: soc-pcm: add for_each_dapm_widgets() macro 4) ASoC: soc-pcm: don't use bit-OR'ed error 5) ASoC: soc-pcm: call snd_soc_dai_startup()/shutdown() once 6) ASoC: soc-pcm: call snd_soc_component_open/close() once 7) ASoC: soc-pcm: move soc_pcm_close() next to soc_pcm_open() 8) ASoC: soc-pcm: tidyup soc_pcm_open() order include/sound/soc-component.h | 7 +- include/sound/soc-dai.h | 5 +- include/sound/soc-dapm.h | 5 + sound/soc/soc-component.c | 35 ++++-- sound/soc/soc-dai.c | 11 +- sound/soc/soc-dapm.c | 8 +- sound/soc/soc-pcm.c | 246 +++++++++++++++++++----------------------- 7 files changed, 161 insertions(+), 156 deletions(-) -- 2.7.4

6 32

[alsa-devel] [PATCH 0/5] ALSA: Fix uapi headers
by Takashi Iwai 30 Mar '20

30 Mar '20

Hi, here is a series of fixes for include/uapi/sound/*.h files and the relevant code changes, so that they can be used for building alsa-tools programs again. The corresponding alsa-lib update will be followed. Takashi === Takashi Iwai (5): ALSA: emu10k1: Make uapi/emu10k1.h compilable again ALSA: hdsp: Make uapi/hdsp.h compilable again ALSA: hdspm: Drop linux/types.h inclusion in uapi header ALSA: uapi: Fix typos and header inclusion in asound.h ALSA: uapi: Drop asound.h inclusion from asoc.h include/uapi/sound/asoc.h | 1 - include/uapi/sound/asound.h | 6 +++--- include/uapi/sound/emu10k1.h | 38 ++++++++++++++++++++++++++------------ include/uapi/sound/hdsp.h | 4 +--- include/uapi/sound/hdspm.h | 2 -- sound/pci/emu10k1/emufx.c | 26 ++++++++++++++------------ sound/pci/rme9652/hdsp.c | 2 +- 7 files changed, 45 insertions(+), 34 deletions(-) -- 2.16.4

2 7

[PATCH] ASoC: soc-dai: fix DAI startup/shutdown sequence
by Pierre-Louis Bossart 30 Mar '20

30 Mar '20

The addition of a single flag to track the DAI status prevents the DAI startup sequence from being called on capture if the DAI is already used for playback. Fix by extending the existing code with one flag per direction. Reported-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> Tested-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> Fixes: b56be800f1292 ("ASoC: soc-pcm: call snd_soc_dai_startup()/shutdown() once") Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- include/sound/soc-dai.h | 2 +- sound/soc/soc-dai.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 78bac995db15..d4825b82c7a3 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -351,7 +351,7 @@ struct snd_soc_dai { /* bit field */ unsigned int probed:1; - unsigned int started:1; + unsigned int started[SNDRV_PCM_STREAM_LAST + 1]; }; static inline struct snd_soc_pcm_stream * diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index 19142f6e533c..8f3cad8db89a 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -295,12 +295,12 @@ int snd_soc_dai_startup(struct snd_soc_dai *dai, { int ret = 0; - if (!dai->started && + if (!dai->started[substream->stream] && dai->driver->ops->startup) ret = dai->driver->ops->startup(substream, dai); if (ret == 0) - dai->started = 1; + dai->started[substream->stream] = 1; return ret; } @@ -308,11 +308,11 @@ int snd_soc_dai_startup(struct snd_soc_dai *dai, void snd_soc_dai_shutdown(struct snd_soc_dai *dai, struct snd_pcm_substream *substream) { - if (dai->started && + if (dai->started[substream->stream] && dai->driver->ops->shutdown) dai->driver->ops->shutdown(substream, dai); - dai->started = 0; + dai->started[substream->stream] = 0; } int snd_soc_dai_prepare(struct snd_soc_dai *dai, -- 2.20.1

2 1

snd_hda_intel/sst-acpi sound breakage on suspend/resume since 5.6-rc1
by Dominik Brodowski 30 Mar '20

30 Mar '20

Hi! While 5.5.x works fine, mainline as of ac309e7744be (v5.6-rc6+) causes me some sound-related trouble: after boot, the sound works fine -- but once I suspend and resume my broadwell-based XPS13, I need to switch to headphone and back to speaker to hear something. But what I hear isn't music but garbled output. A few dmesg snippets from v5.6-rc6-9-gac309e7744be which might be of interest. I've highlighted the lines differing from v.5.5.x which might be of special interest: ... snd_hda_intel 0000:00:03.0: enabling device (0000 -> 0002) usbcore: registered new interface driver snd-usb-audio snd_hda_intel 0000:00:03.0: bound 0000:00:02.0 (ops i915_audio_component_bind_ops) input: HDA Intel HDMI HDMI/DP,pcm=3 as /devices/pci0000:00/0000:00:03.0/sound/card0/input13 input: HDA Intel HDMI HDMI/DP,pcm=7 as /devices/pci0000:00/0000:00:03.0/sound/card0/input14 input: HDA Intel HDMI HDMI/DP,pcm=8 as /devices/pci0000:00/0000:00:03.0/sound/card0/input15 input: HDA Intel HDMI HDMI/DP,pcm=9 as /devices/pci0000:00/0000:00:03.0/sound/card0/input16 input: HDA Intel HDMI HDMI/DP,pcm=10 as /devices/pci0000:00/0000:00:03.0/sound/card0/input17 Console: switching to colour frame buffer device 240x67 !!! sst-acpi INT3438:00: WARN: Device release is not defined so it is not safe to unbind this driver while in use i915 0000:00:02.0: fb0: i915drmfb frame buffer device sst-acpi INT3438:00: DesignWare DMA Controller, 8 channels psmouse serio1: synaptics: Unable to query device: -5 haswell-pcm-audio haswell-pcm-audio: Direct firmware load for intel/IntcPP01.bin failed with error -2 haswell-pcm-audio haswell-pcm-audio: fw image intel/IntcPP01.bin not available(-2) haswell-pcm-audio haswell-pcm-audio: FW loaded, mailbox readback FW info: type 01, - version: 00.00, build 77, source commit id: 876ac6906f31a43b6772b23c7c983ce9dcb18a19 rt286 i2c-INT343A:00: ASoC: sink widget DMIC1 overwritten rt286 i2c-INT343A:00: ASoC: source widget DMIC1 overwritten broadwell-audio broadwell-audio: snd-soc-dummy-dai <-> System Pin mapping ok broadwell-audio broadwell-audio: snd-soc-dummy-dai <-> Offload0 Pin mapping ok broadwell-audio broadwell-audio: snd-soc-dummy-dai <-> Offload1 Pin mapping ok broadwell-audio broadwell-audio: snd-soc-dummy-dai <-> Loopback Pin mapping ok broadwell-audio broadwell-audio: rt286-aif1 <-> snd-soc-dummy-dai mapping ok input: broadwell-rt286 Headset as /devices/pci0000:00/INT3438:00/broadwell-audio/sound/card1/input18 ... ALSA device list: #0: HDA Intel HDMI at 0xf7218000 irq 48 #1: DellInc.-XPS139343--0TM99H ... !!! haswell-pcm-audio haswell-pcm-audio: warning: stream is NULL, no stream to reset, ignore it. !!! haswell-pcm-audio haswell-pcm-audio: warning: stream is NULL, no stream to free, ignore it. (these last two messages already are printed a couple of time after boot, and then again during a suspend/resume cycle. On v.5.5.y, there are similar messages "no context buffer need to restore!"). Everything is built-in, no modules are loaded. Unfortunately, I cannot bisect this issue easily -- i915 was broken for quite some time on this system[*], prohibiting boot... Thanks for taking a look at this issue! Dominik [*] https://gitlab.freedesktop.org/drm/intel/issues/1151

8 38

[PATCH] dt-bindings: sound: cs42l51: Remove unneeded I2C unit name
by Fabio Estevam 30 Mar '20

30 Mar '20

The following warning is seen with 'make dt_binding_check': Documentation/devicetree/bindings/sound/cirrus,cs42l51.example.dts:18.15-34.11: Warning (unit_address_vs_reg): /example-0/i2c@0: node has a unit name, but no reg or ranges property Fix it by removing the unneeded i2c unit name. Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- Documentation/devicetree/bindings/sound/cirrus,cs42l51.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/cirrus,cs42l51.yaml b/Documentation/devicetree/bindings/sound/cirrus,cs42l51.yaml index efce847a3408..83f44f07ac3f 100644 --- a/Documentation/devicetree/bindings/sound/cirrus,cs42l51.yaml +++ b/Documentation/devicetree/bindings/sound/cirrus,cs42l51.yaml @@ -49,7 +49,7 @@ required: examples: - | #include <dt-bindings/gpio/gpio.h> - i2c@0 { + i2c { #address-cells = <1>; #size-cells = <0>; -- 2.17.1

3 2

[PATCH] ASoC: bcm: Fix pointer cast warning
by Takashi Iwai 30 Mar '20

30 Mar '20

The NULL check can be done gracefully without cast. It fixes a compile warning like: sound/soc/bcm/bcm63xx-pcm-whistler.c:184:6: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] Fixes: 88eb404ccc3e ("ASoC: brcm: Add DSL/PON SoC audio driver") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/bcm/bcm63xx-pcm-whistler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/bcm/bcm63xx-pcm-whistler.c b/sound/soc/bcm/bcm63xx-pcm-whistler.c index e46c390683e7..b7a1efc7406e 100644 --- a/sound/soc/bcm/bcm63xx-pcm-whistler.c +++ b/sound/soc/bcm/bcm63xx-pcm-whistler.c @@ -181,7 +181,7 @@ bcm63xx_pcm_pointer(struct snd_soc_component *component, snd_pcm_uframes_t x; struct bcm63xx_runtime_data *prtd = substream->runtime->private_data; - if ((void *)prtd->dma_addr_next == NULL) + if (!prtd->dma_addr_next) prtd->dma_addr_next = substream->runtime->dma_addr; x = bytes_to_frames(substream->runtime, -- 2.16.4

2 1

[PATCH] ASoC: AMD: Clear format bits before setting them
by Akshu Agrawal 30 Mar '20

30 Mar '20

This avoids residual bit form previous format when the format is changed. Hence, the resultant format is not an invalid one. Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> Signed-off-by: Ravulapati Vishnu vardhan rao <Vishnuvardhanrao.Ravulapati(a)amd.com> --- sound/soc/amd/raven/acp3x-i2s.c | 1 + sound/soc/amd/raven/acp3x.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c index 3a3c47e820ab..f160d35a6832 100644 --- a/sound/soc/amd/raven/acp3x-i2s.c +++ b/sound/soc/amd/raven/acp3x-i2s.c @@ -139,6 +139,7 @@ static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, rv_writel(adata->tdm_fmt, rtd->acp3x_base + frmt_reg); } val = rv_readl(rtd->acp3x_base + reg_val); + val &= ~ACP3x_ITER_IRER_SAMP_LEN_MASK; val = val | (rtd->xfer_resolution << 3); rv_writel(val, rtd->acp3x_base + reg_val); return 0; diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h index 21e7ac017f2b..03fe93913e12 100644 --- a/sound/soc/amd/raven/acp3x.h +++ b/sound/soc/amd/raven/acp3x.h @@ -76,6 +76,8 @@ #define ACP_POWERED_OFF 0x02 #define ACP_POWER_OFF_IN_PROGRESS 0x03 +#define ACP3x_ITER_IRER_SAMP_LEN_MASK 0x38 + struct acp3x_platform_info { u16 play_i2s_instance; u16 cap_i2s_instance; -- 2.20.1

2 1

[PATCH 0/4] ucm2: Add support to SDM845 based platforms
by Srinivas Kandagatla 30 Mar '20

30 Mar '20

This patchset adds UCM support for WSA881x, WCD934x codec and two platforms, DB845c DragonBoard and Lenovo YOGA C360 Laptop that use these codecs. Tested on Ubuntu 20.04 with pulseaudio 13 along with with this fix https://github.com/pulseaudio/pulseaudio/commit/cabd387e26b5fe03661f4b89482… Thanks, srini Srinivas Kandagatla (4): ucm2: codecs: wcd934x: Add Codec sequences. ucm2: codecs: wsa881x: add codec sequences ucm2: DB845c: Add ucm for DB845c board ucm2: Add ucm for Lenovo-YOGA-C630-13Q50 laptop ucm2/DB845c/DB845c.conf | 11 +++ ucm2/DB845c/HDMI.conf | 33 +++++++ ucm2/DB845c/HiFi.conf | 46 +++++++++ ucm2/Lenovo-YOGA-C630-13Q50/HiFi.conf | 98 +++++++++++++++++++ .../Lenovo-YOGA-C630-13Q50.conf | 6 ++ ucm2/codecs/wcd934x/DefaultDisableSeq.conf | 5 + ucm2/codecs/wcd934x/DefaultEnableSeq.conf | 14 +++ ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf | 6 ++ ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf | 6 ++ .../wcd934x/HeadphoneMicDisableSeq.conf | 2 + .../codecs/wcd934x/HeadphoneMicEnableSeq.conf | 3 + ucm2/codecs/wcd934x/SpeakerDisableSeq.conf | 4 + ucm2/codecs/wcd934x/SpeakerEnableSeq.conf | 4 + ucm2/codecs/wsa881x/DefaultEnableSeq.conf | 8 ++ ucm2/codecs/wsa881x/SpeakerDisableSeq.conf | 8 ++ ucm2/codecs/wsa881x/SpeakerEnableSeq.conf | 8 ++ 16 files changed, 262 insertions(+) create mode 100644 ucm2/DB845c/DB845c.conf create mode 100644 ucm2/DB845c/HDMI.conf create mode 100644 ucm2/DB845c/HiFi.conf create mode 100644 ucm2/Lenovo-YOGA-C630-13Q50/HiFi.conf create mode 100644 ucm2/Lenovo-YOGA-C630-13Q50/Lenovo-YOGA-C630-13Q50.conf create mode 100644 ucm2/codecs/wcd934x/DefaultDisableSeq.conf create mode 100644 ucm2/codecs/wcd934x/DefaultEnableSeq.conf create mode 100644 ucm2/codecs/wcd934x/HeadphoneDisableSeq.conf create mode 100644 ucm2/codecs/wcd934x/HeadphoneEnableSeq.conf create mode 100644 ucm2/codecs/wcd934x/HeadphoneMicDisableSeq.conf create mode 100644 ucm2/codecs/wcd934x/HeadphoneMicEnableSeq.conf create mode 100644 ucm2/codecs/wcd934x/SpeakerDisableSeq.conf create mode 100644 ucm2/codecs/wcd934x/SpeakerEnableSeq.conf create mode 100644 ucm2/codecs/wsa881x/DefaultEnableSeq.conf create mode 100644 ucm2/codecs/wsa881x/SpeakerDisableSeq.conf create mode 100644 ucm2/codecs/wsa881x/SpeakerEnableSeq.conf -- 2.21.0

2 7

[GIT PULL] ASoC updates for v5.7
by Mark Brown 30 Mar '20

30 Mar '20

The following changes since commit 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e: Linux 5.6-rc7 (2020-03-22 18:31:56 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v5.7 for you to fetch changes up to 1c521d7e62262793789845989edca57dea24eb7d: Merge branch 'asoc-5.7' into asoc-next (2020-03-27 17:29:20 +0000) ---------------------------------------------------------------- ASoC: Updates for v5.7 This is a very big update for the core since Morimoto-san has been rather busy continuing his refactorings to clean up a lot of the cruft that we have accumilated over the years. We've also gained several new drivers, including initial (but still not complete) parts of the Intel SoundWire support. - Lots of refactorings to modernize the code from Morimoto-san. - Conversion of SND_SOC_ALL_CODECS to use imply from Geert Uytterhoeven. - Continued refactoring and fixing of the Intel support. - Soundwire and more advanced clocking support for Realtek RT5682. - Support for amlogic GX, Meson 8, Meson 8B and T9015 DAC, Broadcom DSL/PON, Ingenic JZ4760 and JZ4770, Realtek RL6231, and TI TAS2563 and TLV320ADCX140. ---------------------------------------------------------------- Akshu Agrawal (4): ASoC: amd: Add machine driver for Raven based platform ASoC: amd: Allow I2S wake event after ACP is powerd On ASoc: amd: Add DMIC switch capability to machine driver ASoC: amd: Fix compile warning of argument type Amadeusz Sławiński (1): ASoC: topology: Perform component check upfront Amery Song (2): ASoC: SOF: Intel: hda: remove unnecessary ROM IPC filter function ASoC: SOF: Intel: remove unnecessary waitq before loading firmware Baolin Wang (1): ASoC: sprd: Allow the MCDT driver to build into modules Bard Liao (5): ASoC: Return error if the function does not support multi-cpu ASoC: pcm: check if cpu-dai supports a given stream ASoC: SOF: Intel: hda-dai: add stream capability ASoC: SOF: topology: connect dai widget to all cpu-dais ASoC: SOF: Intel: hda: merge IPC, stream and SoundWire interrupt handlers Benjamin Gaignard (1): ASoC: Convert cirrus,cs42l51 to json-schema Cezary Rojewski (20): 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: Expose SDnFMT helpers ASoC: SOF: Intel: Probe compress operations ASoC: SOF: Provide probe debugfs support ASoC: SOF: Intel: Add Probe compress CPU DAIs ASoC: SOF: Fix probe point getter ASoC: Intel: Skylake: Remove superfluous chip initialization ASoC: Intel: Skylake: Select hda configuration permissively ASoC: Intel: Skylake: Enable codec wakeup during chip init ASoC: Intel: Skylake: Shield against no-NHLT configurations ASoC: Intel: Allow for ROM init retry on CNL platforms ASoC: Intel: Skylake: Await purge request ack on CNL ASoC: SOF: Intel: Fix stream cleanup on hw free ASoC: Intel: broadwell: Revert back SSP0 link to use dummy components ASoC: Intel: bdw-rt5677: Revert SSP0 link to use dummy components ASoC: Intel: bdw-rt5650: Revert SSP0 link to use dummy components Charles Keepax (1): ASoC: samsung: Update dependencies for Arizona machine drivers Colin Ian King (6): ASoC: Intel: mrfld: return error codes when an error occurs ASoC: rt5659: remove redundant assignment to variable idx ASoC: ti: davinci-mcasp: remove redundant assignment to variable ret ASoC: Intel: mrfld: fix incorrect check on p->sink ASoC: mchp-i2s-mcc: make signed 1 bit bitfields unsigned ASoC: amd: acp3x-pcm-dma: clean up two indentation issues Curtis Malainey (1): ASoC: Intel: Make glk+rt5682 echo ref dynamic Dafna Hirschfeld (1): dt-bindings: Convert the binding file google, cros-ec-codec.txt to yaml format. Dan Murphy (10): ASoC: tas2562: Add support for ISENSE and VSENSE dt-bindings: sound: Add TLV320ADCx140 dt bindings ASoC: tlv320adcx140: Add the tlv320adcx140 codec driver family ASoC: tas2562: Add support for digital volume control ASoC: tlv320adcx140: Add DRE and AGC support ASoC: tlv320adcx140: Add decimation filter support ASoC: dt-bindings: Add TAS2563 compatible to the TAS2562 binding ASoC: tas2562: Add entries for the TAS2563 audio amplifier ASoC: tlv320adcx140: Fix mic_bias and vref device tree verification ASoC: tlv320adcx140: Remove undocumented property Derek Fang (3): ASoC: rl6231: Add new supports on rl6231 ASoC: rt5682: Add CCF usage for providing I2S clks ASoC: rt5682: Add DAI clock binding info for WCLK/BCLK CCF usage Dmitry Osipenko (2): ASoC: tegra: tegra_wm8903: Support DAPM events for built-in microphone ASoC: tegra-wm8903: Document built-in microphone audio source Enric Balletbo i Serra (1): ASoC: amd: AMD RV RT5682 should depends on CROS_EC Geert Uytterhoeven (7): spi: pxa2xx: Enable support for compile-testing ASoC: Use imply for SND_SOC_ALL_CODECS ASoC: sh: fsi: Restore devm_ioremap() alignment ASoC: Fix SND_SOC_ALL_CODECS imply SPI fallout ASoC: Fix SND_SOC_ALL_CODECS imply I2C fallout ASoC: Fix SND_SOC_ALL_CODECS imply misc fallout ASoC: Fix SND_SOC_ALL_CODECS imply ac97 fallout Guennadi Liakhovetski (7): ASoC: (cosmetic) simplify dpcm_prune_paths() ASoC: export DPCM runtime update functions ASoC: codecs: hdac_hdmi: (cosmetic) remove redundant variable initialisations ASoC: Intel: skylake: (cosmetic) remove redundant variable initialisations ASoC: Intel: (cosmetic) simplify structure member access ASoC: SOF: (cosmetic) use for_each_pcm_streams() in sof_dai_load() ASoC: SOF: fix uninitialised "work" with VirtIO Gustavo A. R. Silva (1): ASoC: wm0010: Replace zero-length array with flexible-array member Jack Yu (2): ASoC: rt1015: fix typo for bypass boost control ASoC: rt1015: modify some structure to be static. James Schulman (1): MAINTAINERS: Update Cirrus Logic codec driver maintainers Jaska Uimonen (1): ASoC: SOF: ipc: check ipc return value before data copy Jeff Chang (1): ASoC: MT6660 update to 1.0.8_G Jerome Brunet (23): ASoC: core: allow a dt node to provide several components ASoC: meson: g12a: extract codec-to-codec utils ASoC: meson: aiu: add audio output dt-bindings ASoC: meson: aiu: add i2s and spdif support ASoC: meson: aiu: add hdmi codec control support ASoC: meson: aiu: add internal dac codec control support ASoC: meson: axg: extract sound card utils ASoC: meson: gx: add sound card dt-binding documentation ASoC: meson: gx: add sound card support ASoC: core: ensure component names are unique ASoC: meson: aiu: remove unused encoder structure ASoC: meson: aiu: fix clk bulk size allocation ASoC: meson: aiu: fix irq registration ASoC: meson: aiu: fix acodec dai input name init ASoC: meson: codec-glue: fix pcm format cast warning ASoC: meson: aiu: simplify component addition ASoC: fix card registration regression. ASoC: meson: add t9015 internal codec binding documentation ASoC: meson: add t9015 internal DAC driver ASoC: dpcm: remove confusing trace in dpcm_get_be() ASoC: meson: g12a: add toacodec dt-binding documentation ASoC: meson: g12a: add internal DAC glue driver ASoC: meson: axg-card: add toacodec support Johan Jonker (2): dt-bindings: sound: convert rockchip i2s bindings to yaml dt-bindings: sound: rockchip-i2s: add #sound-dai-cells property Jonghwan Choi (1): ASoC: tas2562: Fixed incorrect amp_level setting. Kai Vehmanen (10): ASoC: intel/skl/hda - add no-HDMI cases to generic HDA driver ASoC: SOF: Intel: hda: allow operation without i915 gfx ASoC: soc-pcm: fix state tracking error in snd_soc_component_open/close() MAINTAINERS: add entry for Sound Open Firmware drivers ASoC: Intel: boards: drop reverse deps for SND_HDA_CODEC_HDMI ASoC: Intel: sof_pcm512x: drop reverse deps for SND_HDA_CODEC_HDMI ASoC: Intel: sof_pcm512x: make HDMI optional for all platforms ASoC: SOF: Intel: hda: remove SND_SOC_SOF_HDA_COMMON_HDMI_CODEC ASoC: SOF: Intel: hda: do not leave clock gating off upon error ASoC: SOF: Intel: hda: call codec wake at chip init Karol Trzcinski (2): ASoC: SOF: Make sof_ipc_ext_data enum more rigid ASoC: SOF: Remove SOF_IPC_EXT_DMA_BUFFER Kevin Li (2): ASoC: brcm: Add DSL/PON SoC audio driver ASoC: brcm: DSL/PON SoC device tree bindings of audio driver Keyon Jie (2): ASoC: SOF: pcm: skip DMA buffer pre-allocation ASoC: SOF: Intel: hda-loader: clear the IPC ack bit after FW_PURGE done Kuninori Morimoto (95): 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: don't use bit-OR'ed error ASoC: soc-pcm: call snd_soc_dai_startup()/shutdown() once ASoC: soc-pcm: call snd_soc_component_open/close() once ASoC: soc-pcm: move soc_pcm_close() next to soc_pcm_open() ASoC: soc-pcm: tidyup soc_pcm_open() order ASoC: soc-pcm: move dai_get_widget() ASoC: soc-pcm: use dai_get_widget() at dpcm_get_be() ASoC: soc-pcm: use dai_get_widget() at dpcm_end_walk_at_be() ASoC: soc-pcm: use dpcm_get_be() at dpcm_end_walk_at_be() ASoC: soc-pcm: remove soc_dpcm_be_digital_mute() ASoC: soc-pcm: remove snd_soc_dpcm_be_get/set_state() ASoC: soc-pcm: add snd_soc_dpcm_can_be() and remove duplicate code ASoC: soc-pcm: use goto and remove multi return ASoC: soc-pcm: merge playback/cature_active into stream_active ALSA: pcm.h: add for_each_pcm_streams() ASoC: soc-core: use for_each_pcm_streams() macro ASoC: soc-pcm: use for_each_pcm_streams() macro ASoC: soc-generic-dmaengine-pcm: use for_each_pcm_streams() macro ASoC: dwc: dwc-i2s: use for_each_pcm_streams() macro ASoC: fsl: fsl_asrc_dma: use for_each_pcm_streams() macro ASoC: qcom: lpass-platform: use for_each_pcm_streams() macro ASoC: sof: sof-audio: use for_each_pcm_streams() macro ALSA: usx2y: use for_each_pcm_streams() macro ASoC: soundwaire: qcom: use for_each_rtd_codec_dai() macro ASoC: qcom: sdm845: use for_each_rtd_codec_dai() macro ASoC: qcom: apq8016_sbc: use for_each_rtd_codec_dai() macro ASoC: intel: cml_rt1011_rt5682: use for_each_rtd_codec_dai() macro ASoC: intel: kbl_da7219_max98927: use for_each_rtd_codec_dai() macro ASoC: mediatek: mt8183-da7219-max98357: use for_each_rtd_codec_dai() macro ASoC: soc-pcm: add snd_soc_dai_get_pcm_stream() ASoC: soc-pcm: cleanup soc_pcm_apply_msb() ASoC: soc-pcm: add snd_soc_dai_get_widget() ASoC: soc-pcm: merge dpcm_run_new/old_update() into dpcm_fe_runtime_update() ASoC: soc-pcm: move dpcm_path_put() to soc-pcm.c ASoC: soc-pcm: move CONFIG_DEBUG_FS functions to top side ASoC: soc-pcm: add dpcm_create/remove_debugfs_state() ASoC: soc-dapm: don't use rtd->cpu_dai on for_each_rtd_cpu_dai() ASoC: soc-pcm: use defined stream ASoC: soc-pcm: remove duplicate be check from dpcm_add_paths() ASoC: soc-pcm: move dpcm_fe_dai_close() ASoC: soc-pcm: add dpcm_fe_dai_cleanup() ASoC: soc-pcm: use snd_soc_dai_get_pcm_stream() at dpcm_set_fe_runtime() ASoC: soc-pcm: tidyup dulicate handing at dpcm_fe_dai_startup() ASoC: soc-pcm: check DAI's activity more simply ASoC: soc-pcm: Do Digital Mute for both CPU/Codec in same timing. ASoC: simple-card-utils: use for_each_pcm_streams() ASoC: soc.h: add for_each_rtd_codecs/cpus_dai() macro ASoC: Intel: use for_each_rtd_codecs/cpus_dai() macro ASoC: mediatek: use for_each_rtd_codecs/cpus_dai() macro ASoC: meson: use for_each_rtd_codecs/cpus_dai() macro ASoC: qcom: use for_each_rtd_codecs/cpus_dai() macro ASoC: soc: use for_each_rtd_codecs/cpus_dai() macro ASoC: soc.h: remove non plural form for_each_xxx macro ASoC: soc-dapm: add for_each_card_dapms() macro ASoC: soc-dapm: add for_each_card_widgets() macro ASoC: soc-core: Merge CPU/Codec DAIs ASoC: soc-core: Merge for_each_rtd_cpu/codec_dais() ASoC: soc-dapm: Merge for_each_rtd_cpu/codec_dais() ASoC: soc-pcm: Merge for_each_rtd_cpu/codec_dais() ASoC: soc-core: Merge CPU/Codec for soc_dai_pcm_new() ASoC: soc-core: add asoc_rtd_to_cpu/codec() macro ASoC: amd: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: atmel: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: au1x: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: bcm: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: cirrus: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: dwc: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: fsl: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: generic: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: img: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: intel: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: kirkwood: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: mediatek: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: meson: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: mxs: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: pxa: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: qcom: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: rockchip: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: samsung: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: sh: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: sof: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: sprd: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: stm: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: sunxi: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: tegra: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: ti: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: txx9: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: uniphier: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: ux500: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: xtensa: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: arm: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer ASoC: codecs: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer Lukas Bulwahn (1): ASoC: MT6660: make spdxcheck.py happy Marek Szyprowski (1): ASoC: samsung: Silence warnings during deferred probe Mark Brown (37): Merge branch 'for-5.6' of https://git.kernel.org/.../broonie/sound into asoc-5.7 ASoC: soc-pcm cleanup step4 Merge branch 'for-5.6' of https://git.kernel.org/.../broonie/sound into asoc-5.7 SoundWire: ASoC interfaces for multi-cpu dais and DisCo helpers ASoC: Add Multi CPU DAI support Merge series "ASoC: SOF: updates for 5.7" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge branch 'for-5.6' of https://git.kernel.org/.../broonie/sound into asoc-5.7 Merge branch 'for-5.6' of https://git.kernel.org/.../broonie/sound into asoc-5.7 Merge branch 'for-5.6' of https://git.kernel.org/.../broonie/sound into asoc-5.7 Merge series "ASoC: wcd934x: minor fixes" from Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org>: Merge series "simple-audio-card codec2codec support" from Samuel Holland <samuel(a)sholland.org>: Merge series "ASoC: soc-pcm cleanup step5" from Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com>: Merge series "ASoC: soc-pcm cleanup step6" from Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com>: Merge series "ASoC: rt5682: fix Kconfig/compilation issues when I2C is not selected" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge tag 'v5.6-rc5' into asoc-5.7 Merge series "ASoC: qdsp6: fix default FE dais and routings." from Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org>: Merge series "ASoC: SOF: preparatory patches" from Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com>: Merge series "ASoC: brcm: add dsl and pon chip audio driver" from Kevin Li <kevin-ke.li(a)broadcom.com>: Merge series "ASoC: Intel: machine driver updates for 5.7" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge series "ASoC: SOF: multi-cpu dais, IPC and Intel improvements for 5.7" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge branch 'for-5.6' of https://git.kernel.org/.../broonie/sound into asoc-5.7 Merge series "ALSA: compress: Add wma, alac and ape support" from Vinod Koul <vkoul(a)kernel.org>: Merge series "ASoC: sdm845: fix soundwire stream handling" from Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org>: Merge series "ASoC: stm32: manage rebind issue" from Olivier Moysan <olivier.moysan(a)st.com>: Merge branch 'topic/ro_wordlength' of git://git.kernel.org/.../vkoul/soundwire into asoc-5.7 Merge series "Support built-in Mic on Tegra boards that use WM8903" from Dmitry Osipenko <digetx(a)gmail.com>: ASoC: pxa: Select regmap from AC'97 machines ASoC: pxa: Enable AC'97 bus support for PXA machines Merge series "ASoC: SOF: cleanups and improvements" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge series "ASoC: Intel: machine driver updates" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge series "ASoC: rt1308-sdw: configure amplifier with set_tdm_slot()" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge series "ASoC: SOF: Intel: add SoundWire support" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge series "ASoC: remove rtd->cpu/codec_dai{s}" from Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com>: Merge branch 'for-5.6' of https://git.kernel.org/.../broonie/sound into asoc-5.7 Merge series "ASoC: Intel: add SoundWire machine driver" from Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com>: Merge branch 'asoc-5.6' into asoc-linus Merge branch 'asoc-5.7' into asoc-next Martin Blumenstingl (3): ASoC: meson: aiu: Document Meson8 and Meson8b support in the dt-bindings ASoC: meson: aiu: introduce a struct for platform specific information ASoC: meson: aiu: add support for the Meson8 and Meson8b SoC families Nathan Chancellor (1): ASoC: wcd934x: Remove some unnecessary NULL checks Naveen Manohar (2): ASoC: Intel: common: add match table for TGL RT5682 SoundWire driver ASoC: Intel: sof_sdw: Add Volteer support with RT5682 SNDW helper function Oder Chiou (8): ASoC: rt5682: Add the field "is_sdw" of private data ASoC: rt5682: Add the soundwire support ASoC: rt5682: Revise the function name ASoC: rt5682: Revise the DAC1 volume setting ASoC: rt5682: Fine tune the HP performance in soundwire mode ASoC: rt5682: Add a property for DMIC clock rate ASoC: rt5682: Add a property for DMIC delay ASoC: rt5682: Add the descriptions for the DMIC clock rate and delay settings Olivier Moysan (11): ASoC: stm32: sai: manage error when getting reset controller ASoC: stm32: spdifrx: manage error when getting reset controller ASoC: stm32: i2s: manage error when getting reset controller ASoC: stm32: sai: improve error management on probe deferral ASoC: stm32: spdifrx: improve error management on probe deferral ASoC: stm32: i2s: improve error management on probe deferral ASoC: dt-bindings: stm32: convert i2s to json-schema ASoC: dt-bindings: stm32: convert spdfirx to json-schema ASoC: stm32: spdifrx: fix regmap status check ASoC: stm32: spdifrx: manage rebind issue ASoC: stm32: i2s: manage rebind issue Paul Cercueil (6): ASoC: jz4740-i2s: Fix divider written at incorrect offset in register ASoC: jz4740-i2s: Add local dev variable in probe function ASoC: jz4740-i2s: Avoid passing enum as match data ASoC: jz4740-i2s: Add support for the JZ4760 ASoC: jz4740-i2s: Add support for the JZ4770 ASoC: Convert jz4740-i2s doc to YAML Paul Olaru (3): ASoC: SOF: Rename i.MX8 platform to i.MX8X ASoC: SOF: imx8: Add ops for i.MX8QM ASoC: SOF: Add i.MX8QM device descriptor Peter Ujfalusi (5): ASoC: ti: Add udma-pcm platform driver for UDMA ASoC: ti: davinci-mcasp: Add support for platforms using UDMA ALSA: dmaengine_pcm: Consider DMA cache caused delay in pointer callback ALSA: dmaengine_pcm: Consider DMA cache caused delay in pointer callback ALSA: dmaengine_pcm: No need to take runtime reference twice in pcm_pointer Pierre-Louis Bossart (20): ASoC: Intel: sof_pcm512x: add support for SOF platforms with pcm512x ASoC: Intel: BXT: switch pcm512x based boards to sof_pcm512x ASoC: Intel: CHT: add support for pcm512x boards ASoC: soc-dai: add get_sdw_stream() callback ASoC: soc-core: disable route checks for legacy devices ASoC: Intel: skl_nau88l25_ssm4567: disable route checks ASoC: rt5682: fix unmet dependencies ASoC: rt5682-sdw: fix 'defined but not used' pm functions ASoC: Intel: don't use GFP_ATOMIC for machine driver contexts ASoC: rt1308-sdw: add set_tdm_slot() support ASoC: rt1308-sdw: use slot and rx_mask to configure stream ASoC: soc-acpi: expand description of _ADR-based devices ASoC: SOF: Intel: add SoundWire configuration interface ASoC: SOF: IPC: dai-intel: move ALH declarations in header file ASoC: SOF: Intel: hda: add SoundWire stream config/free callbacks ASoC: SOF: Intel: hda: initial SoundWire machine driver autodetect ASoC: SOF: Intel: hda: disable SoundWire interrupts on suspend ASoC: SOF: Intel: hda: add parameter to control SoundWire clock stop quirks ASoC: SOF: Intel: hda-ctrl: add reset cycle before parsing capabilities ASoC: Intel: boards: add sof_sdw machine driver Rander Wang (3): ASoC: SOF: Intel: hda: add WAKEEN interrupt support for SoundWire Asoc: SOF: Intel: hda: check SoundWire wakeen interrupt in irq thread ASoC: Intel: soc-acpi: update topology and driver name for SoundWire platforms Ranjani Sridharan (11): ASoC: SOF: Do not reset hw_params for streams that ignored suspend ASoC: SOF: pm: Unify suspend/resume routines ASoC: SOF: Add system_suspend_target field to struct snd_sof_dev ASoC: SOF: pm: Introduce DSP power states ASoC: SOF: Move DSP power state transitions to platform-specific ops ASoC: SOF: audio: Add helper to check if only D0i3 streams are active ASoC: SOF: Intel: hda: Amend the DSP state transition diagram ASoC: SOF: Intel: cnl: Implement feature to support DSP D0i3 in S0 ASoC: SOF: Intel: hda: Allow trace DMA in S0 when DSP is in D0I3 for debug ASoC: SOF: Intel: hda: use snd_sof_dsp_set_power_state() op ASoC: SOF: Intel: hda: Improve DSP state logging Ravulapati Vishnu vardhan rao (1): ASoC: amd: Adding TDM support in hw_params. Rob Herring (1): ASoC: dt-bindings: google, cros-ec-codec: Fix dtc warnings in example Robin Murphy (2): ASoC: dt-bindings: Make RK3328 codec GPIO explicit ASoC: rockchip: Make RK3328 GPIO_MUTE control explicit Samuel Holland (4): ASoC: sun8i-codec: Remove unused dev from codec struct ALSA: pcm: Add a standalone version of snd_pcm_limit_hw_rates ASoC: pcm: Export parameter intersection logic ASoC: simple-card: Add support for codec2codec DAI links Sathyanarayana Nujella (2): ASoC: Intel: sof_rt5682: Add support for tgl-max98373-rt5682 ASoC: Intel: common: Add mach table for tgl-max98373-rt5682 Shreyas NC (4): ASoC: Add initial support for multiple CPU DAIs ASoC: Add multiple CPU DAI support for PCM ops ASoC: Add dapm_add_valid_dai_widget helper ASoC: Add multiple CPU DAI support in DAPM Shuming Fan (3): ASoC: rt5682: fix the random recording noise of headset ASoC: rt5682: remove noisy debug messages ASoC: rt5682: move DAI clock registry to I2S mode Srinivas Kandagatla (10): ASoC: wcd934x: fix High Accuracy Buck enable ASoC: wcd934x: remove unused headers ASoC: wcd9335: fix address map representation ASoC: qdsp6: q6asm-dai: only enable dais from device tree ASoC: qdsp6: q6routing: remove default routing ASoC: codecs: wsa881x: request gpio direction before setting ASoC: soc-dai: return proper error for get_sdw_stream() ASoC: codecs: wsa881x: remove soundwire stream handling ASoC: qcom: sdm845: handle soundwire stream soundwire: stream: Add read_only_wordlength flag to port properties Stephan Gerhold (1): ASoC: soc-pcm: fix regression in soc_new_pcm() Takashi Iwai (2): ASoC: pcm: Fix (again) possible buffer overflow in dpcm state sysfs output ASoC: wm_adsp: Use scnprintf() for the limited buffer output Tomasz Lauda (1): ASoC: SOF: add core id to sof_ipc_comp Tzung-Bi Shih (12): ASoC: mediatek: mt8173-rt5650: support HDMI jack reporting drm/mediatek: exit earlier if failed to register audio driver drm/mediatek: support HDMI jack status reporting ASoC: max98357a: move control of SD_MODE to DAPM ASoC: mediatek: mt8183-da7219: add speaker switch ASoC: mediatek: mt8183-da7219: change supported formats of DL2 and UL1 ASoC: mediatek: mt8183-da7219: pull TDM GPIO pins down when probed ASoC: mediatek: mt8183-da7219: support TDM out and 8ch I2S out ASoC: mediatek: mt8183-da7219: apply some refactors drm/mediatek: fix race condition for HDMI jack status reporting ASoC: dapm: select sleep_state when initializing PINCTRL widget ASoC: mediatek: mt8183-da7219: use SND_SOC_DAPM_PINCTRL in TDM out Vinod Koul (9): ALSA: compress: add wma codec profiles ALSA: compress: Add wma decoder params ASoC: qcom: q6asm: pass codec profile to q6asm_open_write ASoC: qcom: q6asm: add support to wma config ASoC: qcom: q6asm-dai: add support to wma decoder ALSA: compress: add alac & ape decoder params ASoC: qcom: q6asm: add support for alac and ape configs ASoC: qcom: q6asm-dai: add support for ALAC and APE decoders ALSA: compress: bump the version Wolfram Sang (1): ASoC: pxa: magician: convert to use i2c_new_client_device() Yong Zhi (4): ASoC: Intel: sof_da7219_max98373: Add support for max98360a speaker amp ASoC: Intel: sof_rt5682: Add rt1015 speaker amp support ASoC: max98357a: Add ACPI HID MAX98360A ASoC: intel: sof_da7219_max98373: Add speaker switch Yu-Hsuan Hsu (1): ASoC: cros_ec_codec: Support setting bclk ratio YueHaibing (6): ASoC: Remove unused including <linux/version.h> ASoC: wcd934x: Remove set but not unused variable 'hph_comp_ctrl7' ASoC: rt5682: Make rt5682_clock_config static ASoC: rt1015: set snd_soc_dai_ops in rt1015_dai driver ASoc: amd: acp3x: Add missing include <linux/io.h> ASoC: wm8974: remove unused variables derek.fang (1): ASoC: rt5682: Enable PLL2 function kbuild test robot (1): ASoC: meson: aiu: fix semicolon.cocci warnings tangbin (2): ASoC: zte: zx-spdif: remove redundant dev_err message ASoC: zte: zx-tdm: remove redundant variables dev .../devicetree/bindings/sound/amlogic,aiu.yaml | 113 ++ .../bindings/sound/amlogic,g12a-toacodec.yaml | 51 + .../bindings/sound/amlogic,gx-sound-card.yaml | 113 ++ .../devicetree/bindings/sound/amlogic,t9015.yaml | 58 + .../bindings/sound/brcm,bcm63xx-audio.txt | 29 + .../devicetree/bindings/sound/cirrus,cs42l51.yaml | 69 + .../devicetree/bindings/sound/cs42l51.txt | 33 - .../bindings/sound/google,cros-ec-codec.txt | 44 - .../bindings/sound/google,cros-ec-codec.yaml | 67 + .../devicetree/bindings/sound/ingenic,aic.yaml | 92 ++ .../bindings/sound/ingenic,jz4740-i2s.txt | 23 - .../bindings/sound/nvidia,tegra-audio-wm8903.txt | 1 + .../bindings/sound/rockchip,rk3328-codec.txt | 7 +- .../devicetree/bindings/sound/rockchip-i2s.txt | 49 - .../devicetree/bindings/sound/rockchip-i2s.yaml | 111 ++ Documentation/devicetree/bindings/sound/rt5682.txt | 18 + .../devicetree/bindings/sound/st,stm32-i2s.txt | 62 - .../devicetree/bindings/sound/st,stm32-i2s.yaml | 87 ++ .../devicetree/bindings/sound/st,stm32-spdifrx.txt | 56 - .../bindings/sound/st,stm32-spdifrx.yaml | 80 + .../devicetree/bindings/sound/tas2562.txt | 2 +- .../devicetree/bindings/sound/tlv320adcx140.yaml | 82 + Documentation/sound/soc/codec-to-codec.rst | 9 +- MAINTAINERS | 15 +- drivers/gpu/drm/mediatek/mtk_hdmi.c | 54 +- drivers/soundwire/qcom.c | 7 +- drivers/soundwire/stream.c | 16 +- drivers/spi/Kconfig | 2 +- include/dt-bindings/sound/meson-aiu.h | 18 + include/dt-bindings/sound/meson-g12a-toacodec.h | 10 + include/linux/soundwire/sdw.h | 2 + include/sound/compress_driver.h | 40 +- include/sound/hdaudio.h | 2 + include/sound/pcm.h | 14 +- include/sound/rt5682.h | 10 + include/sound/soc-acpi.h | 39 +- include/sound/soc-dai.h | 44 +- include/sound/soc-dapm.h | 6 + include/sound/soc-dpcm.h | 20 +- include/sound/soc.h | 44 +- include/sound/sof/dai-intel.h | 18 +- include/sound/sof/header.h | 11 + include/sound/sof/info.h | 22 +- include/sound/sof/topology.h | 3 +- include/uapi/sound/compress_offload.h | 2 +- include/uapi/sound/compress_params.h | 37 +- include/uapi/sound/sof/abi.h | 2 +- sound/arm/pxa2xx-pcm-lib.c | 8 +- sound/core/compress_offload.c | 42 + sound/core/pcm_dmaengine.c | 6 +- sound/core/pcm_misc.c | 18 +- sound/soc/amd/Kconfig | 10 + sound/soc/amd/Makefile | 2 + sound/soc/amd/acp-da7219-max98357a.c | 2 +- sound/soc/amd/acp-rt5645.c | 4 +- sound/soc/amd/acp3x-rt5682-max9836.c | 376 +++++ sound/soc/amd/raven/acp3x-i2s.c | 44 +- sound/soc/amd/raven/acp3x-pcm-dma.c | 6 +- sound/soc/amd/raven/pci-acp3x.c | 7 +- sound/soc/atmel/atmel-pcm-dma.c | 4 +- sound/soc/atmel/atmel-pcm-pdc.c | 2 +- sound/soc/atmel/atmel_wm8904.c | 2 +- sound/soc/atmel/mchp-i2s-mcc.c | 8 +- sound/soc/atmel/mikroe-proto.c | 2 +- sound/soc/atmel/sam9g20_wm8731.c | 2 +- sound/soc/atmel/sam9x5_wm8731.c | 2 +- sound/soc/au1x/db1200.c | 2 +- sound/soc/au1x/dbdma2.c | 2 +- sound/soc/au1x/dma.c | 2 +- sound/soc/au1x/psc-ac97.c | 2 +- sound/soc/bcm/Kconfig | 9 + sound/soc/bcm/Makefile | 4 + sound/soc/bcm/bcm63xx-i2s-whistler.c | 317 ++++ sound/soc/bcm/bcm63xx-i2s.h | 90 ++ sound/soc/bcm/bcm63xx-pcm-whistler.c | 485 ++++++ sound/soc/bcm/cygnus-pcm.c | 22 +- sound/soc/cirrus/edb93xx.c | 4 +- sound/soc/cirrus/snappercl15.c | 4 +- sound/soc/codecs/Kconfig | 627 ++++---- sound/soc/codecs/Makefile | 4 + sound/soc/codecs/cros_ec_codec.c | 25 +- sound/soc/codecs/cs4271.c | 4 +- sound/soc/codecs/cs47l15.c | 4 +- sound/soc/codecs/cs47l24.c | 6 +- sound/soc/codecs/cs47l35.c | 6 +- sound/soc/codecs/cs47l85.c | 6 +- sound/soc/codecs/cs47l90.c | 6 +- sound/soc/codecs/cs47l92.c | 4 +- sound/soc/codecs/hdac_hdmi.c | 6 +- sound/soc/codecs/max98357a.c | 37 +- sound/soc/codecs/mt6660.c | 81 +- sound/soc/codecs/rk3328_codec.c | 31 +- sound/soc/codecs/rl6231.c | 1 + sound/soc/codecs/rl6231.h | 2 +- sound/soc/codecs/rt1015.c | 10 +- sound/soc/codecs/rt1308-sdw.c | 38 +- sound/soc/codecs/rt1308-sdw.h | 2 + sound/soc/codecs/rt5659.c | 2 +- sound/soc/codecs/rt5682-sdw.c | 333 ++++ sound/soc/codecs/rt5682-sdw.h | 20 + sound/soc/codecs/rt5682.c | 1298 ++++++++++++++-- sound/soc/codecs/rt5682.h | 100 +- sound/soc/codecs/tas2562.c | 121 +- sound/soc/codecs/tas2562.h | 12 +- sound/soc/codecs/tlv320adcx140.c | 920 +++++++++++ sound/soc/codecs/tlv320adcx140.h | 131 ++ sound/soc/codecs/wcd9335.c | 18 +- sound/soc/codecs/wcd9335.h | 7 +- sound/soc/codecs/wcd934x.c | 37 +- sound/soc/codecs/wm0010.c | 2 +- sound/soc/codecs/wm5110.c | 6 +- sound/soc/codecs/wm8974.c | 8 - sound/soc/codecs/wm_adsp.c | 14 +- sound/soc/codecs/wsa881x.c | 46 +- sound/soc/dwc/dwc-i2s.c | 8 +- sound/soc/dwc/dwc-pcm.c | 2 +- sound/soc/fsl/eukrea-tlv320.c | 4 +- sound/soc/fsl/fsl-asoc-card.c | 10 +- sound/soc/fsl/fsl_asrc_dma.c | 10 +- sound/soc/fsl/fsl_spdif.c | 10 +- sound/soc/fsl/fsl_ssi.c | 8 +- sound/soc/fsl/imx-audmix.c | 8 +- sound/soc/fsl/imx-mc13783.c | 4 +- sound/soc/fsl/imx-sgtl5000.c | 2 +- sound/soc/fsl/mpc5200_dma.c | 10 +- sound/soc/fsl/mpc5200_psc_i2s.c | 2 +- sound/soc/fsl/mpc8610_hpcd.c | 4 +- sound/soc/fsl/mx27vis-aic32x4.c | 4 +- sound/soc/fsl/p1022_ds.c | 4 +- sound/soc/fsl/p1022_rdk.c | 4 +- sound/soc/fsl/wm1133-ev1.c | 6 +- sound/soc/generic/simple-card-utils.c | 60 +- sound/soc/img/img-i2s-in.c | 2 +- sound/soc/img/img-i2s-out.c | 2 +- sound/soc/intel/atom/sst-atom-controls.c | 2 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 6 +- sound/soc/intel/atom/sst/sst_pci.c | 2 +- sound/soc/intel/boards/Kconfig | 57 +- sound/soc/intel/boards/Makefile | 12 +- sound/soc/intel/boards/bdw-rt5650.c | 15 +- sound/soc/intel/boards/bdw-rt5677.c | 15 +- sound/soc/intel/boards/broadwell.c | 13 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 10 +- sound/soc/intel/boards/bxt_rt298.c | 10 +- sound/soc/intel/boards/byt-max98090.c | 2 +- sound/soc/intel/boards/byt-rt5640.c | 4 +- sound/soc/intel/boards/bytcht_cx2072x.c | 10 +- sound/soc/intel/boards/bytcht_da7213.c | 10 +- sound/soc/intel/boards/bytcht_es8316.c | 8 +- sound/soc/intel/boards/bytcht_nocodec.c | 4 +- sound/soc/intel/boards/bytcr_rt5640.c | 8 +- sound/soc/intel/boards/bytcr_rt5651.c | 8 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 8 +- sound/soc/intel/boards/cht_bsw_nau8824.c | 6 +- sound/soc/intel/boards/cht_bsw_rt5645.c | 16 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 8 +- sound/soc/intel/boards/cml_rt1011_rt5682.c | 13 +- sound/soc/intel/boards/glk_rt5682_max98357a.c | 13 +- sound/soc/intel/boards/haswell.c | 4 +- sound/soc/intel/boards/kbl_da7219_max98357a.c | 8 +- sound/soc/intel/boards/kbl_da7219_max98927.c | 14 +- sound/soc/intel/boards/kbl_rt5660.c | 6 +- sound/soc/intel/boards/kbl_rt5663_max98927.c | 12 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 12 +- sound/soc/intel/boards/skl_hda_dsp_common.h | 4 + sound/soc/intel/boards/skl_hda_dsp_generic.c | 27 +- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 14 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 19 +- sound/soc/intel/boards/skl_rt286.c | 8 +- sound/soc/intel/boards/sof_da7219_max98373.c | 83 +- sound/soc/intel/boards/sof_maxim_common.c | 80 + sound/soc/intel/boards/sof_maxim_common.h | 24 + sound/soc/intel/boards/sof_pcm512x.c | 448 ++++++ sound/soc/intel/boards/sof_rt5682.c | 137 +- sound/soc/intel/boards/sof_sdw.c | 962 ++++++++++++ sound/soc/intel/boards/sof_sdw_common.h | 114 ++ sound/soc/intel/boards/sof_sdw_dmic.c | 42 + sound/soc/intel/boards/sof_sdw_hdmi.c | 97 ++ sound/soc/intel/boards/sof_sdw_rt1308.c | 151 ++ sound/soc/intel/boards/sof_sdw_rt5682.c | 126 ++ sound/soc/intel/boards/sof_sdw_rt700.c | 125 ++ sound/soc/intel/boards/sof_sdw_rt711.c | 156 ++ sound/soc/intel/boards/sof_sdw_rt715.c | 42 + sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-cht-match.c | 7 + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 111 +- sound/soc/intel/common/soc-acpi-intel-icl-match.c | 103 +- sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 34 +- sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 92 +- sound/soc/intel/haswell/sst-haswell-pcm.c | 26 +- sound/soc/intel/skylake/bxt-sst.c | 3 - sound/soc/intel/skylake/cnl-sst.c | 35 +- sound/soc/intel/skylake/skl-nhlt.c | 3 +- sound/soc/intel/skylake/skl-pcm.c | 20 +- sound/soc/intel/skylake/skl-sst-dsp.h | 2 + sound/soc/intel/skylake/skl.c | 33 +- sound/soc/jz4740/jz4740-i2s.c | 78 +- sound/soc/kirkwood/armada-370-db.c | 2 +- sound/soc/kirkwood/kirkwood-dma.c | 2 +- sound/soc/mediatek/common/mtk-afe-fe-dai.c | 10 +- .../soc/mediatek/common/mtk-afe-platform-driver.c | 2 +- sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 2 +- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 4 +- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 4 +- sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 2 +- sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 2 +- sound/soc/mediatek/mt8173/mt8173-max98090.c | 4 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 4 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 6 +- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 23 +- sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 2 +- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 117 +- .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 2 +- sound/soc/meson/Kconfig | 41 + sound/soc/meson/Makefile | 19 + sound/soc/meson/aiu-acodec-ctrl.c | 203 +++ sound/soc/meson/aiu-codec-ctrl.c | 151 ++ sound/soc/meson/aiu-encoder-i2s.c | 365 +++++ sound/soc/meson/aiu-encoder-spdif.c | 209 +++ sound/soc/meson/aiu-fifo-i2s.c | 153 ++ sound/soc/meson/aiu-fifo-spdif.c | 186 +++ sound/soc/meson/aiu-fifo.c | 223 +++ sound/soc/meson/aiu-fifo.h | 50 + sound/soc/meson/aiu.c | 388 +++++ sound/soc/meson/aiu.h | 89 ++ sound/soc/meson/axg-card.c | 414 +---- sound/soc/meson/axg-fifo.c | 2 +- sound/soc/meson/g12a-toacodec.c | 252 +++ sound/soc/meson/g12a-tohdmitx.c | 219 +-- sound/soc/meson/gx-card.c | 141 ++ sound/soc/meson/meson-card-utils.c | 385 +++++ sound/soc/meson/meson-card.h | 55 + sound/soc/meson/meson-codec-glue.c | 149 ++ sound/soc/meson/meson-codec-glue.h | 32 + sound/soc/meson/t9015.c | 333 ++++ sound/soc/mxs/mxs-sgtl5000.c | 4 +- sound/soc/pxa/Kconfig | 22 + sound/soc/pxa/brownstone.c | 4 +- sound/soc/pxa/corgi.c | 4 +- sound/soc/pxa/hx4700.c | 4 +- sound/soc/pxa/imote2.c | 4 +- sound/soc/pxa/magician.c | 14 +- sound/soc/pxa/mioa701_wm9713.c | 4 +- sound/soc/pxa/mmp-pcm.c | 2 +- sound/soc/pxa/mmp-sspa.c | 2 +- sound/soc/pxa/poodle.c | 4 +- sound/soc/pxa/pxa2xx-i2s.c | 2 +- sound/soc/pxa/spitz.c | 4 +- sound/soc/pxa/ttc-dkb.c | 2 +- sound/soc/pxa/z2.c | 4 +- sound/soc/pxa/zylonite.c | 6 +- sound/soc/qcom/Kconfig | 2 +- sound/soc/qcom/apq8016_sbc.c | 9 +- sound/soc/qcom/apq8096.c | 6 +- sound/soc/qcom/lpass-platform.c | 4 +- sound/soc/qcom/qdsp6/q6asm-dai.c | 173 ++- sound/soc/qcom/qdsp6/q6asm.c | 243 ++- sound/soc/qcom/qdsp6/q6asm.h | 51 +- sound/soc/qcom/qdsp6/q6routing.c | 21 +- sound/soc/qcom/sdm845.c | 105 +- sound/soc/qcom/storm.c | 2 +- sound/soc/rockchip/rk3288_hdmi_analog.c | 4 +- sound/soc/rockchip/rk3399_gru_sound.c | 16 +- sound/soc/rockchip/rockchip_max98090.c | 6 +- sound/soc/rockchip/rockchip_rt5645.c | 6 +- sound/soc/samsung/Kconfig | 4 +- sound/soc/samsung/arndale.c | 10 +- sound/soc/samsung/bells.c | 16 +- sound/soc/samsung/h1940_uda1380.c | 2 +- sound/soc/samsung/i2s.c | 2 +- sound/soc/samsung/jive_wm8750.c | 4 +- sound/soc/samsung/littlemill.c | 16 +- sound/soc/samsung/lowland.c | 6 +- sound/soc/samsung/neo1973_wm8753.c | 10 +- sound/soc/samsung/odroid.c | 6 +- sound/soc/samsung/pcm.c | 4 +- sound/soc/samsung/rx1950_uda1380.c | 2 +- sound/soc/samsung/s3c-i2s-v2.c | 2 +- sound/soc/samsung/s3c24xx_simtec.c | 4 +- sound/soc/samsung/s3c24xx_uda134x.c | 6 +- sound/soc/samsung/smartq_wm8987.c | 4 +- sound/soc/samsung/smdk_spdif.c | 2 +- sound/soc/samsung/smdk_wm8580.c | 2 +- sound/soc/samsung/smdk_wm8994.c | 4 +- sound/soc/samsung/smdk_wm8994pcm.c | 6 +- sound/soc/samsung/snow.c | 8 +- sound/soc/samsung/spdif.c | 8 +- sound/soc/samsung/speyside.c | 10 +- sound/soc/samsung/tm2_wm5110.c | 19 +- sound/soc/samsung/tobermory.c | 10 +- sound/soc/sh/dma-sh7760.c | 16 +- sound/soc/sh/fsi.c | 5 +- sound/soc/sh/migor.c | 6 +- sound/soc/sh/rcar/core.c | 2 +- sound/soc/soc-compress.c | 5 +- sound/soc/soc-core.c | 290 ++-- sound/soc/soc-dai.c | 18 +- sound/soc/soc-dapm.c | 220 +-- sound/soc/soc-generic-dmaengine-pcm.c | 26 +- sound/soc/soc-pcm.c | 1627 +++++++++----------- sound/soc/soc-topology.c | 24 +- sound/soc/sof/Kconfig | 9 + sound/soc/sof/Makefile | 1 + sound/soc/sof/compress.c | 146 ++ sound/soc/sof/compress.h | 31 + sound/soc/sof/core.c | 10 +- sound/soc/sof/debug.c | 226 +++ sound/soc/sof/imx/imx8.c | 57 +- sound/soc/sof/intel/Kconfig | 20 +- sound/soc/sof/intel/Makefile | 1 + sound/soc/sof/intel/apl.c | 9 + sound/soc/sof/intel/cnl.c | 51 +- sound/soc/sof/intel/hda-codec.c | 11 +- sound/soc/sof/intel/hda-compress.c | 114 ++ sound/soc/sof/intel/hda-ctrl.c | 40 +- sound/soc/sof/intel/hda-dai.c | 130 +- sound/soc/sof/intel/hda-dsp.c | 331 +++- sound/soc/sof/intel/hda-ipc.c | 24 +- sound/soc/sof/intel/hda-loader.c | 40 +- sound/soc/sof/intel/hda-pcm.c | 8 +- sound/soc/sof/intel/hda-stream.c | 27 +- sound/soc/sof/intel/hda.c | 433 +++++- sound/soc/sof/intel/hda.h | 120 +- sound/soc/sof/ipc.c | 41 +- sound/soc/sof/loader.c | 6 - sound/soc/sof/ops.h | 59 +- sound/soc/sof/pcm.c | 19 +- sound/soc/sof/pm.c | 176 +-- sound/soc/sof/probe.c | 290 ++++ sound/soc/sof/probe.h | 85 + sound/soc/sof/sof-audio.c | 59 +- sound/soc/sof/sof-audio.h | 6 +- sound/soc/sof/sof-of-dev.c | 10 + sound/soc/sof/sof-priv.h | 71 +- sound/soc/sof/topology.c | 25 +- sound/soc/sprd/Kconfig | 2 +- sound/soc/sprd/sprd-mcdt.h | 2 +- sound/soc/sprd/sprd-pcm-compress.c | 4 +- sound/soc/sprd/sprd-pcm-dma.c | 2 +- sound/soc/stm/stm32_adfsdm.c | 12 +- sound/soc/stm/stm32_i2s.c | 75 +- sound/soc/stm/stm32_sai.c | 26 +- sound/soc/stm/stm32_sai_sub.c | 13 +- sound/soc/stm/stm32_spdifrx.c | 89 +- sound/soc/sunxi/sun4i-spdif.c | 2 +- sound/soc/sunxi/sun8i-codec.c | 3 - sound/soc/tegra/tegra_alc5632.c | 2 +- sound/soc/tegra/tegra_max98090.c | 2 +- sound/soc/tegra/tegra_rt5640.c | 2 +- sound/soc/tegra/tegra_rt5677.c | 2 +- sound/soc/tegra/tegra_sgtl5000.c | 2 +- sound/soc/tegra/tegra_wm8753.c | 2 +- sound/soc/tegra/tegra_wm8903.c | 24 +- sound/soc/tegra/trimslice.c | 2 +- sound/soc/ti/Kconfig | 8 +- sound/soc/ti/Makefile | 2 + sound/soc/ti/ams-delta.c | 4 +- sound/soc/ti/davinci-evm.c | 4 +- sound/soc/ti/davinci-mcasp.c | 13 +- sound/soc/ti/davinci-vcif.c | 4 +- sound/soc/ti/n810.c | 2 +- sound/soc/ti/omap-abe-twl6040.c | 6 +- sound/soc/ti/omap-mcbsp-st.c | 2 +- sound/soc/ti/omap-mcbsp.c | 4 +- sound/soc/ti/omap-mcpdm.c | 2 +- sound/soc/ti/omap3pandora.c | 4 +- sound/soc/ti/osk5912.c | 2 +- sound/soc/ti/rx51.c | 2 +- sound/soc/ti/udma-pcm.c | 43 + sound/soc/ti/udma-pcm.h | 18 + sound/soc/txx9/txx9aclc.c | 2 +- sound/soc/uniphier/aio-compress.c | 22 +- sound/soc/uniphier/aio-dma.c | 6 +- sound/soc/ux500/mop500_ab8500.c | 6 +- sound/soc/ux500/ux500_pcm.c | 8 +- sound/soc/xtensa/xtfpga-i2s.c | 2 +- sound/soc/zte/zx-spdif.c | 1 - sound/soc/zte/zx-tdm.c | 3 +- sound/usb/usx2y/usbusx2yaudio.c | 9 +- 379 files changed, 17570 insertions(+), 3797 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/amlogic,aiu.yaml create mode 100644 Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml create mode 100644 Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml create mode 100644 Documentation/devicetree/bindings/sound/amlogic,t9015.yaml create mode 100644 Documentation/devicetree/bindings/sound/brcm,bcm63xx-audio.txt create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs42l51.yaml delete mode 100644 Documentation/devicetree/bindings/sound/cs42l51.txt delete mode 100644 Documentation/devicetree/bindings/sound/google,cros-ec-codec.txt create mode 100644 Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml create mode 100644 Documentation/devicetree/bindings/sound/ingenic,aic.yaml delete mode 100644 Documentation/devicetree/bindings/sound/ingenic,jz4740-i2s.txt delete mode 100644 Documentation/devicetree/bindings/sound/rockchip-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/rockchip-i2s.yaml delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-i2s.yaml delete mode 100644 Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt create mode 100644 Documentation/devicetree/bindings/sound/st,stm32-spdifrx.yaml create mode 100644 Documentation/devicetree/bindings/sound/tlv320adcx140.yaml create mode 100644 include/dt-bindings/sound/meson-aiu.h create mode 100644 include/dt-bindings/sound/meson-g12a-toacodec.h create mode 100644 sound/soc/amd/acp3x-rt5682-max9836.c create mode 100644 sound/soc/bcm/bcm63xx-i2s-whistler.c create mode 100644 sound/soc/bcm/bcm63xx-i2s.h create mode 100644 sound/soc/bcm/bcm63xx-pcm-whistler.c create mode 100644 sound/soc/codecs/rt5682-sdw.c create mode 100644 sound/soc/codecs/rt5682-sdw.h create mode 100644 sound/soc/codecs/tlv320adcx140.c create mode 100644 sound/soc/codecs/tlv320adcx140.h create mode 100644 sound/soc/intel/boards/sof_maxim_common.c create mode 100644 sound/soc/intel/boards/sof_maxim_common.h create mode 100644 sound/soc/intel/boards/sof_pcm512x.c create mode 100644 sound/soc/intel/boards/sof_sdw.c create mode 100644 sound/soc/intel/boards/sof_sdw_common.h create mode 100644 sound/soc/intel/boards/sof_sdw_dmic.c create mode 100644 sound/soc/intel/boards/sof_sdw_hdmi.c create mode 100644 sound/soc/intel/boards/sof_sdw_rt1308.c create mode 100644 sound/soc/intel/boards/sof_sdw_rt5682.c create mode 100644 sound/soc/intel/boards/sof_sdw_rt700.c create mode 100644 sound/soc/intel/boards/sof_sdw_rt711.c create mode 100644 sound/soc/intel/boards/sof_sdw_rt715.c create mode 100644 sound/soc/meson/aiu-acodec-ctrl.c create mode 100644 sound/soc/meson/aiu-codec-ctrl.c create mode 100644 sound/soc/meson/aiu-encoder-i2s.c create mode 100644 sound/soc/meson/aiu-encoder-spdif.c create mode 100644 sound/soc/meson/aiu-fifo-i2s.c create mode 100644 sound/soc/meson/aiu-fifo-spdif.c create mode 100644 sound/soc/meson/aiu-fifo.c create mode 100644 sound/soc/meson/aiu-fifo.h create mode 100644 sound/soc/meson/aiu.c create mode 100644 sound/soc/meson/aiu.h create mode 100644 sound/soc/meson/g12a-toacodec.c create mode 100644 sound/soc/meson/gx-card.c create mode 100644 sound/soc/meson/meson-card-utils.c create mode 100644 sound/soc/meson/meson-card.h create mode 100644 sound/soc/meson/meson-codec-glue.c create mode 100644 sound/soc/meson/meson-codec-glue.h create mode 100644 sound/soc/meson/t9015.c 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 create mode 100644 sound/soc/ti/udma-pcm.c create mode 100644 sound/soc/ti/udma-pcm.h

2 1

[PATCH 0/1] ASoC: soc-compress: lock pcm_mutex to resolve lockdep error
by 이경택 30 Mar '20

30 Mar '20

Hi, Mark I resend the patch and add recipient Vinod as your comment. Thank you. I'd like to send a patch to fix a problem using soc-compress with DPCM. soc_compr_open_fe() and soc_compr_free_fe() call snd_soc_runtime_activate() and snd_soc_runtime_deactivate() but don't lock card->pcm_mutex. It can cause lockdep error, because snd_soc_runtime_activate/deactivate() checks whether pcm_mutex is held using lockdep_assert_held(). I'd like to send a patch which adds mutex_lock/unlock() before and after of the snd_soc_runtime_activate/deactivate() call. If there is anything should be changed in my patch or email, please let me know it. I'll really appreciate it. Lee Gyeongtaek Lee (1): ASoC: soc-compress: lock pcm_mutex to resolve lockdep error sound/soc/soc-compress.c | 4 ++++ 1 file changed, 4 insertions(+) base-commit: 76ccd234269bd05debdbc12c96eafe62dd9a6180 -- 2.21.0

1 0

[PATCH 1/1] ASoC: soc-compress: lock pcm_mutex to resolve lockdep error
by 이경택 30 Mar '20

30 Mar '20

snd_soc_runtime_activate() and snd_soc_runtime_deactivate() require pcm_mutex lock. Signed-off-by: Gyeongtaek Lee <gt82.lee(a)samsung.com> --- sound/soc/soc-compress.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 392a1c5b15d3..42d416ac7e9b 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c @@ -207,7 +207,9 @@ static int soc_compr_open_fe(struct snd_compr_stream *cstream) fe->dpcm[stream].state = SND_SOC_DPCM_STATE_OPEN; fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_NO; + mutex_lock_nested(&fe->pcm_mutex, fe->pcm_subclass); snd_soc_runtime_activate(fe, stream); + mutex_unlock(&fe->pcm_mutex); mutex_unlock(&fe->card->mutex); @@ -285,7 +287,9 @@ static int soc_compr_free_fe(struct snd_compr_stream *cstream) else stream = SNDRV_PCM_STREAM_CAPTURE; + mutex_lock_nested(&fe->pcm_mutex, fe->pcm_subclass); snd_soc_runtime_deactivate(fe, stream); + mutex_unlock(&fe->pcm_mutex); fe->dpcm[stream].runtime_update = SND_SOC_DPCM_UPDATE_FE; -- 2.21.0

2 2

[RFC PATCH v1 13/50] Avoid some useless msecs/jiffies conversions
by George Spelvin 30 Mar '20

30 Mar '20

Rather than generating a random number of milliseconds in a constant range and then converting to jiffies, convert the range to jiffies (evaluated at compile time) and choose a random number of jiffies in that range. Likewise, "msecs_to_jiffies(seconds * 1000)" is more conveniently written "seconds * HZ". Signed-off-by: George Spelvin <lkml(a)sdf.org> Cc: Hannes Reinecke <hare(a)suse.de> Cc: linux-scsi(a)vger.kernel.org Cc: Marek Lindner <mareklindner(a)neomailbox.ch> Cc: Simon Wunderlich <sw(a)simonwunderlich.de> Cc: Antonio Quartulli <a(a)unstable.cc> Cc: Sven Eckelmann <sven(a)narfation.org> Cc: b.a.t.m.a.n(a)lists.open-mesh.org Cc: Johannes Berg <johannes(a)sipsolutions.net> Cc: linux-wireless(a)vger.kernel.org Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org --- drivers/scsi/fcoe/fcoe_ctlr.c | 10 +++++----- net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bat_v_ogm.c | 8 ++++---- net/bluetooth/hci_request.c | 2 +- net/wireless/scan.c | 2 +- sound/core/pcm_lib.c | 2 +- sound/core/pcm_native.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c index 1791a393795da..9c530f8827518 100644 --- a/drivers/scsi/fcoe/fcoe_ctlr.c +++ b/drivers/scsi/fcoe/fcoe_ctlr.c @@ -2238,10 +2238,10 @@ static void fcoe_ctlr_vn_restart(struct fcoe_ctlr *fip) if (fip->probe_tries < FIP_VN_RLIM_COUNT) { fip->probe_tries++; - wait = prandom_u32() % FIP_VN_PROBE_WAIT; + wait = prandom_u32_max(msecs_to_jiffies(FIP_VN_PROBE_WAIT)); } else - wait = FIP_VN_RLIM_INT; - mod_timer(&fip->timer, jiffies + msecs_to_jiffies(wait)); + wait = msecs_to_jiffies(FIP_VN_RLIM_INT); + mod_timer(&fip->timer, jiffies + wait); fcoe_ctlr_set_state(fip, FIP_ST_VNMP_START); } @@ -3132,8 +3132,8 @@ static void fcoe_ctlr_vn_timeout(struct fcoe_ctlr *fip) fcoe_ctlr_vn_send(fip, FIP_SC_VN_BEACON, fcoe_all_vn2vn, 0); fip->port_ka_time = jiffies + - msecs_to_jiffies(FIP_VN_BEACON_INT + - (prandom_u32() % FIP_VN_BEACON_FUZZ)); + msecs_to_jiffies(FIP_VN_BEACON_INT) + + prandom_u32_max(msecs_to_jiffies(FIP_VN_BEACON_FUZZ)); } if (time_before(fip->port_ka_time, next_time)) next_time = fip->port_ka_time; diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 46c5cd9f8019e..9efd96e91d53e 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -288,7 +288,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) /* when do we schedule a ogm packet to be sent */ static unsigned long batadv_iv_ogm_fwd_send_time(void) { - return jiffies + msecs_to_jiffies(prandom_u32() % (BATADV_JITTER / 2)); + return jiffies + prandom_u32_max(msecs_to_jiffies(BATADV_JITTER / 2)); } /* apply hop penalty for a normal link */ diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 411ce5fc6492f..61fa742ff5501 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -85,12 +85,12 @@ struct batadv_orig_node *batadv_v_ogm_orig_get(struct batadv_priv *bat_priv, */ static void batadv_v_ogm_start_queue_timer(struct batadv_hard_iface *hard_iface) { - unsigned int msecs = BATADV_MAX_AGGREGATION_MS * 1000; + unsigned int delay = msecs_to_jiffies(BATADV_MAX_AGGREGATION_MS); - /* msecs * [0.9, 1.1] */ - msecs += prandom_u32() % (msecs / 5) - (msecs / 10); + /* delay * [0.9, 1.1] */ + delay += prandom_u32_max(delay / 5) - (delay / 10); queue_delayed_work(batadv_event_workqueue, &hard_iface->bat_v.aggr_wq, - msecs_to_jiffies(msecs / 1000)); + delay); } /** diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c index 2a1b64dbf76e4..8b46e23b4abe7 100644 --- a/net/bluetooth/hci_request.c +++ b/net/bluetooth/hci_request.c @@ -1505,7 +1505,7 @@ int hci_get_random_address(struct hci_dev *hdev, bool require_privacy, bacpy(rand_addr, &hdev->rpa); - to = msecs_to_jiffies(hdev->rpa_timeout * 1000); + to = hdev->rpa_timeout * HZ; if (adv_instance) queue_delayed_work(hdev->workqueue, &adv_instance->rpa_expired_cb, to); diff --git a/net/wireless/scan.c b/net/wireless/scan.c index aef240fdf8df6..b6856cbb68d3b 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -700,7 +700,7 @@ void cfg80211_bss_age(struct cfg80211_registered_device *rdev, unsigned long age_secs) { struct cfg80211_internal_bss *bss; - unsigned long age_jiffies = msecs_to_jiffies(age_secs * MSEC_PER_SEC); + unsigned long age_jiffies = age_secs * HZ; spin_lock_bh(&rdev->bss_lock); list_for_each_entry(bss, &rdev->bss_list, list) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 2236b5e0c1f25..8a2bf333200c1 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1839,7 +1839,7 @@ static int wait_for_avail(struct snd_pcm_substream *substream, runtime->rate; wait_time = max(t, wait_time); } - wait_time = msecs_to_jiffies(wait_time * 1000); + wait_time *= HZ; } } diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index df40d38f6e290..1ea763f9f956d 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -1937,7 +1937,7 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream, long t = runtime->period_size * 2 / runtime->rate; tout = max(t, tout); } - tout = msecs_to_jiffies(tout * 1000); + tout *= HZ; } tout = schedule_timeout(tout); -- 2.26.0

3 9