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

[alsa-devel] [PATCH v2 0/2] Add CML M/C for RT5682 and RT1011
by sathya.prakash.m.r＠intel.com 25 Sep '19

25 Sep '19

From: Sathya Prakash M R <sathya.prakash.m.r(a)intel.com> The series adds CML m/c driver with RT5682 on SSP0 and RT1011 on SSP1. The RT1011 is smart AMP which supports 2 Whoofers and 2 tweeter support. RT5682 is headset codec supporting playback and record. The m/c supports HDMI playback and DMIC record. Naveen Manohar (2): ASoC: Intel: boards: Add CML m/c using RT1011 and RT5682 ASoC: Intel: Add acpi match for rt1011 based m/c driver sound/soc/intel/boards/Kconfig | 18 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/cml_rt1011_rt5682.c | 473 ++++++++++++++++++++++ sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 7 + 4 files changed, 500 insertions(+) create mode 100644 sound/soc/intel/boards/cml_rt1011_rt5682.c -- Changes from V1: Addressed comments on ASoC: Intel: boards: Add CML m/c using RT1011 and RT5682 1.9.1

1 2

Re: [alsa-devel] [PATCH V4 4/4] ASoC: fsl_asrc: Fix error with S24_3LE format bitstream in i.MX8
by S.j. Wang 25 Sep '19

25 Sep '19

Hi > On Tue, Sep 24, 2019 at 06:52:35PM +0800, Shengjiu Wang wrote: > > There is error "aplay: pcm_write:2023: write error: Input/output error" > > on i.MX8QM/i.MX8QXP platform for S24_3LE format. > > > > In i.MX8QM/i.MX8QXP, the DMA is EDMA, which don't support 24bit > > sample, but we didn't add any constraint, that cause issues. > > > > So we need to query the caps of dma, then update the hw parameters > > according to the caps. > > > > Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> > > --- > > sound/soc/fsl/fsl_asrc.c | 4 +-- > > sound/soc/fsl/fsl_asrc.h | 3 ++ > > sound/soc/fsl/fsl_asrc_dma.c | 59 > > +++++++++++++++++++++++++++++++----- > > 3 files changed, 56 insertions(+), 10 deletions(-) > > > > @@ -270,12 +268,17 @@ static int fsl_asrc_dma_hw_free(struct > > snd_pcm_substream *substream) > > > > static int fsl_asrc_dma_startup(struct snd_pcm_substream *substream) > > { > > + bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; > > struct snd_soc_pcm_runtime *rtd = substream->private_data; > > struct snd_pcm_runtime *runtime = substream->runtime; > > struct snd_soc_component *component = > snd_soc_rtdcom_lookup(rtd, > > DRV_NAME); > > + struct snd_dmaengine_dai_dma_data *dma_data; > > struct device *dev = component->dev; > > struct fsl_asrc *asrc_priv = dev_get_drvdata(dev); > > struct fsl_asrc_pair *pair; > > + struct dma_chan *tmp_chan = NULL; > > + u8 dir = tx ? OUT : IN; > > + int ret = 0; > > > > pair = kzalloc(sizeof(struct fsl_asrc_pair), GFP_KERNEL); > > Sorry, I didn't catch it previously. We would need to release this memory > also for all error-out paths, as the code doesn't have any error-out routine, > prior to applying this change. > > > if (!pair) > > @@ -285,11 +288,51 @@ static int fsl_asrc_dma_startup(struct > > snd_pcm_substream *substream) > > > + /* Request a dummy pair, which will be released later. > > + * Request pair function needs channel num as input, for this > > + * dummy pair, we just request "1" channel temporary. > > + */ > > "temporary" => "temporarily" > > > + ret = fsl_asrc_request_pair(1, pair); > > + if (ret < 0) { > > + dev_err(dev, "failed to request asrc pair\n"); > > + return ret; > > + } > > + > > + /* Request a dummy dma channel, which will be release later. */ > > "release" => "released" Ok, will update them. Best regards Wang shengjiu

1 0

[alsa-devel] [PATCH V4 0/4] update supported sample format
by Shengjiu Wang 24 Sep '19

24 Sep '19

This patch serial is to update the supported format for fsl_asrc and fix some format issue. Shengjiu Wang (4): ASoC: fsl_asrc: Use in(out)put_format instead of in(out)put_word_width ASoC: fsl_asrc: update supported sample format ASoC: pcm_dmaengine: Extract snd_dmaengine_pcm_refine_runtime_hwparams ASoC: fsl_asrc: Fix error with S24_3LE format bitstream in i.MX8 changes in v2 - extract snd_dmaengine_pcm_set_runtime_hwparams in one separate path. - 4th patch depends on 3rd patch changes in v3 - Fix build report by kbuild test robot <lkp(a)intel.com> - change snd_dmaengine_pcm_set_runtime_hwparams to snd_dmaengine_pcm_refine_runtime_hwparams changes in v4 - update according to Nicolin's comments. include/sound/dmaengine_pcm.h | 5 ++ sound/core/pcm_dmaengine.c | 83 +++++++++++++++++++++++++++ sound/soc/fsl/fsl_asrc.c | 65 ++++++++++++++------- sound/soc/fsl/fsl_asrc.h | 7 ++- sound/soc/fsl/fsl_asrc_dma.c | 59 ++++++++++++++++--- sound/soc/soc-generic-dmaengine-pcm.c | 61 ++------------------ 6 files changed, 193 insertions(+), 87 deletions(-) -- 2.21.0

2 6

[alsa-devel] Making alsamixer configurable, adding mouse support + minor fixes
by GitHub pull_request - opened 24 Sep '19

24 Sep '19

alsa-project/alsa-utils pull request #26 was opened from braph: Hello, I'm using the alsamixer, but I am missing mouse support and the ability to configure it. I implemented those things for myself now, maybe it would also be useful for others. There are some commits that would even fit in the original alsamixer code without my rather heavy modifications, these are: 6eb0bc8f0848567f302e94ea5ee3a6d7c6966e65: _alsamixer: remove redundant sprintf() calls_ bef5b723a43f310ba73bcaa52f3da74ef5e08dde: _alsamixer: use mvwhline/mvwvline for drawing lines_ ae0604c93aa4bacbb678eb8ec832ad9e17c8b56a: _alsamixer: device_name.c: recognize DEL (ASCII 127) as backspace_ And maybe 485f3b0da1ffead2f88cffd9f2203516000415b5: _alsamixer: fix window_size_changed()_ Regards, Benjamin Request URL : https://github.com/alsa-project/alsa-utils/pull/26 Patch URL : https://github.com/alsa-project/alsa-utils/pull/26.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[alsa-devel] alsa-ucm-conf repository - initial import
by Jaroslav Kysela 24 Sep '19

24 Sep '19

Hello all, I just made an initial import to to alsa-ucm-conf repository which is in the 'import' branch: https://github.com/alsa-project/alsa-ucm-conf/tree/import I do not have the BSD-3-Clause licence acknowledgements from some minor contributors. I do not think that it's a problem. I would expect that if we do not have a disagreement, it is fine. The question is, if we need automake/autoconf tools to package those files. It seems to me that it might be clever to keep this ASIS for now. Users/packagers can just do 'cp' to the appropriate directory. Jaroslav -- Jaroslav Kysela <perex(a)perex.cz> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.

2 1

[alsa-devel] [PATCH] ASoC: samsung: i2s: Add clocks' macros descriptions
by Marek Szyprowski 24 Sep '19

24 Sep '19

From: Maciej Falkowski <m.falkowski(a)samsung.com> To increase macro readability added descriptions to clocks macros. Signed-off-by: Maciej Falkowski <m.falkowski(a)samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski(a)samsung.com> --- include/dt-bindings/sound/samsung-i2s.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/include/dt-bindings/sound/samsung-i2s.h b/include/dt-bindings/sound/samsung-i2s.h index 77545f14c379..fd752475c762 100644 --- a/include/dt-bindings/sound/samsung-i2s.h +++ b/include/dt-bindings/sound/samsung-i2s.h @@ -2,8 +2,13 @@ #ifndef _DT_BINDINGS_SAMSUNG_I2S_H #define _DT_BINDINGS_SAMSUNG_I2S_H -#define CLK_I2S_CDCLK 0 -#define CLK_I2S_RCLK_SRC 1 -#define CLK_I2S_RCLK_PSR 2 +/* the CDCLK (CODECLKO) gate clock */ +#define CLK_I2S_CDCLK 0 + +/* the RCLKSRC mux clock (corresponding to RCLKSRC bit in IISMOD register) */ +#define CLK_I2S_RCLK_SRC 1 + +/* the RCLK prescaler divider clock (corresponding to the IISPSR register) */ +#define CLK_I2S_RCLK_PSR 2 #endif /* _DT_BINDINGS_SAMSUNG_I2S_H */ -- 2.17.1

3 2

[alsa-devel] Propagating audio properties along the audio path
by Marc Gonzalez 24 Sep '19

24 Sep '19

Hello everyone, Disclaimer: I've never worked in the sound/ layer, and it is possible that some of my questions are silly or obvious. Basically, I'm trying to implement some form of eARC(*) on an arm64 SoC. (*) enhanced Audio Return Channel (from HDMI 2.1) The setup looks like this: A = Some kind of audio source, typically a TV or game console B = The arm64 SoC, equipped with some nice speakers HDMI A ------> B If we look inside B, we actually have B1 = an eARC receiver (input = HDMI, output = I2S) B2 = an audio DSP (input = I2S, output = speakers) I2S ? B1 -----> B2 -----> speakers If I read the standard right, B is supposed to advertise which audio formats it supports, and A is supposed to pick "the best". For the sake of argument, let's say A picks "PCM, 48 kHz, 8 channels, 16b". At some point, B receives audio packets, parses the Channel Status, and determines that A is sending "PCM, 48 kHz, 8 channels, 16b". The driver then configures the I2S link, and forwards the audio stream over I2S to the DSP. QUESTION_1: How is the DSP supposed to "learn" the properties of the audio stream? (AFAIU, they're not embedded in the data, so there must be some side-channel?) I assume the driver of B1 is supposed to propagate the info to the driver of B2? (Via some call-backs? By calling a function in B2?) QUESTION_2: Does it ever make sense for B2 to ask B1 to change the audio properties? (Not sure if B1 is even allowed to renegotiate.) Regards.

3 6

[alsa-devel] [PATCH 0/2] Add CML M/C for RT5682 and RT1011
by sathya.prakash.m.r＠intel.com 24 Sep '19

24 Sep '19

From: Sathya Prakash M R <sathya.prakash.m.r(a)intel.com> The series adds CML m/c driver with RT5682 on SSP0 and RT1011 on SSP1. The RT1011 is smart AMP which supports 2 Whoofers and 2 tweeter support. RT5682 is headset codec supporting playback and record. The m/c supports HDMI playback and DMIC record. Naveen Manohar (2): ASoC: Intel: boards: Add CML m/c using RT1011 and RT5682 ASoC: Intel: Add acpi match for rt1011 based m/c driver sound/soc/intel/boards/Kconfig | 18 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/cml_rt1011_rt5682.c | 475 ++++++++++++++++++++++ sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 7 + 4 files changed, 502 insertions(+) create mode 100644 sound/soc/intel/boards/cml_rt1011_rt5682.c -- V1: Acked-by:pierre-louis.bossart@linux.intel.com at https://github.com/thesofproject/linux/pull/1161 1.9.1

4 5

[alsa-devel] [PATCH v4] dt-bindings: sound: Convert Samsung I2S controller to dt-schema
by Marek Szyprowski 24 Sep '19

24 Sep '19

From: Maciej Falkowski <m.falkowski(a)samsung.com> Convert Samsung I2S controller to newer dt-schema format. Signed-off-by: Maciej Falkowski <m.falkowski(a)samsung.com> Signed-off-by: Marek Szyprowski <m.szyprowski(a)samsung.com> --- v4: - Removed description of i2s device nodes' clocks from 'clocks' property. - Added 'clock-output-names' property. - Added description of clock names. - Added '#clock-cells' property to required properties - Description of the provided clocks moved to samsung-i2s.h in separate patch Best regards, Maciej Falkowski --- .../devicetree/bindings/sound/samsung-i2s.txt | 84 ----------- .../bindings/sound/samsung-i2s.yaml | 136 ++++++++++++++++++ 2 files changed, 136 insertions(+), 84 deletions(-) delete mode 100644 Documentation/devicetree/bindings/sound/samsung-i2s.txt create mode 100644 Documentation/devicetree/bindings/sound/samsung-i2s.yaml diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.txt b/Documentation/devicetree/bindings/sound/samsung-i2s.txt deleted file mode 100644 index a88cb00fa096..000000000000 --- a/Documentation/devicetree/bindings/sound/samsung-i2s.txt +++ /dev/null @@ -1,84 +0,0 @@ -* Samsung I2S controller - -Required SoC Specific Properties: - -- compatible : should be one of the following. - - samsung,s3c6410-i2s: for 8/16/24bit stereo I2S. - - samsung,s5pv210-i2s: for 8/16/24bit multichannel(5.1) I2S with - secondary fifo, s/w reset control and internal mux for root clk src. - - samsung,exynos5420-i2s: for 8/16/24bit multichannel(5.1) I2S for - playback, stereo channel capture, secondary fifo using internal - or external dma, s/w reset control, internal mux for root clk src - and 7.1 channel TDM support for playback. TDM (Time division multiplexing) - is to allow transfer of multiple channel audio data on single data line. - - samsung,exynos7-i2s: with all the available features of exynos5 i2s, - exynos7 I2S has 7.1 channel TDM support for capture, secondary fifo - with only external dma and more no.of root clk sampling frequencies. - - samsung,exynos7-i2s1: I2S1 on previous samsung platforms supports - stereo channels. exynos7 i2s1 upgraded to 5.1 multichannel with - slightly modified bit offsets. - -- reg: physical base address of the controller and length of memory mapped - region. -- dmas: list of DMA controller phandle and DMA request line ordered pairs. -- dma-names: identifier string for each DMA request line in the dmas property. - These strings correspond 1:1 with the ordered pairs in dmas. -- clocks: Handle to iis clock and RCLK source clk. -- clock-names: - i2s0 uses some base clocks from CMU and some are from audio subsystem internal - clock controller. The clock names for i2s0 should be "iis", "i2s_opclk0" and - "i2s_opclk1" as shown in the example below. - i2s1 and i2s2 uses clocks from CMU. The clock names for i2s1 and i2s2 should - be "iis" and "i2s_opclk0". - "iis" is the i2s bus clock and i2s_opclk0, i2s_opclk1 are sources of the root - clk. i2s0 has internal mux to select the source of root clk and i2s1 and i2s2 - doesn't have any such mux. -- #clock-cells: should be 1, this property must be present if the I2S device - is a clock provider in terms of the common clock bindings, described in - ../clock/clock-bindings.txt. -- clock-output-names (deprecated): from the common clock bindings, names of - the CDCLK I2S output clocks, suggested values are "i2s_cdclk0", "i2s_cdclk1", - "i2s_cdclk3" for the I2S0, I2S1, I2S2 devices respectively. - -There are following clocks available at the I2S device nodes: - CLK_I2S_CDCLK - the CDCLK (CODECLKO) gate clock, - CLK_I2S_RCLK_PSR - the RCLK prescaler divider clock (corresponding to the - IISPSR register), - CLK_I2S_RCLK_SRC - the RCLKSRC mux clock (corresponding to RCLKSRC bit in - IISMOD register). - -Refer to the SoC datasheet for availability of the above clocks. -The CLK_I2S_RCLK_PSR and CLK_I2S_RCLK_SRC clocks are usually only available -in the IIS Multi Audio Interface. - -Note: Old DTs may not have the #clock-cells property and then not use the I2S -node as a clock supplier. - -Optional SoC Specific Properties: - -- samsung,idma-addr: Internal DMA register base address of the audio - sub system(used in secondary sound source). -- pinctrl-0: Should specify pin control groups used for this controller. -- pinctrl-names: Should contain only one value - "default". -- #sound-dai-cells: should be 1. - - -Example: - -i2s0: i2s@3830000 { - compatible = "samsung,s5pv210-i2s"; - reg = <0x03830000 0x100>; - dmas = <&pdma0 10 - &pdma0 9 - &pdma0 8>; - dma-names = "tx", "rx", "tx-sec"; - clocks = <&clock_audss EXYNOS_I2S_BUS>, - <&clock_audss EXYNOS_I2S_BUS>, - <&clock_audss EXYNOS_SCLK_I2S>; - clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; - #clock-cells = <1>; - samsung,idma-addr = <0x03000000>; - pinctrl-names = "default"; - pinctrl-0 = <&i2s0_bus>; - #sound-dai-cells = <1>; -}; diff --git a/Documentation/devicetree/bindings/sound/samsung-i2s.yaml b/Documentation/devicetree/bindings/sound/samsung-i2s.yaml new file mode 100644 index 000000000000..7d2750c26f11 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/samsung-i2s.yaml @@ -0,0 +1,136 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/sound/samsung-i2s.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Samsung SoC I2S controller + +maintainers: + - Krzysztof Kozlowski <krzk(a)kernel.org> + - Sylwester Nawrocki <s.nawrocki(a)samsung.com> + +properties: + compatible: + description: | + samsung,s3c6410-i2s: for 8/16/24bit stereo I2S. + + samsung,s5pv210-i2s: for 8/16/24bit multichannel(5.1) I2S with + secondary fifo, s/w reset control and internal mux for root clk src. + + samsung,exynos5420-i2s: for 8/16/24bit multichannel(5.1) I2S for + playback, stereo channel capture, secondary fifo using internal + or external dma, s/w reset control, internal mux for root clk src + and 7.1 channel TDM support for playback. TDM (Time division multiplexing) + is to allow transfer of multiple channel audio data on single data line. + + samsung,exynos7-i2s: with all the available features of exynos5 i2s. + exynos7 I2S has 7.1 channel TDM support for capture, secondary fifo + with only external dma and more no.of root clk sampling frequencies. + + samsung,exynos7-i2s1: I2S1 on previous samsung platforms supports + stereo channels. exynos7 i2s1 upgraded to 5.1 multichannel with + slightly modified bit offsets. + enum: + - samsung,s3c6410-i2s + - samsung,s5pv210-i2s + - samsung,exynos5420-i2s + - samsung,exynos7-i2s + - samsung,exynos7-i2s1 + + reg: + maxItems: 1 + + dmas: + minItems: 2 + maxItems: 3 + + dma-names: + oneOf: + - items: + - const: tx + - const: rx + - items: + - const: tx + - const: rx + - const: tx-sec + + clocks: + minItems: 1 + maxItems: 3 + + clock-names: + oneOf: + - items: + - const: iis + - items: # for i2s0 + - const: iis + - const: i2s_opclk0 + - const: i2s_opclk1 + - items: # for i2s1 and i2s2 + - const: iis + - const: i2s_opclk0 + description: | + "iis" is the i2s bus clock and i2s_opclk0, i2s_opclk1 are sources + of the root clk. i2s0 has internal mux to select the source + of root clk and i2s1 and i2s2 doesn't have any such mux. + + "#clock-cells": + const: 1 + + clock-output-names: # deprecated + oneOf: + - items: # for i2s0 + - const: i2s_cdclk0 + - items: # for i2s1 + - const: i2s_cdclk1 + - items: # for i2s2 + - const: i2s_cdclk2 + description: Names of the CDCLK I2S output clocks. + + samsung,idma-addr: + $ref: /schemas/types.yaml#/definitions/uint32 + description: | + Internal DMA register base address of the audio + sub system(used in secondary sound source). + + pinctrl-0: + description: Should specify pin control groups used for this controller. + + pinctrl-names: + const: default + + "#sound-dai-cells": + const: 1 + +required: + - compatible + - reg + - dmas + - dma-names + - clocks + - clock-names + - "#clock-cells" + +examples: + - | + #include <dt-bindings/clock/exynos-audss-clk.h> + + i2s0: i2s@3830000 { + compatible = "samsung,s5pv210-i2s"; + reg = <0x03830000 0x100>; + dmas = <&pdma0 10>, + <&pdma0 9>, + <&pdma0 8>; + dma-names = "tx", "rx", "tx-sec"; + clocks = <&clock_audss EXYNOS_I2S_BUS>, + <&clock_audss EXYNOS_I2S_BUS>, + <&clock_audss EXYNOS_SCLK_I2S>; + clock-names = "iis", "i2s_opclk0", "i2s_opclk1"; + #clock-cells = <1>; + samsung,idma-addr = <0x03000000>; + pinctrl-names = "default"; + pinctrl-0 = <&i2s0_bus>; + #sound-dai-cells = <1>; + }; + -- 2.17.1

2 1

[alsa-devel] [PATCH] ALSA: usb-audio: Add DSD support for EVGA NU Audio
by Jussi Laako 24 Sep '19

24 Sep '19

EVGA NU Audio is actually a USB audio device on a PCIexpress card, with it's own USB controller. It supports both PCM and DSD. Signed-off-by: Jussi Laako <jussi(a)sonarnerd.net> --- sound/usb/quirks.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 5fd4ccce452d..fbfde996fee7 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1658,6 +1658,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, case 0x25ce: /* Mytek devices */ case 0x278b: /* Rotel? */ case 0x2ab6: /* T+A devices */ + case 0x3842: /* EVGA */ case 0xc502: /* HiBy devices */ if (fp->dsd_raw) return SNDRV_PCM_FMTBIT_DSD_U32_BE; -- 2.17.1

2 1